compilation fix for non-PCH

[wxWidgets.git] / include / wx / fontenc.h

diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h
index d4a9ee6a1e1e6bcacca6b45a84fbf0baaa4a481c..afa99f08f1019cff877ba169c4bac5bb7a2002e0 100644 (file)
--- a/include/wx/fontenc.h
+++ b/include/wx/fontenc.h
@@ -71,6 +71,15 @@ enum wxFontEncoding
     wxFONTENCODING_UTF7,            // UTF-7 Unicode encoding
     wxFONTENCODING_UTF8,            // UTF-8 Unicode encoding
 
     wxFONTENCODING_UTF7,            // UTF-7 Unicode encoding
     wxFONTENCODING_UTF8,            // UTF-8 Unicode encoding
 

+    // Far Eastern encodings
+        // Chinese
+    wxFONTENCODING_GB2312 = wxFONTENCODING_CP936, // Simplified Chinese
+    wxFONTENCODING_BIG5 = wxFONTENCODING_CP950,   // Traditional Chinese
+
+        // 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_UNICODE,         // Unicode - currently used only by
                                     // wxEncodingConverter class
 
     wxFONTENCODING_UNICODE,         // Unicode - currently used only by
                                     // wxEncodingConverter class
 


@@ -103,12 +112,19 @@ struct WXDLLEXPORT wxNativeEncodingInfo
     wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__)
     wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__)

-    wxNativeEncodingInfo() { charset = 0; /* ANSI_CHARSET */ }
+    wxNativeEncodingInfo()
+        : facename()
+        , encoding(wxFONTENCODING_SYSTEM)
+        , charset(0) /* ANSI_CHARSET */
+    { }

 
     int      charset;
 #elif defined(_WX_X_FONTLIKE)
     wxString xregistry,
              xencoding;
 
     int      charset;
 #elif defined(_WX_X_FONTLIKE)
     wxString xregistry,
              xencoding;

+#elif defined(__WXGTK20__)
+    // No way to specify this in Pango as this
+    // seems to be handled internally.

 #elif defined(__WXMGL__)
     int      mglEncoding;
 #else
 #elif defined(__WXMGL__)
     int      mglEncoding;
 #else