X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..4fdfe2f3ae110c1f1ba2d925749cac5b761eff4b:/src/mgl/app.cpp?ds=sidebyside diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp index 53c61fad16..c0338c7834 100644 --- a/src/mgl/app.cpp +++ b/src/mgl/app.cpp @@ -32,6 +32,7 @@ #include "wx/univ/colschem.h" #include "wx/sysopt.h" #include "wx/mgl/private.h" +#include "wx/private/fontmgr.h" //----------------------------------------------------------------------------- // wxApp::Exit() @@ -73,10 +74,11 @@ bool wxApp::Yield(bool onlyIfNeeded) wxLog::Suspend(); - if ( wxEventLoop::GetActive() ) + wxEventLoopBase * const eventLoop = wxEventLoop::GetActive(); + if ( eventLoop ) { - while (wxEventLoop::GetActive()->Pending()) - wxEventLoop::GetActive()->Dispatch(); + while (eventLoop->Pending()) + eventLoop->Dispatch(); } /* it's necessary to call ProcessIdle() to update the frames sizes which @@ -199,11 +201,6 @@ static void wxDestroyMGL_WM() IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxAppBase::OnIdle) -END_EVENT_TABLE() - - wxApp::wxApp() { } @@ -283,14 +280,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) return false; } - // must do it before calling wxAppBase::Initialize(), because fonts are - // needed by stock lists which are created there - wxTheFontsManager = new wxFontsManager; - if ( !wxAppBase::Initialize(argc, argv) ) { - delete wxTheFontsManager; - wxTheFontsManager = NULL; MGL_exit(); return false; } @@ -313,8 +304,7 @@ struct wxMGLFinalCleanup: public wxModule void OnExit() { - delete wxTheFontsManager; - wxTheFontsManager = (wxFontsManager*) NULL; + wxFontsManager::CleanUp(); wxDestroyMGL_WM(); MGL_exit();