X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/580616706f52835ee5ee48e6ef2ad15b822df971..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/mgl/app.cpp?ds=sidebyside

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 39d708ed0b..d40b8d7062 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -27,6 +27,7 @@
     #include "wx/dialog.h"
     #include "wx/log.h"
     #include "wx/intl.h"
+    #include "wx/resource.h"
 #endif
 
 #include "wx/app.h"
@@ -34,14 +35,9 @@
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
+#include "wx/sysopt.h"
 #include "wx/mgl/private.h"
 
-#define MGL_DEBUG
-
-#if defined(MGL_DEBUG) && !defined(__WXDEBUG__)
-#undef MGL_DEBUG
-#endif
-
 //-----------------------------------------------------------------------------
 // Global data
 //-----------------------------------------------------------------------------
@@ -155,22 +151,26 @@ static wxRootWindow *gs_rootWindow = NULL;
 // MGL initialization
 //-----------------------------------------------------------------------------
 
-static bool wxCreateMGL_WM()
+static bool wxCreateMGL_WM(const wxDisplayModeInfo& displayMode)
 {
     int mode;
-    int width = 640, height = 480, depth = 16;
     int refresh = MGL_DEFAULT_REFRESH;
     
 #if wxUSE_SYSTEM_OPTIONS
-    if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh") )
+    if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh")) )
         refresh = wxSystemOptions::GetOptionInt(wxT("mgl.screen-refresh"));
 #endif
         
-    mode = MGL_findMode(width, height, depth);
+    mode = MGL_findMode(displayMode.GetWidth(), 
+                        displayMode.GetHeight(), 
+                        displayMode.GetDepth());
     if ( mode == -1 )
     {
-        wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."), width, height, depth);
-        mode = 0; // always available
+        wxLogError(_("Mode %ix%i-%i not available."), 
+                     displayMode.GetWidth(),
+                     displayMode.GetHeight(),
+                     displayMode.GetDepth());
+        return FALSE;
     }
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )
@@ -183,7 +183,7 @@ static bool wxCreateMGL_WM()
     g_winMng = MGL_wmCreate(g_displayDC->getDC());
     if (!g_winMng)
         return FALSE;
-    
+
     return TRUE;
 }
 
@@ -220,25 +220,44 @@ wxApp::~wxApp()
 {
 }
 
-bool wxApp::OnInitGui()
+bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
 {
-    if ( !wxCreateMGL_WM() )
+    if ( !mode.IsOk() )
+    {
+        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!"));
         return FALSE;
+    }
 
-    // This has to be done *after* wxCreateMGL_WM() because it initializes 
-    // wxUniv's themes
-    if ( !wxAppBase::OnInitGui() )
+    if ( !wxCreateMGL_WM(mode) )
         return FALSE;
-        
-    // ...and this has to be done after wxUniv themes were initialized
     gs_rootWindow = new wxRootWindow;
 
-#ifdef MGL_DEBUG
-    // That damn MGL redirects stdin and stdout to physical console
-    FILE *file = fopen("stderr", "wt");
-    wxLog::SetActiveTarget(new wxLogStderr(file));
+    m_displayMode = mode;
+
+    return TRUE;
+}
+
+bool wxApp::OnInitGui()
+{
+    if ( !wxAppBase::OnInitGui() )
+        return FALSE;
+
+#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
+    if ( wxGetEnv(wxT("WXDEBUG"), NULL) )
+        freopen("output.err", "wt", stderr);
 #endif
 
+    wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
+    if ( oldLog ) delete oldLog;
+
     return TRUE;
 }
 
@@ -268,6 +287,11 @@ void wxApp::OnIdle(wxIdleEvent &event)
     // 'Garbage' collection of windows deleted with Close().
     DeletePendingObjects();
 
+#if wxUSE_LOG
+    // flush the logged messages if any
+    wxLog::FlushActive();
+#endif // wxUSE_LOG
+
     // Send OnIdle events to all windows
     if ( SendIdleEvents() )
         event.RequestMore(TRUE);
@@ -412,14 +436,7 @@ wxIcon wxApp::GetStdIcon(int which) const
 
 void wxApp::CleanUp()
 {
-    delete gs_rootWindow;
-
 #if wxUSE_LOG
-    // flush the logged messages if any
-    wxLog *log = wxLog::GetActiveTarget();
-    if (log != NULL && log->HasPendingMessages())
-        log->Flush();
-
     // continuing to use user defined log target is unsafe from now on because
     // some resources may be already unavailable, so replace it by something
     // more safe
@@ -428,6 +445,8 @@ void wxApp::CleanUp()
         delete oldlog;
 #endif // wxUSE_LOG
 
+    delete gs_rootWindow;
+
     wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES
@@ -442,13 +461,10 @@ void wxApp::CleanUp()
     wxDeleteStockObjects();
     wxDeleteStockLists();
 
-    // Can't do this in wxModule, because fonts are needed by stock lists
-    delete wxTheFontsManager;
-    wxTheFontsManager = (wxFontsManager*) NULL;
-
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
+
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
 #if wxUSE_THREADS
@@ -458,10 +474,16 @@ void wxApp::CleanUp()
 
     wxSystemSettings::Done();
 
-    delete[] wxBuffer;
-
     wxClassInfo::CleanUpClasses();
 
+    // Can't do this in wxModule, because fonts are needed by stock lists
+    // (do it after deleting wxTheApp and cleaning modules up, since somebody
+    // may be deleting fonts that lately)
+    delete wxTheFontsManager;
+    wxTheFontsManager = (wxFontsManager*) NULL;
+
+    delete[] wxBuffer;
+
     // check for memory leaks
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
@@ -591,6 +613,12 @@ int wxEntry(int argc, char *argv[])
                 }
             }
 
+#if wxUSE_LOG
+            // flush the logged messages if any
+            wxLog *log = wxLog::GetActiveTarget();
+            if (log != NULL && log->HasPendingMessages())
+                log->Flush();
+#endif // wxUSE_LOG
             retValue = wxTheApp->OnExit();
         }
     }