From b4626104e5a68430c5c7c4f3a0b79425be9945e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 18 Jul 2005 13:36:31 +0000 Subject: [PATCH] wxMSWUniv build fix. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/evtloop.h | 8 ++++---- src/msw/evtloop.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h index eec606477b..a5c7720028 100644 --- a/include/wx/msw/evtloop.h +++ b/include/wx/msw/evtloop.h @@ -44,11 +44,11 @@ public: // // calling this function with NULL argument restores the normal event // 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 // of] the critical one - static bool AllowProcessing(wxWindow *win) + static bool AllowProcessing(wxWindowMSW *win) { return !ms_winCritical || IsChildOfCriticalWindow(win); } @@ -56,11 +56,11 @@ public: protected: // check if the given window is a child of ms_winCritical (which must be // non NULL) - static bool IsChildOfCriticalWindow(wxWindow *win); + static bool IsChildOfCriticalWindow(wxWindowMSW *win); // critical window or NULL - static wxWindow *ms_winCritical; + static wxWindowMSW *ms_winCritical; // the loop exit code int m_exitcode; diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index f87129486a..6534242141 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -85,7 +85,7 @@ private: // ============================================================================ wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; -wxWindow *wxEventLoop::ms_winCritical = NULL; +wxWindowMSW *wxEventLoop::ms_winCritical = NULL; // ---------------------------------------------------------------------------- // ctor/dtor @@ -112,7 +112,7 @@ void wxEventLoop::ProcessMessage(WXMSG *msg) } } -bool wxEventLoop::IsChildOfCriticalWindow(wxWindow *win) +bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win) { while ( win ) { -- 2.50.0