SF.net SVN: mahogany:[7566] trunk/M

Revision: 7566
          http://mahogany.svn.sourceforge.net/mahogany/?rev=7566&view=rev
Author:   vadz
Date:     2009-05-08 16:00:20 +0000 (Fri, 08 May 2009)

Log Message:
-----------
don't test for wxFONTENCODING_ISO2022_JP using #ifdef, this is never going to work as it's an enum element

Modified Paths:
--------------
    trunk/M/include/gui/wxMenuDefs.h
    trunk/M/src/gui/wxMenuDefs.cpp

Modified: trunk/M/include/gui/wxMenuDefs.h
===================================================================
--- trunk/M/include/gui/wxMenuDefs.h	2009-03-29 13:24:14 UTC (rev 7565)
+++ trunk/M/include/gui/wxMenuDefs.h	2009-05-08 16:00:20 UTC (rev 7566)
@@ -331,9 +331,7 @@
    WXMENU_LANG_CP1256,
    WXMENU_LANG_CP1257,
    WXMENU_LANG_KOI8,
-#ifdef wxFONTENCODING_ISO2022_JP
    WXMENU_LANG_ISO2022JP,
-#endif
    WXMENU_LANG_SJIS,
    WXMENU_LANG_GB2312,
    WXMENU_LANG_BIG5,

Modified: trunk/M/src/gui/wxMenuDefs.cpp
===================================================================
--- trunk/M/src/gui/wxMenuDefs.cpp	2009-03-29 13:24:14 UTC (rev 7565)
+++ trunk/M/src/gui/wxMenuDefs.cpp	2009-05-08 16:00:20 UTC (rev 7566)
@@ -526,9 +526,7 @@
    { WXMENU_LANG_CP1256, gettext_noop("Windows Arabic (CP 125&6)"), "", wxITEM_RADIO },
    { WXMENU_LANG_CP1257, gettext_noop("Windows Baltic (CP 125&7)"), "", wxITEM_RADIO },
    { WXMENU_LANG_KOI8, gettext_noop("Russian (KOI&8-R)"), "", wxITEM_RADIO },
-#ifdef wxFONTENCODING_ISO2022_JP
    { WXMENU_LANG_ISO2022JP, gettext_noop("&Japanese (ISO-2022-JP)"), "", wxITEM_RADIO },
-#endif
    { WXMENU_LANG_SJIS, gettext_noop("Japanese (Shift&-JIS)"), "", wxITEM_RADIO },
    { WXMENU_LANG_GB2312, gettext_noop("Chinese Si&mplified (GB2312)"), "", wxITEM_RADIO },
    { WXMENU_LANG_BIG5, gettext_noop("Chinese &Traditional (Big5)"), "", wxITEM_RADIO },
@@ -908,11 +906,9 @@
          id = WXMENU_LANG_KOI8;
          break;
 
-#ifdef wxFONTENCODING_ISO2022_JP
       case wxFONTENCODING_ISO2022_JP:
          id = WXMENU_LANG_ISO2022JP;
          break;
-#endif
 
       case wxFONTENCODING_SHIFT_JIS:
          id = WXMENU_LANG_SJIS;
@@ -972,9 +968,7 @@
       WXMENU_LANG_CP1256,
       WXMENU_LANG_CP1257,
       WXMENU_LANG_KOI8,
-#ifdef wxFONTENCODING_ISO2022_JP
       WXMENU_LANG_ISO2022JP,
-#endif
       WXMENU_LANG_SJIS,
       WXMENU_LANG_GB2312,
       WXMENU_LANG_BIG5,
@@ -1040,11 +1034,9 @@
          encoding = wxFONTENCODING_KOI8;
          break;
 
-#ifdef wxFONTENCODING_ISO2022_JP
       case WXMENU_LANG_ISO2022JP:
          encoding = wxFONTENCODING_ISO2022_JP;
          break;
-#endif
 
       case WXMENU_LANG_SJIS:
          encoding = wxFONTENCODING_SHIFT_JIS;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image 
processing features enabled. http://p.sf.net/sfu/kodak-com