[ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation'

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 339734afb1d96e0e8b4da12fb37b0a34f0dde202..82b65ed06be632bb9c528d7e27bbf1d92c90a85d 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -318,10 +318,10 @@ bool wxTopLevelWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam)
     SHACTIVATEINFO *info = (SHACTIVATEINFO*) m_activateInfo;
     if ( info )
     {
-        return SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info) == TRUE;
+        SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info);
     }
 
-    return false;
+    return wxWindowMSW::HandleSettingChange(wParam, lParam);
 }
 #endif
 
@@ -349,18 +349,6 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
 
             break;
         }
-        case WM_SETTINGCHANGE:
-        {
-            processed = HandleSettingChange(wParam, lParam);
-
-            // if it was processed will still need to allow the base class to
-            // forward this message to child windows
-            if ( processed )
-            {
-                wxTopLevelWindowBase::MSWWindowProc(message, wParam, lParam);
-            }
-            break;
-        }
         case WM_HIBERNATE:
         {
             if (wxTheApp)
@@ -736,8 +724,8 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
 
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
-#ifdef __WXWINCE__
-    return false;
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    return true;
 #else
     return m_maximizeOnShow || ::IsZoomed(GetHwnd()) != 0;
 #endif