X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d03bb63c48d02a9f98e460236bcf9e20d859e546..1d105d58f41015bcf9e862562c6b6afd2fe4a761:/src/motif/app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 1d226a24a9..3fcf24b910 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -18,25 +18,15 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/utils.h"
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"
-#include "wx/icon.h"
-#include "wx/palette.h"
-#include "wx/dc.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
-#include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/evtloop.h"
 #include "wx/hash.h"
+#include "wx/hashmap.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
@@ -58,6 +48,8 @@
 
 #include <string.h>
 
+WX_DECLARE_VOIDPTR_HASH_MAP( wxXVisualInfo*, wxXVisualInfoMap );
+
 extern wxList wxPendingDelete;
 extern bool wxAddIdleCallback();
 
@@ -111,9 +103,6 @@ bool wxApp::Initialize()
 
 void wxApp::CleanUp()
 {
-    delete wxWidgetHashTable;
-    wxWidgetHashTable = NULL;
-
     wxModule::CleanUpModules();
 
     wxDeleteStockObjects() ;
@@ -130,6 +119,9 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = NULL;
 
+    delete wxWidgetHashTable;
+    wxWidgetHashTable = 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
@@ -156,7 +148,11 @@ void wxApp::CleanUp()
     delete wxLog::SetActiveTarget(NULL);
 }
 
-int wxEntry( int argc, char *argv[] )
+// ============================================================================
+// wxEntry*
+// ============================================================================
+
+int wxEntryStart( int argc, char* argv[] )
 {
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     // This seems to be necessary since there are 'rogue'
@@ -169,7 +165,41 @@ int wxEntry( int argc, char *argv[] )
 #endif
 
     if (!wxApp::Initialize())
-        return FALSE;
+        return -1;
+
+    return 0;
+}
+
+int wxEntryInitGui()
+{
+    int retValue = 0;
+
+    // GUI-specific initialization, such as creating an app context.
+    if (!wxTheApp->OnInitGui())
+        retValue = -1;
+
+    return retValue;
+}
+
+void wxEntryCleanup()
+{
+    // So dialog boxes aren't used for further messages
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+
+    // flush the logged messages if any
+    wxLog *pLog = wxLog::GetActiveTarget();
+    if ( pLog != NULL && pLog->HasPendingMessages() )
+        pLog->Flush();
+
+    wxApp::CleanUp();
+}
+
+int wxEntry( int argc, char *argv[] )
+{
+    int retValue = 0;
+
+    retValue = wxEntryStart( argc, argv );
+    if (retValue) return retValue;
 
     if (!wxTheApp)
     {
@@ -195,25 +225,18 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->argv = argv;
 
     // GUI-specific initialization, such as creating an app context.
-    wxTheApp->OnInitGui();
+    retValue = wxEntryInitGui();
+    if (retValue) return retValue;
 
     // Here frames insert themselves automatically into wxTopLevelWindows by
     // getting created in OnInit().
 
-    int retValue = 0;
     if (wxTheApp->OnInit())
     {
-        if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+        if (wxTheApp->Initialized())
+            wxTheApp->OnRun();
     }
 
-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-
-    // So dialog boxes aren't used for further messages
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-
     if (wxTheApp->GetTopWindow())
     {
         delete wxTheApp->GetTopWindow();
@@ -222,12 +245,12 @@ int wxEntry( int argc, char *argv[] )
 
     wxTheApp->DeletePendingObjects();
 
-    wxTheApp->OnExit();
+    retValue = wxTheApp->OnExit();
 
-    wxApp::CleanUp();
+    wxEntryCleanup();
 
     return retValue;
-};
+}
 
 // Static member initialization
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
@@ -243,11 +266,21 @@ wxApp::wxApp()
     m_topLevelWidget = (WXWidget) NULL;
     m_maxRequestSize = 0;
     m_initialDisplay = (WXDisplay*) 0;
+    m_visualInfoMap = new wxXVisualInfoMap;
 }
 
 wxApp::~wxApp()
 {
     delete m_eventLoop;
+
+    for( wxXVisualInfoMap::iterator it  = m_visualInfoMap->begin(),
+                                    end = m_visualInfoMap->end();
+         it != end; ++it )
+    {
+        delete it->second;
+    }
+
+    delete m_visualInfoMap;
 }
 
 bool wxApp::Initialized()
@@ -287,7 +320,8 @@ bool wxApp::ProcessIdle()
 
 void wxApp::ExitMainLoop()
 {
-    m_eventLoop->Exit();
+    if( m_eventLoop->IsRunning() )
+        m_eventLoop->Exit();
 }
 
 // Is a message/event pending?
@@ -380,7 +414,7 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
     wxIdleEvent event;
     event.SetEventObject(win);
-    win->ProcessEvent(event);
+    win->GetEventHandler()->ProcessEvent(event);
 
     if (event.MoreRequested())
         needMore = TRUE;
@@ -493,6 +527,20 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
     return (WXColormap) c;
 }
 
+wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display )
+{
+    wxXVisualInfoMap::iterator it = m_visualInfoMap->find( display );
+
+    if( it != m_visualInfoMap->end() ) return it->second;
+
+    wxXVisualInfo* vi = new wxXVisualInfo;
+    wxFillXVisualInfo( vi, (Display*)display );
+
+    (*m_visualInfoMap)[display] = vi;
+
+    return vi;
+}
+
 void wxExit()
 {
     int retValue = 0;