implemented late(r) initialization of wxUniv themes

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index bb061200c3f9d826c5407e080ce21f09511a8aea..164860cf2a581a3582b38d015ee869ad3ccabf30 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -33,6 +33,7 @@
 #include "wx/fontutil.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
+#include "wx/univ/colschem.h"
 #include "wx/mgl/private.h"
 
 #define MGL_DEBUG
@@ -65,8 +66,18 @@ void wxExit()
 
 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() )
     {
@@ -97,14 +108,6 @@ bool wxYield()
     return TRUE;
 }
 
-bool wxYieldIfNeeded()
-{
-    if (gs_inYield)
-        return FALSE;
-
-    return wxYield();
-}
-
 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
@@ -125,6 +128,83 @@ void wxWakeUpIdle()
 #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.GetScreenSize().x, 
+                        displayMode.GetScreenSize().y, 
+                        displayMode.GetDepth());
+    if ( mode == -1 )
+    {
+        wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."), 
+                     displayMode.GetScreenSize().x, 
+                     displayMode.GetScreenSize().y, 
+                     displayMode.GetDepth());
+        mode = 0; // always available
+    }
+    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
 //-----------------------------------------------------------------------------
@@ -138,21 +218,42 @@ END_EVENT_TABLE()
 
 wxApp::wxApp() : m_mainLoop(NULL)
 {
+    m_displayMode = wxDisplayModeInfo(wxSize(640, 480), 16);
 }
 
 wxApp::~wxApp()
 {
 }
 
+bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
+{
+    if ( !mode.IsOk() )
+    {
+        return FALSE;
+    }
+    if ( g_displayDC != NULL )
+    {
+        // FIXME_MGL -- we currently don't allow to switch video mode
+        // at runtime. This can hopefully be changed...
+        wxFAIL_MSG(wxT("Can't change display mode after intialization!"));
+        return FALSE;
+    }
+    m_displayMode = mode;
+    return TRUE;
+}
+
 bool wxApp::OnInitGui()
 {
-    if ( !wxCreateMGL_WM() )
+    if ( !wxCreateMGL_WM(m_displayMode) )
         return FALSE;
 
     // This has to be done *after* wxCreateMGL_WM() because it initializes 
     // wxUniv's themes
     if ( !wxAppBase::OnInitGui() )
         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
@@ -333,6 +434,8 @@ 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();