From 25e2f480a7865625b25753d159ae351b78d337b9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 12 Jan 2006 18:57:28 +0000 Subject: [PATCH] define wxEventLoopBase::ms_activeLoop in appcmn.cpp instead of doing it in all platform-dependent evtloop.cpp files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/evtloop.mm | 2 -- src/common/appcmn.cpp | 3 +++ src/gtk/evtloop.cpp | 2 -- src/gtk1/evtloop.cpp | 2 -- src/mgl/evtloop.cpp | 2 -- src/motif/evtloop.cpp | 2 -- src/msw/evtloop.cpp | 1 - src/os2/evtloop.cpp | 2 -- src/palmos/evtloop.cpp | 2 -- src/x11/evtloop.cpp | 2 -- 10 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm index 4a3a94be67..add5528e94 100644 --- a/src/cocoa/evtloop.mm +++ b/src/cocoa/evtloop.mm @@ -48,8 +48,6 @@ private: // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - wxEventLoop::~wxEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index e19c11697a..69731dd219 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -63,6 +63,9 @@ WX_CHECK_BUILD_OPTIONS("wxCore") // this defines wxEventLoopPtr wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop) +// define it here as we don't have common/evtloopcmn.cpp for now +wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; + // ============================================================================ // wxAppBase implementation // ============================================================================ diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp index 7d9af25874..d684ccb0eb 100644 --- a/src/gtk/evtloop.cpp +++ b/src/gtk/evtloop.cpp @@ -56,8 +56,6 @@ private: // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - wxEventLoop::~wxEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); diff --git a/src/gtk1/evtloop.cpp b/src/gtk1/evtloop.cpp index 7d9af25874..d684ccb0eb 100644 --- a/src/gtk1/evtloop.cpp +++ b/src/gtk1/evtloop.cpp @@ -56,8 +56,6 @@ private: // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - wxEventLoop::~wxEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp index 10f6b5d12e..58c868ada8 100644 --- a/src/mgl/evtloop.cpp +++ b/src/mgl/evtloop.cpp @@ -104,8 +104,6 @@ bool wxEventLoopImpl::SendIdleEvent() // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - wxEventLoop::~wxEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp index c8380862ba..424b96c5ab 100644 --- a/src/motif/evtloop.cpp +++ b/src/motif/evtloop.cpp @@ -96,8 +96,6 @@ bool wxEventLoopImpl::SendIdleMessage() // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - wxEventLoop::~wxEventLoop() { wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") ); diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp index 2b6dd09984..7b08e7deca 100644 --- a/src/msw/evtloop.cpp +++ b/src/msw/evtloop.cpp @@ -52,7 +52,6 @@ // wxEventLoop implementation // ============================================================================ -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; wxWindowMSW *wxEventLoop::ms_winCritical = NULL; // ---------------------------------------------------------------------------- diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp index 08b13d53de..8ed9c42574 100644 --- a/src/os2/evtloop.cpp +++ b/src/os2/evtloop.cpp @@ -199,8 +199,6 @@ bool wxEventLoopImpl::SendIdleMessage() // wxEventLoop implementation // ============================================================================ -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - // ---------------------------------------------------------------------------- // wxEventLoop running and exiting // ---------------------------------------------------------------------------- diff --git a/src/palmos/evtloop.cpp b/src/palmos/evtloop.cpp index 51dce71214..ec93249cbc 100644 --- a/src/palmos/evtloop.cpp +++ b/src/palmos/evtloop.cpp @@ -55,8 +55,6 @@ // wxEventLoop implementation // ============================================================================ -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - // ---------------------------------------------------------------------------- // ctor/dtor // ---------------------------------------------------------------------------- diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp index b44f46e8de..408d6fee34 100644 --- a/src/x11/evtloop.cpp +++ b/src/x11/evtloop.cpp @@ -339,8 +339,6 @@ bool wxEventLoopImpl::SendIdleEvent() // wxEventLoop implementation // ============================================================================ -wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL; - // ---------------------------------------------------------------------------- // wxEventLoop running and exiting // ---------------------------------------------------------------------------- -- 2.45.2