From 097148e849136b49052b1b5123c714fb1d74db9b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 11 Aug 2020 21:58:20 +0200 Subject: patch 8.2.1422: the Mac GUI implementation is outdated Problem: The Mac GUI implementation is outdated and probably doesn't even work. Solution: Remove the Mac GUI code. The MacVim project provides the supported Vim GUI version. --- src/gui.h | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) (limited to 'src/gui.h') diff --git a/src/gui.h b/src/gui.h index cfc4448168..8b8b7fb163 100644 --- a/src/gui.h +++ b/src/gui.h @@ -39,25 +39,6 @@ # include #endif -#ifdef FEAT_GUI_MAC -# include -/*# include */ -# include -# include -# include -# include -# if !(defined (TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON)) -# include -# endif -# include -/*# include */ -# include -# include -/* -# include -# include */ -#endif - #ifdef FEAT_GUI_PHOTON # include # include @@ -68,7 +49,7 @@ * On some systems scrolling needs to be done right away instead of in the * main loop. */ -#if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MAC) || defined(FEAT_GUI_GTK) +#if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) # define USE_ON_FLY_SCROLL #endif @@ -77,7 +58,6 @@ */ #if (defined(FEAT_DND) && defined(FEAT_GUI_GTK)) \ || defined(FEAT_GUI_MSWIN) \ - || defined(FEAT_GUI_MAC) \ || defined(FEAT_GUI_HAIKU) # define HAVE_DROP_FILE #endif @@ -209,9 +189,6 @@ typedef struct GuiScrollbar #if FEAT_GUI_HAIKU VimScrollBar *id; // Pointer to real scroll bar #endif -#ifdef FEAT_GUI_MAC - ControlHandle id; // A handle to the scrollbar -#endif #ifdef FEAT_GUI_PHOTON PtWidget_t *id; #endif @@ -435,7 +412,7 @@ typedef struct Gui #if defined(FEAT_GUI_TABLINE) \ && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ - || defined(FEAT_GUI_MAC) || defined(FEAT_GUI_HAIKU)) + || defined(FEAT_GUI_HAIKU)) int tabline_height; #endif @@ -473,14 +450,6 @@ typedef struct Gui int vdcmp; // Vim Direct Communication Message Port #endif -#ifdef FEAT_GUI_MAC - WindowPtr VimWindow; - MenuHandle MacOSHelpMenu; // Help menu provided by the MacOS - int MacOSHelpItems; // Nr of help-items supplied by MacOS - WindowPtr wid; // Window id of text area - int visibility; // Is window partially/fully obscured? -#endif - #ifdef FEAT_GUI_PHOTON PtWidget_t *vimWindow; // PtWindow PtWidget_t *vimTextArea; // PtRaw @@ -599,6 +568,6 @@ typedef enum # endif #endif // FEAT_GUI_GTK -#if defined(UNIX) && !defined(FEAT_GUI_MAC) +#if defined(UNIX) # define GUI_MAY_FORK #endif -- cgit v1.2.3