From b70362998b8f562923f6ed6708f06537ac056cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 13 Feb 2007 15:52:15 +0000 Subject: [PATCH] WinCE build fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/app.cpp | 10 ++++++++-- src/msw/toplevel.cpp | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 61218c7190..59b929c7ce 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -234,14 +234,20 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread) if ( !wxEventLoop::GetActive() ) return DoSimpleWaitForThread(hThread); + const DWORD wakeMask = + QS_ALLINPUT // return as soon as there are any events +#if !defined(__WXWINCE__) + | QS_ALLPOSTMESSAGE +#endif + ; + return ::MsgWaitForMultipleObjects ( 1, // number of objects to wait for (HANDLE *)&hThread, // the objects false, // wait for any objects, not all INFINITE, // no timeout - QS_ALLINPUT | // return as soon as there are any events - QS_ALLPOSTMESSAGE + wakeMask ); } diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index cc9f0bcc87..a3b75ce292 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -786,6 +786,9 @@ void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir) void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const { + +#ifndef __WXWINCE__ + if ( IsIconized() ) { WINDOWPLACEMENT wp; @@ -821,11 +824,15 @@ void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const } //else: normal case +#endif // __WXWINCE__ + wxTopLevelWindowBase::DoGetPosition(x, y); } void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const { +#ifndef __WXWINCE__ + if ( IsIconized() ) { WINDOWPLACEMENT wp; @@ -846,6 +853,8 @@ void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const } //else: normal case +#endif + wxTopLevelWindowBase::DoGetSize(width, height); }