From 1272e71b8ab50b65f24036a7fd0002d1bef59928 Mon Sep 17 00:00:00 2001
From: =?utf8?q?W=C5=82odzimierz=20Skiba?= <abx@abx.art.pl>
Date: Sat, 25 Feb 2006 23:11:26 +0000
Subject: [PATCH] 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
---
 include/wx/msw/toplevel.h |  2 +-
 include/wx/msw/window.h   |  2 +-
 src/msw/toplevel.cpp      | 16 ++--------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index f94199319d..3647a33b9b 100644
--- 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
-    bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
+    virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
 #endif
 
     // translate wxWidgets flags to Windows ones
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index e95c957a2f..c11f9fdaaa 100644
--- 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 HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
+    virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
 
     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 339734afb1..c1bba3066e 100644
--- 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)
-- 
2.47.2