diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-08-14 21:56:42 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-08-14 21:56:42 +0200 |
| commit | e00289df69c80e47e7352a62e0d1beaea2d20b46 (patch) | |
| tree | 85807ff99fd334353d33c458695b87008147de5f /src | |
| parent | 755bd26c59bc40322977da5674e6022c7ca65a9a (diff) | |
| download | vim-git-e00289df69c80e47e7352a62e0d1beaea2d20b46.tar.gz | |
Fix building the Mac version with GUI.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | src/gui_mac.c | 6 | ||||
| -rw-r--r-- | src/os_macosx.m | 7 | ||||
| -rw-r--r-- | src/proto/gui_mac.pro | 1 |
4 files changed, 16 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 00306b93a..5719b3c8e 100644 --- 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 2f0f7f865..d83a1379a 100644 --- 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 34a701212..08997e562 100644 --- 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 29ab9d383..ba6e2ad42 100644 --- 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); |