fixing osx_cocoa

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 164860cf2a581a3582b38d015ee869ad3ccabf30..753d2df7f6641250f057f94a354183f54bb9ac1b 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/mgl/app.cpp

 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$
 // Author:      Vaclav Slavik
 //              based on GTK and MSW implementations
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "app.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -18,109 +14,50 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/app.h"

 
 #ifndef WX_PRECOMP
     #include "wx/settings.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/frame.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/app.h"
+#include "wx/evtloop.h"

 #include "wx/fontutil.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.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
-//-----------------------------------------------------------------------------
-
-wxApp *wxTheApp = NULL;
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
+#include "wx/private/fontmgr.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxExit
+// wxApp::Exit()

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-void wxExit()
+void wxApp::Exit()

 {
     MGL_exit();
     exit(0);
 }
 
 {
     MGL_exit();
     exit(0);
 }
 

-//-----------------------------------------------------------------------------
-// wxYield
-//-----------------------------------------------------------------------------
-
-static bool gs_inYield = FALSE;
-
-bool wxApp::Yield(bool onlyIfNeeded)
-{
-    if ( gs_inYield )
-    {
-        if ( !onlyIfNeeded )
-        {
-            wxFAIL_MSG( wxT("wxYield called recursively" ) );
-        }
-
-        return FALSE;
-    }
-
-#if wxUSE_THREADS
-    if ( !wxThread::IsMain() )
-    {
-        // can't process events from other threads, MGL is thread-unsafe
-        return TRUE;
-    }
-#endif // wxUSE_THREADS
-
-    gs_inYield = TRUE;
-
-    wxLog::Suspend();
-
-    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
-       OnUpdateUI() which is a nice (and desired) side effect) */
-    while (wxTheApp->ProcessIdle()) { }
-
-    wxLog::Resume();
-
-    gs_inYield = FALSE;
-
-    return TRUE;
-}
-

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

-void wxWakeUpIdle()
+void wxApp::WakeUpIdle()

 {
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();
 #endif
 
 {
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();
 #endif
 

-    while (wxTheApp->ProcessIdle()) {} 
+    while (wxTheApp->ProcessIdle())
+        ;

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


@@ -135,60 +72,63 @@ void wxWakeUpIdle()
 class wxRootWindow : public wxWindow
 {
     public:
 class wxRootWindow : public wxWindow
 {
     public:

-        wxRootWindow() : wxWindow(NULL, -1)
+        wxRootWindow() : wxWindow(NULL, wxID_ANY)

         {
             SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng));
             SetBackgroundColour(wxTHEME_COLOUR(DESKTOP));
         }
         {
             SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng));
             SetBackgroundColour(wxTHEME_COLOUR(DESKTOP));
         }

-        ~wxRootWindow()
+        virtual ~wxRootWindow()

         {
             // we don't want to delete MGL_WM's rootWnd
         {
             // we don't want to delete MGL_WM's rootWnd

-            m_wnd = NULL; 
+            m_wnd = NULL;

         }
 
         }
 

-        virtual bool AcceptsFocus() { return FALSE; }
+        virtual bool AcceptsFocus() const { return false; }
+
+        DECLARE_DYNAMIC_CLASS(wxRootWindow)

 };
 
 };
 

+IMPLEMENT_DYNAMIC_CLASS(wxRootWindow, wxWindow)
+

 static wxRootWindow *gs_rootWindow = NULL;
 
 //-----------------------------------------------------------------------------
 // MGL initialization
 //-----------------------------------------------------------------------------
 
 static wxRootWindow *gs_rootWindow = NULL;
 
 //-----------------------------------------------------------------------------
 // MGL initialization
 //-----------------------------------------------------------------------------
 

-static bool wxCreateMGL_WM(const wxDisplayModeInfo& displayMode)
+static bool wxCreateMGL_WM(const wxVideoMode& displayMode)

 {
     int mode;
     int refresh = MGL_DEFAULT_REFRESH;
 {
     int mode;
     int refresh = MGL_DEFAULT_REFRESH;

-    
+

 #if wxUSE_SYSTEM_OPTIONS
 #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 )
     {
                         displayMode.GetDepth());
     if ( mode == -1 )
     {

-        wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."), 
-                     displayMode.GetScreenSize().x, 
-                     displayMode.GetScreenSize().y, 
+        wxLogError(_("Mode %ix%i-%i not available."),
+                     displayMode.GetWidth(),
+                     displayMode.GetHeight(),

                      displayMode.GetDepth());
                      displayMode.GetDepth());

-        mode = 0; // always available
+        return false;

     }
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )
     {
     }
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )
     {

-        delete g_displayDC;
-        g_displayDC = NULL;
-        return FALSE;
+        wxDELETE(g_displayDC);
+        return false;

     }
     }

-    
+

     g_winMng = MGL_wmCreate(g_displayDC->getDC());
     if (!g_winMng)
     g_winMng = MGL_wmCreate(g_displayDC->getDC());
     if (!g_winMng)

-        return FALSE;
-    
-    return TRUE;
+        return false;
+
+    return true;

 }
 
 static void wxDestroyMGL_WM()
 }
 
 static void wxDestroyMGL_WM()


@@ -198,11 +138,7 @@ static void wxDestroyMGL_WM()
         MGL_wmDestroy(g_winMng);
         g_winMng = NULL;
     }
         MGL_wmDestroy(g_winMng);
         g_winMng = NULL;
     }

-    if ( g_displayDC )
-    {
-        delete g_displayDC;
-        g_displayDC = NULL;
-    }
+    wxDELETE(g_displayDC);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -211,413 +147,120 @@ static void wxDestroyMGL_WM()
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
-
-
-wxApp::wxApp() : m_mainLoop(NULL)
+wxApp::wxApp()

 {
 {

-    m_displayMode = wxDisplayModeInfo(wxSize(640, 480), 16);

 }
 
 wxApp::~wxApp()
 {
 }
 
 }
 
 wxApp::~wxApp()
 {
 }
 

-bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
+wxVideoMode wxGetDefaultDisplayMode()
+{
+    wxString mode;
+    unsigned w, h, bpp;
+
+    if ( !wxGetEnv(wxT("WXMODE"), &mode) ||
+         (wxSscanf(mode.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3) )
+    {
+        w = 640, h = 480, bpp = 16;
+    }
+
+    return wxVideoMode(w, h, bpp);
+}
+
+bool wxApp::SetDisplayMode(const wxVideoMode& mode)

 {
     if ( !mode.IsOk() )
     {
 {
     if ( !mode.IsOk() )
     {

-        return FALSE;
+        return false;

     }
     if ( g_displayDC != NULL )
     {
         // FIXME_MGL -- we currently don't allow to switch video mode
     }
     if ( g_displayDC != NULL )
     {
         // FIXME_MGL -- we currently don't allow to switch video mode

-        // at runtime. This can hopefully be changed...
+        // more than once. This can hopefully be changed...

         wxFAIL_MSG(wxT("Can't change display mode after intialization!"));
         wxFAIL_MSG(wxT("Can't change display mode after intialization!"));

-        return FALSE;
+        return false;

     }
     }

-    m_displayMode = mode;
-    return TRUE;
-}
-
-bool wxApp::OnInitGui()
-{
-    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
+    if ( !wxCreateMGL_WM(mode) )
+        return false;

     gs_rootWindow = new wxRootWindow;
 
     gs_rootWindow = new wxRootWindow;
 

-#ifdef MGL_DEBUG
-    // That damn MGL redirects stdin and stdout to physical console
-    FILE *file = fopen("stderr", "wt");
-    wxLog::SetActiveTarget(new wxLogStderr(file));
-#endif
-
-    return TRUE;
-}
-
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
+    m_displayMode = mode;

 
 

-    return event.MoreRequested();
+    return true;

 }
 
 }
 

-void wxApp::OnIdle(wxIdleEvent &event)
+bool wxApp::OnInitGui()

 {
 {

-    static bool s_inOnIdle = FALSE;
-
-    /* Avoid recursion (via ProcessEvent default case) */
-    if (s_inOnIdle)
-        return;
-
-    s_inOnIdle = TRUE;
-
-    /* Resend in the main thread events which have been prepared in other
-       threads */
-    ProcessPendingEvents();
-
-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
-
-    // Send OnIdle events to all windows
-    if ( SendIdleEvents() )
-        event.RequestMore(TRUE);
-
-    s_inOnIdle = FALSE;
-}
+    if ( !wxAppBase::OnInitGui() )
+        return false;

 
 

-bool wxApp::SendIdleEvents()
-{
-    bool needMore = FALSE;
+    // MGL redirects stdout and stderr to physical console, so let's redirect
+    // it to file if WXSTDERR environment variable is set to be able to see
+    // wxLogDebug() output
+    wxString redirect;
+    if ( wxGetEnv(wxT("WXSTDERR"), &redirect) )
+        freopen(redirect.mb_str(), "wt", stderr);

 
 

-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if ( SendIdleEvents(win) )
-            needMore = TRUE;
-        node = node->GetNext();
-    }
+    wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
+    if ( oldLog ) delete oldLog;

 
 

-    return needMore;
+    return true;

 }
 
 }
 

-bool wxApp::SendIdleEvents(wxWindow* win)
+bool wxApp::Initialize(int& argc, wxChar **argv)

 {
 {

-    bool needMore = FALSE;
-
-    wxIdleEvent event;
-    event.SetEventObject(win);
-
-    win->GetEventHandler()->ProcessEvent(event);
-
-    if ( event.MoreRequested() )
-        needMore = TRUE;
+#ifdef __DJGPP__
+    // VS: disable long filenames under DJGPP as the very first thing,
+    //     since SciTech MGL doesn't like them much...
+    wxSetEnv(wxT("LFN"), wxT("N"));
+#endif

 
 

-    wxNode* node = win->GetChildren().First();
-    while (node)
+    // intialize MGL before creating wxFontsManager since it uses MGL funcs
+    if ( MGL_init(".", NULL) == 0 )

     {
     {

-        wxWindow* win = (wxWindow*) node->Data();
-        if ( SendIdleEvents(win) )
-            needMore = TRUE;
-
-        node = node->Next();
+        wxLogError(_("Cannot initialize SciTech MGL!"));
+        return false;

     }
     }

-    return needMore;
-}
-
-int wxApp::MainLoop()
-{
-    int rt;
-    m_mainLoop = new wxEventLoop;
-
-    rt = m_mainLoop->Run();
-
-    delete m_mainLoop;
-    m_mainLoop = NULL;
-    return rt;
-}
-
-void wxApp::ExitMainLoop()
-{
-    if ( m_mainLoop )
-        m_mainLoop->Exit(0);
-}

 
 

-bool wxApp::Initialized()
-{
-    return (wxTopLevelWindows.GetCount() != 0);
-}
-
-bool wxApp::Pending()
-{
-    return wxEventLoop::GetActive()->Pending();
-}
-
-void wxApp::Dispatch()
-{
-    wxEventLoop::GetActive()->Dispatch();
-}
-
-void wxApp::DeletePendingObjects()
-{
-    wxNode *node = wxPendingDelete.First();
-    while (node)
+    if ( !wxAppBase::Initialize(argc, argv) )

     {
     {

-        wxObject *obj = (wxObject *)node->Data();
-
-        delete obj;
-
-        if ( wxPendingDelete.Find(obj) )
-            delete node;
-
-        node = wxPendingDelete.First();
+        MGL_exit();
+        return false;

     }
     }

-}
-
-bool wxApp::Initialize()
-{
-    if ( MGL_init(".", NULL) == 0 )
-        return FALSE;
-
-    wxBuffer = new wxChar[BUFSIZ + 512];

 
 

-    wxClassInfo::InitializeClasses();
-
-    wxSystemSettings::Init();
-    

 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 

-    // 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
-    wxPendingEvents = new wxList;
-    wxPendingEventsLocker = new wxCriticalSection;
-#endif
-
-    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();
-
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
-
-    return TRUE;
-}
-
-wxIcon wxApp::GetStdIcon(int which) const
-{
-    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);
-}
-
-void wxApp::CleanUp()
-{
-    delete gs_rootWindow;
-
-#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
-    wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
-    if ( oldlog )
-        delete oldlog;
-#endif // wxUSE_LOG
-
-    wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-
-    if (wxTheColourDatabase)
-        delete wxTheColourDatabase;
-
-    wxTheColourDatabase = (wxColourDatabase*) NULL;
-
-    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;
-
-    // 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
-    delete wxPendingEvents;
-    delete wxPendingEventsLocker;
-#endif
-
-    wxSystemSettings::Done();
-
-    delete[] wxBuffer;
-
-    wxClassInfo::CleanUpClasses();
-
-    // check for memory leaks
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
-    {
-        wxLogDebug(wxT("There were memory leaks.\n"));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#endif // Debug
-
-#if wxUSE_LOG
-    // do this as the very last thing because everything else can log messages
-    wxLog::DontCreateOnDemand();
-
-    wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
-    if (oldLog)
-        delete oldLog;
-#endif // wxUSE_LOG
-
-    wxDestroyMGL_WM();
-    MGL_exit();
-}
-
-
-int wxEntryStart(int argc, char *argv[])
-{
-    return wxApp::Initialize() ? 0 : -1;
-}
-
-
-int wxEntryInitGui()
-{
-    return wxTheApp->OnInitGui() ? 0 : -1;
+    return true;

 }
 
 }
 

-
-void wxEntryCleanup()
+// Modules are cleaned up after wxApp::CleanUp(), and some modules may
+// require MGL to still be alive, e.g. the stock fonts need the fonts
+// manager. So append this module last minute in wxApp::CleanUp() to close
+// down MGL after all the other modules have been cleaned up.
+//
+struct wxMGLFinalCleanup: public wxModule

 {
 {

-    wxApp::CleanUp();
-}
+    bool OnInit() { return true; }

 
 

-
-
-int wxEntry(int argc, char *argv[])
-{
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    // This seems to be necessary since there are 'rogue'
-    // objects present at this point (perhaps global objects?)
-    // Setting a checkpoint will ignore them as far as the
-    // memory checking facility is concerned.
-    // Of course you may argue that memory allocated in globals should be
-    // checked, but this is a reasonable compromise.
-    wxDebugContext::SetCheckpoint();
-#endif
-    int err = wxEntryStart(argc, argv);
-    if ( err )
-        return err;
-
-    if ( !wxTheApp )
+    void OnExit()

     {
     {

-        wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
-                     wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
-
-        wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
-
-        wxObject *test_app = app_ini();
-
-        wxTheApp = (wxApp*) test_app;
-    }
+        wxFontsManager::CleanUp();

 
 

-    wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );
-
-    wxTheApp->argc = argc;
-#if wxUSE_UNICODE
-    wxTheApp->argv = new wxChar*[argc+1];
-    int mb_argc = 0;
-    while (mb_argc < argc)
-    {
-        wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
-        mb_argc++;
+        wxDestroyMGL_WM();
+        MGL_exit();

     }
     }

-    wxTheApp->argv[mb_argc] = (wxChar *)NULL;
-#else
-    wxTheApp->argv = argv;
-#endif
-
-    wxString name(wxFileNameFromPath(argv[0]));
-    wxStripExtension(name);
-    wxTheApp->SetAppName(name);
-
-    int retValue;
-    retValue = wxEntryInitGui();
-
-    // Here frames insert themselves automatically into wxTopLevelWindows by
-    // getting created in OnInit().
-    if ( retValue == 0 )
-    {
-        if ( !wxTheApp->OnInit() )
-            retValue = -1;
-    }
-
-    if ( retValue == 0 )
-    {
-        /* delete pending toplevel windows (typically a single
-           dialog) so that, if there isn't any left, we don't
-           call OnRun() */
-        wxTheApp->DeletePendingObjects();
+};

 
 

-        if ( wxTheApp->Initialized() )
-        {
-            wxTheApp->OnRun();
-
-            wxWindow *topWindow = wxTheApp->GetTopWindow();
-            if ( topWindow )
-            {
-                /* Forcibly delete the window. */
-                if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-                    topWindow->IsKindOf(CLASSINFO(wxDialog)) )
-                {
-                    topWindow->Close(TRUE);
-                    wxTheApp->DeletePendingObjects();
-                }
-                else
-                {
-                    delete topWindow;
-                    wxTheApp->SetTopWindow((wxWindow*) NULL);
-                }
-            }
-
-            retValue = wxTheApp->OnExit();
-        }
-    }
+void wxApp::CleanUp()
+{
+    delete gs_rootWindow;

 
 

-    wxEntryCleanup();
+    wxAppBase::CleanUp();

 
 

-    return retValue;
+    wxModule::RegisterModule(new wxMGLFinalCleanup);

 }
 }