iconv-based conversion works again, after being broken for a while

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index d3e49f82c6848d4cdf75c63f0a021267abe97b37..da044989f1dd390c4ae6693c9419444d0cb741f1 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -442,12 +442,9 @@ void wxInitializeStockObjects ()
 #else
 #endif
 */
-#if defined(__WXMAC__)
+#if defined(__WXMAC__) || defined(__WXPM__)
   static const int sizeFont = 12;
   wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
-#elif defined(__WXPM__)
-  static const int sizeFont = 10;
-  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
 #else
   wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
   static const int sizeFont = wxNORMAL_FONT->GetPointSize();