Applied [ 703260 ] wxFontEncoding Problem

Backported from trunk git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-04-06 16:53:16 +00:00
parent 466a7a71c7
commit 2d50f4b5f2
2 changed files with 2 additions and 1 deletions
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -182,6 +182,7 @@ All:
 - fix for deleting entries at root level in wxFileConfig
 - wxStopWatch::Start() didn't resume it contrary to the docs
 - accept '\r' as delimiter when parsing dates
+- fixed duplicate wxFontEncoding values

 Unix (GUI):

--- a/include/wx/fontenc.h
+++ b/include/wx/fontenc.h
@@ -78,7 +78,7 @@ enum wxFontEncoding

        // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html)
    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932,  // Shift JIS
-    wxFONTENCODING_EUC_JP,          // Extended Unix Codepage for Japanese
+    wxFONTENCODING_EUC_JP = wxFONTENCODING_UTF8 + 1,  // Extended Unix Codepage for Japanese

    wxFONTENCODING_UNICODE,         // Unicode - currently used only by
                                    // wxEncodingConverter class