Fix building the Mac version with GUI.

diff --git a/src/Makefile b/src/Makefile
index 00306b93a4e5f7fee53d931713f34989f2b38ce1..5719b3c8e959a64085775416731df55912395b9b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -357,6 +357,9 @@ CClink = $(CC)
 #CONF_OPT_GUI = --enable-gui=athena
 #CONF_OPT_GUI = --enable-gui=nextaw
 
+# Carbon GUI for Mac OS X
+#CONF_OPT_GUI = --enable-gui=carbon
+
 # DARWIN - detecting Mac OS X
 # Uncomment this line when you want to compile a Unix version of Vim on
 # Darwin.  None of the Mac specific options or files will be used.

diff --git a/src/gui_mac.c b/src/gui_mac.c
index 2f0f7f865713e1192f0b337ed3e364f36920407b..d83a1379a50fc9e66a2d811cadc252f7416a8b42 100644 (file)
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -2597,6 +2597,12 @@ bail:
     return CallNextEventHandler(nextHandler, theEvent);
 }
 
+     void
+gui_mch_mousehide(int hide)
+{
+    /* TODO */
+}
+
 #if 0
 
 /*

diff --git a/src/os_macosx.m b/src/os_macosx.m
index 34a7012120e97e722255f8f4e43e9db2ce6ec64b..08997e562f733bf09373dea0e5ec659717fe4bbe 100644 (file)
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -19,7 +19,12 @@
 #import <Cocoa/Cocoa.h>
 
 
-#ifdef FEAT_CLIPBOARD
+/*
+ * Clipboard support for the console.
+ * Don't include this when building the GUI version, the functions in
+ * gui_mac.c are used then.
+ */
+#if defined(FEAT_CLIPBOARD) && !defined(FEAT_GUI)
 
 /* Used to identify clipboard data copied from Vim. */
 

diff --git a/src/proto/gui_mac.pro b/src/proto/gui_mac.pro
index 29ab9d3834fbccf703202c2dddb4f8e66414f146..ba6e2ad42d1067af08b7a0d6e2a93a66abf5e872 100644 (file)
--- a/src/proto/gui_mac.pro
+++ b/src/proto/gui_mac.pro
@@ -139,6 +139,7 @@ void gui_mac_doKeyEvent __ARGS((EventRecord *theEvent));
 void gui_mac_doMouseDownEvent __ARGS((EventRecord *theEvent));
 void gui_mac_doMouseMovedEvent __ARGS((EventRecord *event));
 void gui_mac_doMouseUpEvent __ARGS((EventRecord *theEvent));
+void gui_mch_mousehide __ARGS((int hide));
 
 int C2PascalString (char_u *CString, Str255 *PascalString);
 int GetFSSpecFromPath ( char_u *file, FSSpec *fileFSSpec);