]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/fontcmn.cpp
added wxStaticText::Wrap()
[wxWidgets.git] / src / common / fontcmn.cpp
index dcb846f6f5f830cbab9055844fb1a47b8e59ed97..99466a583e84a4e7166e099f64a4f7d10551c20b 100644 (file)
@@ -29,6 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/dc.h"
     #include "wx/font.h"
     #include "wx/intl.h"
     #include "wx/dcscreen.h"
@@ -36,7 +37,7 @@
 
 #include "wx/gdicmn.h"
 
-#if defined(__WXMSW__) && !defined(__PALMOS__)
+#if defined(__WXMSW__)
   #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
   #include  "wx/msw/winundef.h"
 #endif
@@ -602,7 +603,7 @@ wxString wxNativeFontInfo::ToUserString() const
     wxFontEncoding enc = GetEncoding();
     if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
     {
-        desc << _T(' ') << wxFontMapper::Get()->GetEncodingName(enc);
+        desc << _T(' ') << wxFontMapper::GetEncodingName(enc);
     }
 #endif // wxUSE_FONTMAP