moved wxDash typedef to gdicmn.h

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

diff --git a/include/wx/font.h b/include/wx/font.h
index cf30f6585dfa3798f6b245ddcab53f4bd9fdbeac..6b1737db518b97972cdcebd08b83c59184d36274 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -105,6 +105,7 @@ enum wxFontEncoding
     wxFONTENCODING_CP855,           // another cyrillic encoding
     wxFONTENCODING_CP866,           // and another one
         // and for Windows
+    wxFONTENCODING_CP874,           // WinThai
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
     wxFONTENCODING_CP1252,          // WinLatin1
@@ -114,6 +115,9 @@ enum wxFontEncoding
     wxFONTENCODING_CP1256,          // WinArabic
     wxFONTENCODING_CP1257,          // WinBaltic (same as Latin 7)
     wxFONTENCODING_CP12_MAX,
+    
+    wxFONTENCODING_UNICODE,         // Unicode - currently used only by
+                                    // wxEncodingConverter class
 
     wxFONTENCODING_MAX
 };
@@ -124,7 +128,7 @@ enum wxFontEncoding
 
 class WXDLLEXPORT wxFontRefData;
 
-class wxFontBase : public wxGDIObject
+class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
     // creator function