Smooth Aqua buttons in wxTreeCtrl.

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index bb061200c3f9d826c5407e080ce21f09511a8aea..d40b8d7062266e2e6562d08b9942ccbfa621da9b 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -27,20 +27,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/resource.h"

 #endif
 
 #include "wx/app.h"
 #include "wx/fontutil.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #endif
 
 #include "wx/app.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/mgl/private.h"
 

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

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


@@ -65,8 +62,18 @@ void wxExit()
 
 static bool gs_inYield = FALSE;
 
 
 static bool gs_inYield = FALSE;
 

-bool wxYield()
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

+    if ( gs_inYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
+
+        return FALSE;
+    }
+

 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {


@@ -97,14 +104,6 @@ bool wxYield()
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxYieldIfNeeded()
-{
-    if (gs_inYield)
-        return FALSE;
-
-    return wxYield();
-}
-

 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle


@@ -125,6 +124,83 @@ void wxWakeUpIdle()
 #endif
 }
 
 #endif
 }
 

+//-----------------------------------------------------------------------------
+// Root window
+//-----------------------------------------------------------------------------
+
+class wxRootWindow : public wxWindow
+{
+    public:
+        wxRootWindow() : wxWindow(NULL, -1)
+        {
+            SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng));
+            SetBackgroundColour(wxTHEME_COLOUR(DESKTOP));
+        }
+        ~wxRootWindow()
+        {
+            // we don't want to delete MGL_WM's rootWnd
+            m_wnd = NULL; 
+        }
+
+        virtual bool AcceptsFocus() { return FALSE; }
+};
+
+static wxRootWindow *gs_rootWindow = NULL;
+
+//-----------------------------------------------------------------------------
+// MGL initialization
+//-----------------------------------------------------------------------------
+
+static bool wxCreateMGL_WM(const wxDisplayModeInfo& displayMode)
+{
+    int mode;
+    int refresh = MGL_DEFAULT_REFRESH;
+    
+#if wxUSE_SYSTEM_OPTIONS
+    if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh")) )
+        refresh = wxSystemOptions::GetOptionInt(wxT("mgl.screen-refresh"));
+#endif
+        
+    mode = MGL_findMode(displayMode.GetWidth(), 
+                        displayMode.GetHeight(), 
+                        displayMode.GetDepth());
+    if ( mode == -1 )
+    {
+        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() )
+    {
+        delete g_displayDC;
+        g_displayDC = NULL;
+        return FALSE;
+    }
+    
+    g_winMng = MGL_wmCreate(g_displayDC->getDC());
+    if (!g_winMng)
+        return FALSE;
+
+    return TRUE;
+}
+
+static void wxDestroyMGL_WM()
+{
+    if ( g_winMng )
+    {
+        MGL_wmDestroy(g_winMng);
+        g_winMng = NULL;
+    }
+    if ( g_displayDC )
+    {
+        delete g_displayDC;
+        g_displayDC = NULL;
+    }
+}
+

 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------


@@ -144,22 +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;
+    }
+
+    if ( !wxCreateMGL_WM(mode) )

         return FALSE;
         return FALSE;

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

 
 

-    // This has to be done *after* wxCreateMGL_WM() because it initializes 
-    // wxUniv's themes
+    return TRUE;
+}
+
+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;
 }
 


@@ -189,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);


@@ -334,11 +437,6 @@ wxIcon wxApp::GetStdIcon(int which) const
 void wxApp::CleanUp()
 {
 #if wxUSE_LOG
 void wxApp::CleanUp()
 {
 #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


@@ -347,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


@@ -361,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


@@ -377,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)


@@ -510,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();
         }
     }