Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revitalise SIP support in all toplevel wince windows.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-02-25 23:11:26 +00:00
parent 555b2ce915
commit 1272e71b8a
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/toplevel.h
View File

@@ -89,7 +89,7 @@ public:
#if defined(__SMARTPHONE__) || defined(__POCKETPC__) #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
// Soft Input Panel (SIP) change notification // Soft Input Panel (SIP) change notification
bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam); virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
#endif #endif
// translate wxWidgets flags to Windows ones // translate wxWidgets flags to Windows ones

2
include/wx/msw/window.h
View File

@@ -299,7 +299,7 @@ public:
bool HandleSysColorChange(); bool HandleSysColorChange();
bool HandleDisplayChange(); bool HandleDisplayChange();
bool HandleCaptureChanged(WXHWND gainedCapture); bool HandleCaptureChanged(WXHWND gainedCapture);
bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam); virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
bool HandleQueryEndSession(long logOff, bool *mayEnd); bool HandleQueryEndSession(long logOff, bool *mayEnd);
bool HandleEndSession(bool endSession, long logOff); bool HandleEndSession(bool endSession, long logOff);

16
src/msw/toplevel.cpp
View File

@@ -318,10 +318,10 @@ bool wxTopLevelWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam)
SHACTIVATEINFO *info = (SHACTIVATEINFO*) m_activateInfo; SHACTIVATEINFO *info = (SHACTIVATEINFO*) m_activateInfo;
if ( info ) 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: case WM_HIBERNATE:
{ {
if (wxTheApp) if (wxTheApp)