TransferFrom/ToWindow() were reverted, fixed

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index e5381193b166bce77b83594325fc6bff7ba89f2a..9c202c14b17f097bd7c6330c1cae5c6d8806efd0 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "app.h"
 #endif
 
@@ -141,7 +141,7 @@ wxApp::~wxApp()
 
     delete m_perDisplayData;
 
-    wxTheApp = NULL;
+    wxApp::SetInstance(NULL);
 }
 
 bool wxApp::Initialized()
@@ -176,25 +176,6 @@ void wxApp::ExitMainLoop()
         m_eventLoop->Exit();
 }
 
-// Is a message/event pending?
-bool wxApp::Pending()
-{
-    return m_eventLoop->Pending();
-#if 0
-    XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() ));
-
-    // Fix by Doug from STI, to prevent a stall if non-X event
-    // is found.
-    return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ;
-#endif
-}
-
-// Dispatch a message.
-void wxApp::Dispatch()
-{
-    m_eventLoop->Dispatch();
-}
-
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
 void wxApp::HandlePropertyChange(WXEvent *event)