enter wxPendingEventLocker critical section in ProcessPendingEvents() (fixes 1720352)

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index caa1806696d71dd89b88292e71ba3f5f7ea1293f..1a614e3f81d87b2988f9bec4fcda0f7f5cd45f92 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets 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,24 +14,25 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/app.h"

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

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

     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.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/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()


@@ -51,7 +48,7 @@ void wxApp::Exit()
 // wxYield
 //-----------------------------------------------------------------------------
 
 // wxYield
 //-----------------------------------------------------------------------------
 

-static bool gs_inYield = FALSE;
+static bool gs_inYield = false;

 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {


@@ -62,18 +59,18 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
         // can't process events from other threads, MGL is thread-unsafe
     }
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
         // can't process events from other threads, MGL is thread-unsafe

-        return TRUE;
+        return true;

     }
 #endif // wxUSE_THREADS
 
     }
 #endif // wxUSE_THREADS
 

-    gs_inYield = TRUE;
+    gs_inYield = true;

 
     wxLog::Suspend();
 
 
     wxLog::Suspend();
 


@@ -90,9 +87,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     wxLog::Resume();
 
 
     wxLog::Resume();
 

-    gs_inYield = FALSE;
+    gs_inYield = false;

 
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -123,18 +120,18 @@ void wxApp::WakeUpIdle()
 class wxRootWindow : public wxWindow
 {
     public:
 class wxRootWindow : public wxWindow
 {
     public:

-        wxRootWindow() : wxWindow(NULL, -1)
+        wxRootWindow() : wxWindow(NULL, wxID_ANY)

         {
             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;
         }
 

-        virtual bool AcceptsFocus() const { return FALSE; }
+        virtual bool AcceptsFocus() const { return false; }

 
         DECLARE_DYNAMIC_CLASS(wxRootWindow)
 };
 
         DECLARE_DYNAMIC_CLASS(wxRootWindow)
 };


@@ -166,21 +163,21 @@ static bool wxCreateMGL_WM(const wxVideoMode& displayMode)
                      displayMode.GetWidth(),
                      displayMode.GetHeight(),
                      displayMode.GetDepth());
                      displayMode.GetWidth(),
                      displayMode.GetHeight(),
                      displayMode.GetDepth());

-        return FALSE;
+        return false;

     }
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )
     {
         delete g_displayDC;
         g_displayDC = NULL;
     }
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )
     {
         delete g_displayDC;
         g_displayDC = NULL;

-        return FALSE;
+        return false;

     }
 
     g_winMng = MGL_wmCreate(g_displayDC->getDC());
     if (!g_winMng)
     }
 
     g_winMng = MGL_wmCreate(g_displayDC->getDC());
     if (!g_winMng)

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 static void wxDestroyMGL_WM()
 }
 
 static void wxDestroyMGL_WM()


@@ -234,42 +231,42 @@ bool wxApp::SetDisplayMode(const wxVideoMode& mode)
 {
     if ( !mode.IsOk() )
     {
 {
     if ( !mode.IsOk() )
     {

-        return FALSE;
+        return false;

     }
     if ( g_displayDC != NULL )
     {
         // FIXME_MGL -- we currently don't allow to switch video mode
         // more than once. This can hopefully be changed...
         wxFAIL_MSG(wxT("Can't change display mode after intialization!"));
     }
     if ( g_displayDC != NULL )
     {
         // FIXME_MGL -- we currently don't allow to switch video mode
         // more than once. This can hopefully be changed...
         wxFAIL_MSG(wxT("Can't change display mode after intialization!"));

-        return FALSE;
+        return false;

     }
 
     if ( !wxCreateMGL_WM(mode) )
     }
 
     if ( !wxCreateMGL_WM(mode) )

-        return FALSE;
+        return false;

     gs_rootWindow = new wxRootWindow;
 
     m_displayMode = mode;
 
     gs_rootWindow = new wxRootWindow;
 
     m_displayMode = mode;
 

-    return TRUE;
+    return true;

 }
 
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )
 }
 
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )

-        return FALSE;
+        return false;

 
 #ifdef __WXDEBUG__
     // MGL redirects stdout and stderr to physical console, so lets redirect
 
 #ifdef __WXDEBUG__
     // MGL redirects stdout and stderr to physical console, so lets redirect

-    // it to file. Do it only when WXDEBUG environment variable is set
+    // it to file in debug build. Do it only when WXSTDERR environment variable is set

     wxString redirect;
     if ( wxGetEnv(wxT("WXSTDERR"), &redirect) )
         freopen(redirect.mb_str(), "wt", stderr);
     wxString redirect;
     if ( wxGetEnv(wxT("WXSTDERR"), &redirect) )
         freopen(redirect.mb_str(), "wt", stderr);

-#endif
+#endif // __WXDEBUG__

 
     wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
     if ( oldLog ) delete oldLog;
 
 
     wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
     if ( oldLog ) delete oldLog;
 

-    return TRUE;
+    return true;

 }
 
 bool wxApp::Initialize(int& argc, wxChar **argv)
 }
 
 bool wxApp::Initialize(int& argc, wxChar **argv)


@@ -280,19 +277,16 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     wxSetEnv(wxT("LFN"), wxT("N"));
 #endif
 
     wxSetEnv(wxT("LFN"), wxT("N"));
 #endif
 

-    // 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) )
-        return false;
-
+    // intialize MGL before creating wxFontsManager since it uses MGL funcs

     if ( MGL_init(".", NULL) == 0 )
     {
         wxLogError(_("Cannot initialize SciTech MGL!"));
     if ( MGL_init(".", NULL) == 0 )
     {
         wxLogError(_("Cannot initialize SciTech MGL!"));

+        return false;
+    }

 
 

-        wxAppBase::CleanUp();
-
+    if ( !wxAppBase::Initialize(argc, argv) )
+    {
+        MGL_exit();

         return false;
     }
 
         return false;
     }
 


@@ -303,17 +297,29 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     return true;
 }
 
     return true;
 }
 

+// Modules are cleaned up after wxApp::CleanUp(), and some modules may
+// require MGL to still be alive, e.g. the stock fonts need the fonts
+// manager. So append this module last minute in wxApp::CleanUp() to close
+// down MGL after all the other modules have been cleaned up.
+//
+struct wxMGLFinalCleanup: public wxModule
+{
+    bool OnInit() { return true; }
+
+    void OnExit()
+    {
+        wxFontsManager::CleanUp();
+
+        wxDestroyMGL_WM();
+        MGL_exit();
+    }
+};
+

 void wxApp::CleanUp()
 {
     delete gs_rootWindow;
 
     wxAppBase::CleanUp();
 
 void wxApp::CleanUp()
 {
     delete gs_rootWindow;
 
     wxAppBase::CleanUp();
 

-    // must do this after calling base class CleanUp()
-    delete wxTheFontsManager;
-    wxTheFontsManager = (wxFontsManager*) NULL;
-
-    wxDestroyMGL_WM();
-    MGL_exit();
+    wxModule::RegisterModule(new wxMGLFinalCleanup);

 }
 }

-