Some more NanoX compile fixes

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

diff --git a/include/wx/fontenc.h b/include/wx/fontenc.h
index 4af4ca20d2a6a8bcca2d6d649122b7e362f53018..d4a9ee6a1e1e6bcacca6b45a84fbf0baaa4a481c 100644 (file)
--- a/include/wx/fontenc.h
+++ b/include/wx/fontenc.h
@@ -54,6 +54,10 @@ enum wxFontEncoding
     wxFONTENCODING_CP866,           // and another one
         // and for Windows
     wxFONTENCODING_CP874,           // WinThai
     wxFONTENCODING_CP866,           // and another one
         // and for Windows
     wxFONTENCODING_CP874,           // WinThai

+    wxFONTENCODING_CP932,           // Japanese (shift-JIS)
+    wxFONTENCODING_CP936,           // Chinese simplified (GB)
+    wxFONTENCODING_CP949,           // Korean (Hangul charset)
+    wxFONTENCODING_CP950,           // Chinese (traditional - Big5)

     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
     wxFONTENCODING_CP1252,          // WinLatin1
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
     wxFONTENCODING_CP1252,          // WinLatin1


@@ -63,7 +67,10 @@ enum wxFontEncoding
     wxFONTENCODING_CP1256,          // WinArabic
     wxFONTENCODING_CP1257,          // WinBaltic (same as Latin 7)
     wxFONTENCODING_CP12_MAX,
     wxFONTENCODING_CP1256,          // WinArabic
     wxFONTENCODING_CP1257,          // WinBaltic (same as Latin 7)
     wxFONTENCODING_CP12_MAX,

-    
+
+    wxFONTENCODING_UTF7,            // UTF-7 Unicode encoding
+    wxFONTENCODING_UTF8,            // UTF-8 Unicode encoding
+

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


@@ -74,6 +81,8 @@ enum wxFontEncoding
 // types
 // ----------------------------------------------------------------------------
 
 // types
 // ----------------------------------------------------------------------------
 

+#if wxUSE_GUI
+

 // This private structure specifies all the parameters needed to create a font
 // with the given encoding on this platform.
 //
 // This private structure specifies all the parameters needed to create a font
 // with the given encoding on this platform.
 //


@@ -100,6 +109,8 @@ struct WXDLLEXPORT wxNativeEncodingInfo
 #elif defined(_WX_X_FONTLIKE)
     wxString xregistry,
              xencoding;
 #elif defined(_WX_X_FONTLIKE)
     wxString xregistry,
              xencoding;

+#elif defined(__WXMGL__)
+    int      mglEncoding;

 #else
     #error "Unsupported toolkit"
 #endif
 #else
     #error "Unsupported toolkit"
 #endif


@@ -110,4 +121,6 @@ struct WXDLLEXPORT wxNativeEncodingInfo
     wxString ToString() const;
 };
 
     wxString ToString() const;
 };
 

+#endif // wxUSE_GUI
+

 #endif // _WX_FONTENC_H_
 #endif // _WX_FONTENC_H_