replaced wxGetOsVersion() with wxGUIAppTraits::GetOSVersion()

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index cc1fad12dd4efe467c589f2db313dddf69abd911..d7a0f97dbbe8400b75b485457604cd173f6b395a 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -66,8 +66,6 @@ static WXWidget wxCreateTopLevelWidget( WXDisplay* display );
 extern wxList wxPendingDelete;
 extern bool wxAddIdleCallback();
 
-wxApp *wxTheApp = NULL;
-
 wxHashTable *wxWidgetHashTable = NULL;
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
@@ -161,6 +159,13 @@ void wxApp::CleanUp()
     delete wxLog::SetActiveTarget(NULL);
 }
 
+void wxApp::Exit()
+{
+    wxApp::CleanUp();
+
+    wxAppConsole::Exit();
+}
+
 // ============================================================================
 // wxEntry*
 // ============================================================================
@@ -265,9 +270,6 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 }
 
-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
-
 wxApp::wxApp()
 {
     argc = 0;
@@ -564,6 +566,8 @@ WXWidget wxCreateTopLevelWidget( WXDisplay* display )
                                    applicationShellWidgetClass,
                                    (Display*)display,
                                    NULL, 0 );
+    XtSetMappedWhenManaged( tlw, False );
+    XtRealizeWidget( tlw );
 
     XtAddCallback( tlw, XmNdestroyCallback,
                    (XtCallbackProc)wxTLWidgetDestroyCallback,
@@ -591,21 +595,6 @@ void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)
     (*m_perDisplayData)[display].m_topLevelWidget = (Widget)widget;
 }
 
-void wxExit()
-{
-    int retValue = 0;
-    if (wxTheApp)
-        retValue = wxTheApp->OnExit();
-
-    wxApp::CleanUp();
-    /*
-    * Exit in some platform-specific way.
-    * Not recommended that the app calls this:
-    * only for emergencies.
-    */
-    exit(retValue);
-}
-
 // Yield to other processes
 
 bool wxApp::Yield(bool onlyIfNeeded)