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
This commit is contained in:
@@ -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
|
||||
|
@@ -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);
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user