some cleanup, and plug a few small holes

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 220d37e1b7bdd3891f1c8acece2ebd5f67d0e19b..bac473af42d39b8c8106a09adc1dbdffab09b572 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -417,7 +417,11 @@ void wxNativeFontInfo::Init()
 
     // we get better font quality if we use this instead of DEFAULT_QUALITY
     // apparently without any drawbacks
+#ifdef __WXWINCE__
+    lf.lfQuality = CLEARTYPE_QUALITY;
+#else
     lf.lfQuality = PROOF_QUALITY;
+#endif
 }
 
 int wxNativeFontInfo::GetPointSize() const
@@ -634,7 +638,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
             // is returned as default GUI font for compatibility
             int verMaj;
             ff_family = FF_SWISS;
-            if(wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
+            if(wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
                 facename.Add(_T("MS Shell Dlg 2"));
             else
                 facename.Add(_T("MS Shell Dlg"));