WinCE build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -234,14 +234,20 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread)
|
|||||||
if ( !wxEventLoop::GetActive() )
|
if ( !wxEventLoop::GetActive() )
|
||||||
return DoSimpleWaitForThread(hThread);
|
return DoSimpleWaitForThread(hThread);
|
||||||
|
|
||||||
|
const DWORD wakeMask =
|
||||||
|
QS_ALLINPUT // return as soon as there are any events
|
||||||
|
#if !defined(__WXWINCE__)
|
||||||
|
| QS_ALLPOSTMESSAGE
|
||||||
|
#endif
|
||||||
|
;
|
||||||
|
|
||||||
return ::MsgWaitForMultipleObjects
|
return ::MsgWaitForMultipleObjects
|
||||||
(
|
(
|
||||||
1, // number of objects to wait for
|
1, // number of objects to wait for
|
||||||
(HANDLE *)&hThread, // the objects
|
(HANDLE *)&hThread, // the objects
|
||||||
false, // wait for any objects, not all
|
false, // wait for any objects, not all
|
||||||
INFINITE, // no timeout
|
INFINITE, // no timeout
|
||||||
QS_ALLINPUT | // return as soon as there are any events
|
wakeMask
|
||||||
QS_ALLPOSTMESSAGE
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -786,6 +786,9 @@ void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
|
|||||||
|
|
||||||
void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
|
void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
|
||||||
{
|
{
|
||||||
|
|
||||||
|
#ifndef __WXWINCE__
|
||||||
|
|
||||||
if ( IsIconized() )
|
if ( IsIconized() )
|
||||||
{
|
{
|
||||||
WINDOWPLACEMENT wp;
|
WINDOWPLACEMENT wp;
|
||||||
@@ -821,11 +824,15 @@ void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
|
|||||||
}
|
}
|
||||||
//else: normal case
|
//else: normal case
|
||||||
|
|
||||||
|
#endif // __WXWINCE__
|
||||||
|
|
||||||
wxTopLevelWindowBase::DoGetPosition(x, y);
|
wxTopLevelWindowBase::DoGetPosition(x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
|
void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
|
||||||
{
|
{
|
||||||
|
#ifndef __WXWINCE__
|
||||||
|
|
||||||
if ( IsIconized() )
|
if ( IsIconized() )
|
||||||
{
|
{
|
||||||
WINDOWPLACEMENT wp;
|
WINDOWPLACEMENT wp;
|
||||||
@@ -846,6 +853,8 @@ void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
|
|||||||
}
|
}
|
||||||
//else: normal case
|
//else: normal case
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
wxTopLevelWindowBase::DoGetSize(width, height);
|
wxTopLevelWindowBase::DoGetSize(width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user