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

Fixes for WinCE build caused by my last commit.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jamie Gadd
2006-02-25 03:36:45 +00:00
parent fb7e87effa
commit b7e5ba8f2d
3 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,11 @@ public:
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg); virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
#endif // __SMARTPHONE__ && __WXWINCE__ #endif // __SMARTPHONE__ && __WXWINCE__
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
// Soft Input Panel (SIP) change notification
bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
#endif
// translate wxWidgets flags to Windows ones // translate wxWidgets flags to Windows ones
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;

25
src/msw/toplevel.cpp
View File

@@ -312,6 +312,19 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const
return (WXHWND)hwndParent; return (WXHWND)hwndParent;
} }
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
bool wxTopLevelWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam)
{
SHACTIVATEINFO *info = (SHACTIVATEINFO*) m_activateInfo;
if ( info )
{
return SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info) == TRUE;
}
return false;
}
#endif
WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{ {
WXLRESULT rc = 0; WXLRESULT rc = 0;
@@ -336,6 +349,18 @@ 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)

11
src/msw/window.cpp
View File

@@ -3957,17 +3957,6 @@ bool wxWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam)
node = node->GetNext(); node = node->GetNext();
} }
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
if ( IsTopLevel() )
{
SHACTIVATEINFO *info = (SHACTIVATEINFO*) m_activateInfo;
if ( info )
{
return SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info) == TRUE;
}
}
#endif // defined(__SMARTPHONE__) || defined(__POCKETPC__)
// let the system handle it // let the system handle it
return false; return false;
} }