Mercurial > vim
changeset 2565:4b7929dad28a vim73
Fix building the Mac version with GUI.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sat, 14 Aug 2010 21:56:42 +0200 |
| parents | f85004953416 |
| children | f718404597a6 |
| files | src/Makefile src/gui_mac.c src/os_macosx.m src/proto/gui_mac.pro |
| diffstat | 4 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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 /*
--- 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. */
--- a/src/proto/gui_mac.pro +++ b/src/proto/gui_mac.pro @@ -139,6 +139,7 @@ void gui_mac_doKeyEvent __ARGS((EventRec 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);