reverted the change of r32940 which worked around a bug due to associating a dummy...

[wxWidgets.git] / src / mgl / app.cpp

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index f8b7d3794ad800e9d7c96688f0e1eedf22b2c56e..c0338c7834953a78b9fff7b64fb4d0dc8280ba0b 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/mgl/app.cpp

 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$
 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$


@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "app.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -18,6 +14,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/app.h"

 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"


@@ -25,17 +22,17 @@
     #include "wx/dialog.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/app.h"

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

-#include "wx/module.h"

 #include "wx/fontutil.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 #include "wx/sysopt.h"
 #include "wx/mgl/private.h"
 #include "wx/fontutil.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 #include "wx/sysopt.h"
 #include "wx/mgl/private.h"

+#include "wx/private/fontmgr.h"

 
 //-----------------------------------------------------------------------------
 // wxApp::Exit()
 
 //-----------------------------------------------------------------------------
 // wxApp::Exit()


@@ -77,10 +74,11 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     wxLog::Suspend();
 
 
     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
     }
 
     /* it's necessary to call ProcessIdle() to update the frames sizes which


@@ -128,7 +126,7 @@ class wxRootWindow : public wxWindow
             SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng));
             SetBackgroundColour(wxTHEME_COLOUR(DESKTOP));
         }
             SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng));
             SetBackgroundColour(wxTHEME_COLOUR(DESKTOP));
         }

-        ~wxRootWindow()
+        virtual ~wxRootWindow()

         {
             // we don't want to delete MGL_WM's rootWnd
             m_wnd = NULL;
         {
             // we don't want to delete MGL_WM's rootWnd
             m_wnd = NULL;


@@ -203,11 +201,6 @@ static void wxDestroyMGL_WM()
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-
-

 wxApp::wxApp()
 {
 }
 wxApp::wxApp()
 {
 }


@@ -287,14 +280,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         return false;
     }
 
         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) )
     {
     if ( !wxAppBase::Initialize(argc, argv) )
     {

-        delete wxTheFontsManager;
-        wxTheFontsManager = NULL;

         MGL_exit();
         return false;
     }
         MGL_exit();
         return false;
     }


@@ -317,8 +304,7 @@ struct wxMGLFinalCleanup: public wxModule
 
     void OnExit()
     {
 
     void OnExit()
     {

-        delete wxTheFontsManager;
-        wxTheFontsManager = (wxFontsManager*) NULL;
+        wxFontsManager::CleanUp();

 
         wxDestroyMGL_WM();
         MGL_exit();
 
         wxDestroyMGL_WM();
         MGL_exit();


@@ -333,4 +319,3 @@ void wxApp::CleanUp()
 
     wxModule::RegisterModule(new wxMGLFinalCleanup);
 }
 
     wxModule::RegisterModule(new wxMGLFinalCleanup);
 }

-