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 9b3b5f29cdb20568068f0f16ce7fe3ef29993727..6b1737db518b97972cdcebd08b83c59184d36274 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -115,6 +115,9 @@ 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_UNICODE,         // Unicode - currently used only by
+                                    // wxEncodingConverter class

 
     wxFONTENCODING_MAX
 };
 
     wxFONTENCODING_MAX
 };


@@ -125,7 +128,7 @@ enum wxFontEncoding
 
 class WXDLLEXPORT wxFontRefData;
 
 
 class WXDLLEXPORT wxFontRefData;
 

-class wxFontBase : public wxGDIObject
+class WXDLLEXPORT wxFontBase : public wxGDIObject

 {
 public:
     // creator function
 {
 public:
     // creator function