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
This commit is contained in:
@@ -48,8 +48,6 @@ private:
|
|||||||
// wxEventLoop running and exiting
|
// wxEventLoop running and exiting
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
|
|
||||||
wxEventLoop::~wxEventLoop()
|
wxEventLoop::~wxEventLoop()
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
||||||
|
@@ -63,6 +63,9 @@ WX_CHECK_BUILD_OPTIONS("wxCore")
|
|||||||
// this defines wxEventLoopPtr
|
// this defines wxEventLoopPtr
|
||||||
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
|
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
|
// wxAppBase implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
@@ -56,8 +56,6 @@ private:
|
|||||||
// wxEventLoop running and exiting
|
// wxEventLoop running and exiting
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
|
|
||||||
wxEventLoop::~wxEventLoop()
|
wxEventLoop::~wxEventLoop()
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
||||||
|
@@ -56,8 +56,6 @@ private:
|
|||||||
// wxEventLoop running and exiting
|
// wxEventLoop running and exiting
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
|
|
||||||
wxEventLoop::~wxEventLoop()
|
wxEventLoop::~wxEventLoop()
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
||||||
|
@@ -104,8 +104,6 @@ bool wxEventLoopImpl::SendIdleEvent()
|
|||||||
// wxEventLoop running and exiting
|
// wxEventLoop running and exiting
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
|
|
||||||
wxEventLoop::~wxEventLoop()
|
wxEventLoop::~wxEventLoop()
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
||||||
|
@@ -96,8 +96,6 @@ bool wxEventLoopImpl::SendIdleMessage()
|
|||||||
// wxEventLoop running and exiting
|
// wxEventLoop running and exiting
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
|
|
||||||
wxEventLoop::~wxEventLoop()
|
wxEventLoop::~wxEventLoop()
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
|
||||||
|
@@ -52,7 +52,6 @@
|
|||||||
// wxEventLoop implementation
|
// wxEventLoop implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
wxWindowMSW *wxEventLoop::ms_winCritical = NULL;
|
wxWindowMSW *wxEventLoop::ms_winCritical = NULL;
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -199,8 +199,6 @@ bool wxEventLoopImpl::SendIdleMessage()
|
|||||||
// wxEventLoop implementation
|
// wxEventLoop implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxEventLoop running and exiting
|
// wxEventLoop running and exiting
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -55,8 +55,6 @@
|
|||||||
// wxEventLoop implementation
|
// wxEventLoop implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// ctor/dtor
|
// ctor/dtor
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -339,8 +339,6 @@ bool wxEventLoopImpl::SendIdleEvent()
|
|||||||
// wxEventLoop implementation
|
// wxEventLoop implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxEventLoop running and exiting
|
// wxEventLoop running and exiting
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user