[ 1560860 ] wxComboCtrl EVT_TEXT filtering.

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 5fcc96ffc8c6b82c7a739617a6bae6d1c16233a8..bac473af42d39b8c8106a09adc1dbdffab09b572 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -414,6 +414,14 @@ void wxFontRefData::Free()
 void wxNativeFontInfo::Init()
 {
     wxZeroMemory(lf);
 void wxNativeFontInfo::Init()
 {
     wxZeroMemory(lf);

+
+    // 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
 }
 
 int wxNativeFontInfo::GetPointSize() const


@@ -630,7 +638,7 @@ void wxNativeFontInfo::SetFamily(wxFontFamily family)
             // is returned as default GUI font for compatibility
             int verMaj;
             ff_family = FF_SWISS;
             // 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"));
                 facename.Add(_T("MS Shell Dlg 2"));
             else
                 facename.Add(_T("MS Shell Dlg"));