diff options
| author | Tatsuya Kinoshita <tats@vega.ocn.ne.jp> | 2011-05-04 07:23:02 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@vega.ocn.ne.jp> | 2011-05-04 07:23:02 +0000 |
| commit | 6db339b3d7a391f196e7c4b725a4ed0bd00f31cf (patch) | |
| tree | 7d6fed976b72694d61fc595a745d394e1cd6e1a5 /menu.c | |
| parent | Adding upstream version 0.5.1 (diff) | |
| download | w3m-6db339b3d7a391f196e7c4b725a4ed0bd00f31cf.tar.gz w3m-6db339b3d7a391f196e7c4b725a4ed0bd00f31cf.zip | |
Adding upstream version 0.5.2upstream/0.5.2
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $Id: menu.c,v 1.41 2004/03/23 16:44:02 ukai Exp $ */ +/* $Id: menu.c,v 1.46 2007/05/23 12:34:20 inu Exp $ */ /* * w3m menu.c */ @@ -1183,7 +1183,7 @@ mMouse(char c) int btn, x, y; btn = (unsigned char)getch() - 32; -#if defined(__CYGWIN__) +#if defined(__CYGWIN__) && CYGWIN_VERSION_DLL_MAJOR < 1005 if (cygwin_mouse_btn_swapped) { if (btn == MOUSE_BTN2_DOWN) btn = MOUSE_BTN3_DOWN; @@ -1711,13 +1711,13 @@ initMenu(void) #ifdef USE_M17N if (!MainMenuEncode) { MenuItem *item; -#if ENABLE_NLS +#ifdef ENABLE_NLS /* FIXME: charset that gettext(3) returns */ MainMenuCharset = SystemCharset; #endif for (item = MainMenuItem; item->type != MENU_END; item++) item->label = - wc_conv(gettext(item->label), MainMenuCharset, + wc_conv(_(item->label), MainMenuCharset, InnerCharset)->ptr; MainMenuEncode = TRUE; } |