Revitalise SIP support in all toplevel wince windows.

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

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index f94199319d5b8c22d523f6daef8e092673ae4ffa..3647a33b9b62a938f1267201014e7aa9d2ee8434 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -89,7 +89,7 @@ public:
 
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     // Soft Input Panel (SIP) change notification
 
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     // Soft Input Panel (SIP) change notification

-    bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
+    virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);

 #endif
 
     // translate wxWidgets flags to Windows ones
 #endif
 
     // translate wxWidgets flags to Windows ones

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index e95c957a2f281843f5c2fce2e6a6167e29e35890..c11f9fdaaa6db14f480a7c8d7dd9fa88ca787762 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -299,7 +299,7 @@ public:
     bool HandleSysColorChange();
     bool HandleDisplayChange();
     bool HandleCaptureChanged(WXHWND gainedCapture);
     bool HandleSysColorChange();
     bool HandleDisplayChange();
     bool HandleCaptureChanged(WXHWND gainedCapture);

-    bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
+    virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);

 
     bool HandleQueryEndSession(long logOff, bool *mayEnd);
     bool HandleEndSession(bool endSession, long logOff);
 
     bool HandleQueryEndSession(long logOff, bool *mayEnd);
     bool HandleEndSession(bool endSession, long logOff);

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 339734afb1d96e0e8b4da12fb37b0a34f0dde202..c1bba3066e78387ab65a49795219afb0a9fcfba0 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 )
     {
     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
 
 }
 #endif
 


@@ -349,18 +349,6 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
 
             break;
         }
 
             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)
         case WM_HIBERNATE:
         {
             if (wxTheApp)