DJGPP compilation

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index d9288130de15ef7c4ba5ffb85d32ead7c62736b9..91124621986e112b82fc632270fb60ff2ce61b17 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -18,16 +18,24 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/module.h"
     #include "wx/evtloop.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/module.h"
     #include "wx/evtloop.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"

+    #include "wx/log.h"

     #include "wx/intl.h"
     #include "wx/intl.h"

+    #include "wx/resource.h"

 #endif
 
 #include "wx/app.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"
 
 //-----------------------------------------------------------------------------


@@ -37,8 +45,6 @@
 wxApp *wxTheApp = NULL;
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 wxApp *wxTheApp = NULL;
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 

-static wxEventLoop *gs_mainEventLoop = NULL;
-

 
 //-----------------------------------------------------------------------------
 // wxExit
 
 //-----------------------------------------------------------------------------
 // wxExit


@@ -56,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() )
     {


@@ -70,8 +86,11 @@ bool wxYield()
 
     wxLog::Suspend();
 
 
     wxLog::Suspend();
 

-    while (gs_mainEventLoop->Pending())
-        gs_mainEventLoop->Dispatch();
+    if ( wxEventLoop::GetActive() )
+    {
+        while (wxEventLoop::GetActive()->Pending())
+            wxEventLoop::GetActive()->Dispatch();
+    }

         
     /* it's necessary to call ProcessIdle() to update the frames sizes which
        might have been changed (it also will update other things set from
         
     /* it's necessary to call ProcessIdle() to update the frames sizes which
        might have been changed (it also will update other things set from


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

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

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


@@ -113,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
 //-----------------------------------------------------------------------------


@@ -124,7 +212,7 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-wxApp::wxApp()
+wxApp::wxApp() : m_mainLoop(NULL)

 {
 }
 
 {
 }
 


@@ -132,18 +220,44 @@ wxApp::~wxApp()
 {
 }
 
 {
 }
 

-bool wxApp::OnInitGui()
+bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)

 {
 {

-    if ( MGL_init(".", NULL) == 0 )
+    if ( !mode.IsOk() )
+    {

         return FALSE;
         return FALSE;

-    if ( !wxCreateMGL_WM() )
+    }
+    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;
         return FALSE;

+    }

 
 

-    // This has to be done *after* wxCreateMGL_WM() because it initializes 
-    // wxUniv's themes
+    if ( !wxCreateMGL_WM(mode) )
+        return FALSE;
+    gs_rootWindow = new wxRootWindow;
+
+    m_displayMode = mode;
+
+    return TRUE;
+}
+
+bool wxApp::OnInitGui()
+{

     if ( !wxAppBase::OnInitGui() )
         return FALSE;
 
     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;
 }
 
     return TRUE;
 }
 


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


@@ -205,12 +324,8 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
     win->GetEventHandler()->ProcessEvent(event);
 
 
     win->GetEventHandler()->ProcessEvent(event);
 

-#if 0 // FIXME_MGL - what the hell it is?
-    win->OnInternalIdle();
-

     if ( event.MoreRequested() )
         needMore = TRUE;
     if ( event.MoreRequested() )
         needMore = TRUE;

-#endif

 
     wxNode* node = win->GetChildren().First();
     while (node)
 
     wxNode* node = win->GetChildren().First();
     while (node)


@@ -227,33 +342,34 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 int wxApp::MainLoop()
 {
     int rt;
 int wxApp::MainLoop()
 {
     int rt;

-    gs_mainEventLoop = new wxEventLoop;
-    rt = gs_mainEventLoop->Run();
-    delete gs_mainEventLoop;
-    gs_mainEventLoop = NULL;
+    m_mainLoop = new wxEventLoop;
+
+    rt = m_mainLoop->Run();
+
+    delete m_mainLoop;
+    m_mainLoop = NULL;

     return rt;
 }
 
 void wxApp::ExitMainLoop()
 {
     return rt;
 }
 
 void wxApp::ExitMainLoop()
 {

-    gs_mainEventLoop->Exit(0);
+    if ( m_mainLoop )
+        m_mainLoop->Exit(0);

 }
 
 bool wxApp::Initialized()
 {
 }
 
 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()
 {
 }
 
 bool wxApp::Pending()
 {

-    return gs_mainEventLoop->Pending();
+    return wxEventLoop::GetActive()->Pending();

 }
 
 void wxApp::Dispatch()
 {
 }
 
 void wxApp::Dispatch()
 {

-    gs_mainEventLoop->Dispatch();
+    wxEventLoop::GetActive()->Dispatch();

 }
 
 void wxApp::DeletePendingObjects()
 }
 
 void wxApp::DeletePendingObjects()


@@ -274,6 +390,9 @@ void wxApp::DeletePendingObjects()
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

+    if ( MGL_init(".", NULL) == 0 )
+        return FALSE;
+

     wxBuffer = new wxChar[BUFSIZ + 512];
 
     wxClassInfo::InitializeClasses();
     wxBuffer = new wxChar[BUFSIZ + 512];
 
     wxClassInfo::InitializeClasses();


@@ -293,6 +412,9 @@ bool wxApp::Initialize()
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();

+    
+    // Can't do this in wxModule, because fonts are needed by stock lists
+    wxTheFontsManager = new wxFontsManager;

 
     wxInitializeStockLists();
     wxInitializeStockObjects();
 
     wxInitializeStockLists();
     wxInitializeStockObjects();


@@ -307,37 +429,14 @@ bool wxApp::Initialize()
     return TRUE;
 }
 
     return TRUE;
 }
 

-#include "info.xpm"
-#include "error.xpm"
-#include "question.xpm"
-#include "warning.xpm"
-

 wxIcon wxApp::GetStdIcon(int which) const
 {
 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
 }
 
 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


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


@@ -358,9 +459,12 @@ void wxApp::CleanUp()
     wxTheColourDatabase = (wxColourDatabase*) NULL;
 
     wxDeleteStockObjects();
     wxTheColourDatabase = (wxColourDatabase*) NULL;
 
     wxDeleteStockObjects();

-

     wxDeleteStockLists();
 
     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;
 


@@ -506,6 +610,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();
         }
     }