X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ec3892d77c643be28516d34b0440decc0565c33..2c18f21dc7d5aedd7100b02f7a721551b73c537b:/src/mgl/app.cpp?ds=sidebyside

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index c5ff7897f0..bcb909fcc8 100644
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -27,18 +27,16 @@
     #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"
+#include "wx/univ/colschem.h"
 #include "wx/mgl/private.h"
 
-#define MGL_DEBUG
-
-#if defined(MGL_DEBUG) && !defined(__WXDEBUG__)
-#undef MGL_DEBUG
-#endif
-
 //-----------------------------------------------------------------------------
 // Global data
 //-----------------------------------------------------------------------------
@@ -63,8 +61,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() )
     {
@@ -95,14 +103,6 @@ bool wxYield()
     return TRUE;
 }
 
-bool wxYieldIfNeeded()
-{
-    if (gs_inYield)
-        return FALSE;
-
-    return wxYield();
-}
-
 
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
@@ -123,6 +123,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.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
 //-----------------------------------------------------------------------------
@@ -142,24 +219,44 @@ wxApp::~wxApp()
 {
 }
 
-bool wxApp::OnInitGui()
+bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
 {
-    if ( MGL_init(".", NULL) == 0 )
+    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() )
+    }
+
+    if ( !wxCreateMGL_WM(mode) )
         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;
 
-#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
 
+    wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
+    if ( oldLog ) delete oldLog;
+
     return TRUE;
 }
 
@@ -189,6 +286,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);
@@ -256,9 +358,7 @@ void wxApp::ExitMainLoop()
 
 bool wxApp::Initialized()
 {
-    // FIXME_MGL -- only for now because we don't have wxFrame/wxDialog yet
-    return TRUE;
-    //return (wxTopLevelWindows.GetCount() != 0);
+    return (wxTopLevelWindows.GetCount() != 0);
 }
 
 bool wxApp::Pending()
@@ -289,6 +389,9 @@ void wxApp::DeletePendingObjects()
 
 bool wxApp::Initialize()
 {
+    if ( MGL_init(".", NULL) == 0 )
+        return FALSE;
+
     wxBuffer = new wxChar[BUFSIZ + 512];
 
     wxClassInfo::InitializeClasses();
@@ -325,37 +428,14 @@ bool wxApp::Initialize()
     return TRUE;
 }
 
-#include "info.xpm"
-#include "error.xpm"
-#include "question.xpm"
-#include "warning.xpm"
-
 wxIcon wxApp::GetStdIcon(int which) const
 {
-    switch(which)
-    {
-        case wxICON_INFORMATION:
-            return wxIcon(info_xpm);
-        case wxICON_QUESTION:
-            return wxIcon(question_xpm);
-        case wxICON_EXCLAMATION:
-            return wxIcon(warning_xpm);
-        default:
-            wxFAIL_MSG(wxT("requested non existent standard icon"));
-            // still fall through
-        case wxICON_HAND:
-            return wxIcon(error_xpm);
-    }
+    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
 }
 
 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
@@ -364,6 +444,8 @@ void wxApp::CleanUp()
         delete oldlog;
 #endif // wxUSE_LOG
 
+    delete gs_rootWindow;
+
     wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES
@@ -527,6 +609,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();
         }
     }