diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-15 22:59:18 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-15 22:59:18 +0000 |
| commit | 7d47b6eed707db9af160ec517b71e1f9fdac1a0f (patch) | |
| tree | f93785b6fba72029e272fac10caed4cda5c09f4e /src/gui_mac.c | |
| parent | 5671873089d516a10c79733182797075071eb5f3 (diff) | |
updated for version 7.0225
Diffstat (limited to 'src/gui_mac.c')
| -rw-r--r-- | src/gui_mac.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui_mac.c b/src/gui_mac.c index c4250a00af..d05fddb2a9 100644 --- a/src/gui_mac.c +++ b/src/gui_mac.c @@ -52,8 +52,8 @@ static EventHandlerUPP mouseWheelHandlerUPP = NULL; SInt32 gMacSystemVersion; -#if defined(FEAT_MBYTE) -#define USE_CARBONKEYHANDLER +#ifdef MACOS_CONVERT +# define USE_CARBONKEYHANDLER static EventHandlerUPP keyEventHandlerUPP = NULL; #endif @@ -130,7 +130,7 @@ static struct Boolean isPanelVisible; } gFontPanelInfo = { 0, 0, 0, false }; -#if defined(FEAT_MBYTE) +#ifdef MACOS_CONVERT # define USE_ATSUI_DRAWING ATSUStyle gFontStyle; Boolean gIsFontFallbackSet; @@ -419,7 +419,7 @@ points_to_pixels(char_u *str, char_u **end, int vertical) return pixels; } -#if defined(FEAT_MBYTE) +#ifdef MACOS_CONVERT /* * Deletes all traces of any Windows-style mnemonic text (including any * parentheses) from a menu item and returns the cleaned menu item title. @@ -4437,7 +4437,7 @@ clip_mch_request_selection(VimClipboard *cbd) #endif tempclip[scrapSize] = 0; -#if defined(FEAT_MBYTE) +#ifdef MACOS_CONVERT /* Convert from utf-16 (clipboard) */ size_t encLen = 0; char_u *to = mac_utf16_to_enc((UniChar *)tempclip, scrapSize, &encLen); @@ -4510,7 +4510,7 @@ clip_mch_set_selection(VimClipboard *cbd) type = clip_convert_selection(&str, (long_u *) &scrapSize, cbd); -#if defined(FEAT_MBYTE) +#ifdef MACOS_CONVERT size_t utf16_len = 0; UniChar *to = mac_enc_to_utf16(str, scrapSize, &utf16_len); if (to) @@ -4628,7 +4628,7 @@ gui_mch_add_menu(vimmenu_T *menu, int idx) menu_after_me = hierMenu; /* Convert the name */ -#if defined(FEAT_MBYTE) +#ifdef MACOS_CONVERT name = menu_title_removing_mnemonic(menu); #else name = C2Pascal_save(menu->dname); @@ -4721,7 +4721,7 @@ gui_mch_add_menu_item(vimmenu_T *menu, int idx) for older OS call GetMenuItemData (menu, item, isCommandID?, data) */ /* Convert the name */ -#if defined(FEAT_MBYTE) +#ifdef MACOS_CONVERT name = menu_title_removing_mnemonic(menu); #else name = C2Pascal_save(menu->dname); @@ -5745,7 +5745,7 @@ gui_mch_settitle(char_u *title, char_u *icon) /* TODO: Get vim to make sure maxlen (from p_titlelen) is smaller * that 256. Even better get it to fit nicely in the titlebar. */ -#if defined(FEAT_MBYTE) +#ifdef MACOS_CONVERT CFStringRef windowTitle; size_t windowTitleLen; #else @@ -5755,7 +5755,7 @@ gui_mch_settitle(char_u *title, char_u *icon) if (title == NULL) /* nothing to do */ return; -#if defined(FEAT_MBYTE) +#ifdef MACOS_CONVERT windowTitleLen = STRLEN(title); windowTitle = mac_enc_to_cfstring(title, windowTitleLen); |