WinCE fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index f1f0d922020161165dc2787fc5edd7b0b7a19715..8bb3fcd9828b168a830bfe0dd36be814cfe721da 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -635,7 +635,10 @@ bool wxLaunchDefaultBrowser(const wxString& url)
         sei.hIcon = NULL;
         sei.hInstApp = NULL;
         sei.hkeyClass = NULL;
         sei.hIcon = NULL;
         sei.hInstApp = NULL;
         sei.hkeyClass = NULL;

+        // Not in WinCE
+#if 0

         sei.hMonitor = NULL;
         sei.hMonitor = NULL;

+#endif

         sei.hProcess = NULL;
         sei.hwnd = NULL;
         sei.lpClass = NULL;
         sei.hProcess = NULL;
         sei.hwnd = NULL;
         sei.lpClass = NULL;

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index da41a256e0d6be5dce0b0f5bc8fc2d3d80c17441..b58d672d585f8882797d5e964b634a11ff28ac95 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -457,7 +457,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     // to it without breaking backwards compatibility
 
     // classic Win32 version -- this can be useful when we move this into
     // to it without breaking backwards compatibility
 
     // classic Win32 version -- this can be useful when we move this into

-#if 0
+#ifdef __WXWINCE__

     UINT state = DFCS_BUTTONCHECK;
     if ( !IsEnabled() )
         state |= DFCS_INACTIVE;
     UINT state = DFCS_BUTTONCHECK;
     if ( !IsEnabled() )
         state |= DFCS_INACTIVE;

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 602d3f8e6209762ff8574b0f0971fd393ca8686b..69aebf7fc18b560529258219ff4825d4d5805683 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -225,12 +225,13 @@ wxFont wxCreateFontFromStockObject(int index)
         {
             wxNativeFontInfo info;
             info.lf = lf;
         {
             wxNativeFontInfo info;
             info.lf = lf;

+#ifndef __WXWINCE__

             // We want Windows 2000 or later to have new fonts even MS Shell Dlg
             // is returned as default GUI font for compatibility
             int verMaj;
             if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
                 wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
             // We want Windows 2000 or later to have new fonts even MS Shell Dlg
             // is returned as default GUI font for compatibility
             int verMaj;
             if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
                 wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));

-
+#endif

             // Under MicroWindows we pass the HFONT as well
             // because it's hard to convert HFONT -> LOGFONT -> HFONT
             // It's OK to delete stock objects, the delete will be ignored.
             // Under MicroWindows we pass the HFONT as well
             // because it's hard to convert HFONT -> LOGFONT -> HFONT
             // It's OK to delete stock objects, the delete will be ignored.