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

wxMSWUniv build fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-07-18 13:36:31 +00:00
parent c447205527
commit b4626104e5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/msw/evtloop.h
View File

@@ -44,11 +44,11 @@ public:
// //
// calling this function with NULL argument restores the normal event // calling this function with NULL argument restores the normal event
// handling // handling
static void SetCriticalWindow(wxWindow *win) { ms_winCritical = win; } static void SetCriticalWindow(wxWindowMSW *win) { ms_winCritical = win; }
// return true if there is no critical window or if this window is [a child // return true if there is no critical window or if this window is [a child
// of] the critical one // of] the critical one
static bool AllowProcessing(wxWindow *win) static bool AllowProcessing(wxWindowMSW *win)
{ {
return !ms_winCritical || IsChildOfCriticalWindow(win); return !ms_winCritical || IsChildOfCriticalWindow(win);
} }
@@ -56,11 +56,11 @@ public:
protected: protected:
// check if the given window is a child of ms_winCritical (which must be // check if the given window is a child of ms_winCritical (which must be
// non NULL) // non NULL)
static bool IsChildOfCriticalWindow(wxWindow *win); static bool IsChildOfCriticalWindow(wxWindowMSW *win);
// critical window or NULL // critical window or NULL
static wxWindow *ms_winCritical; static wxWindowMSW *ms_winCritical;
// the loop exit code // the loop exit code
int m_exitcode; int m_exitcode;

4
src/msw/evtloop.cpp
View File

@@ -85,7 +85,7 @@ private:
// ============================================================================ // ============================================================================
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
wxWindow *wxEventLoop::ms_winCritical = NULL; wxWindowMSW *wxEventLoop::ms_winCritical = NULL;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// ctor/dtor // ctor/dtor
@@ -112,7 +112,7 @@ void wxEventLoop::ProcessMessage(WXMSG *msg)
} }
} }
bool wxEventLoop::IsChildOfCriticalWindow(wxWindow *win) bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
{ {
while ( win ) while ( win )
{ {