wxFont can now raelly use the native fonts

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 77a30f02201f2d299e1db977e8c0ff7709fb2039..d40b8d7062266e2e6562d08b9942ccbfa621da9b 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -35,14 +35,9 @@
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.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/mgl/private.h"
 

-#define MGL_DEBUG
-
-#if defined(MGL_DEBUG) && !defined(__WXDEBUG__)
-#undef MGL_DEBUG
-#endif
-

 //-----------------------------------------------------------------------------
 // Global data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Global data
 //-----------------------------------------------------------------------------


@@ -162,18 +157,18 @@ static bool wxCreateMGL_WM(const wxDisplayModeInfo& displayMode)
     int refresh = MGL_DEFAULT_REFRESH;
     
 #if wxUSE_SYSTEM_OPTIONS
     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
         
         refresh = wxSystemOptions::GetOptionInt(wxT("mgl.screen-refresh"));
 #endif
         

-    mode = MGL_findMode(displayMode.GetScreenSize().x, 
-                        displayMode.GetScreenSize().y, 
+    mode = MGL_findMode(displayMode.GetWidth(), 
+                        displayMode.GetHeight(), 

                         displayMode.GetDepth());
     if ( mode == -1 )
     {
         wxLogError(_("Mode %ix%i-%i not available."), 
                         displayMode.GetDepth());
     if ( mode == -1 )
     {
         wxLogError(_("Mode %ix%i-%i not available."), 

-                     displayMode.GetScreenSize().x, 
-                     displayMode.GetScreenSize().y, 
+                     displayMode.GetWidth(),
+                     displayMode.GetHeight(),

                      displayMode.GetDepth());
         return FALSE;
     }
                      displayMode.GetDepth());
         return FALSE;
     }


@@ -253,12 +248,16 @@ bool wxApp::OnInitGui()
     if ( !wxAppBase::OnInitGui() )
         return FALSE;
 
     if ( !wxAppBase::OnInitGui() )
         return FALSE;
 

-#ifdef MGL_DEBUG
-    // That damn MGL redirects stdin and stdout to physical console
-    FILE *file = fopen("stderr", "wt");
-    wxLog::SetActiveTarget(new wxLogStderr(file));
+#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
 
 #endif
 

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

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -288,6 +287,11 @@ void wxApp::OnIdle(wxIdleEvent &event)
     // 'Garbage' collection of windows deleted with Close().
     DeletePendingObjects();
 
     // '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);
     // Send OnIdle events to all windows
     if ( SendIdleEvents() )
         event.RequestMore(TRUE);


@@ -432,14 +436,7 @@ wxIcon wxApp::GetStdIcon(int which) const
 
 void wxApp::CleanUp()
 {
 
 void wxApp::CleanUp()
 {

-    delete gs_rootWindow;
-

 #if wxUSE_LOG
 #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
     // 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


@@ -448,6 +445,8 @@ void wxApp::CleanUp()
         delete oldlog;
 #endif // wxUSE_LOG
 
         delete oldlog;
 #endif // wxUSE_LOG
 

+    delete gs_rootWindow;
+

     wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES
     wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES


@@ -462,13 +461,10 @@ void wxApp::CleanUp()
     wxDeleteStockObjects();
     wxDeleteStockLists();
 
     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;
 
     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
     // 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


@@ -478,10 +474,16 @@ void wxApp::CleanUp()
 
     wxSystemSettings::Done();
 
 
     wxSystemSettings::Done();
 

-    delete[] wxBuffer;
-

     wxClassInfo::CleanUpClasses();
 
     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)
     // check for memory leaks
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)


@@ -611,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();
         }
     }
             retValue = wxTheApp->OnExit();
         }
     }