added assert to check that notebook page does have notebook as parent; removed duplic...

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index b40531cea5e5a8b231248c09e46ee29acca1b3c6..1d226a24a96b9b9d0ad56ad8f9c7e5006938f24e 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -42,10 +42,6 @@
     #include "wx/thread.h"
 #endif
 
-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
-#endif
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
@@ -105,21 +101,6 @@ bool wxApp::Initialize()
     wxInitializeStockLists();
     wxInitializeStockObjects();
 
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-
-    // For PostScript printing
-#if wxUSE_POSTSCRIPT
-    /* Done using wxModule now
-    wxInitializePrintSetupData();
-    wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-    wxThePrintPaperDatabase->CreateDatabase();
-    */
-#endif
-
-    wxBitmap::InitStandardHandlers();
-
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 
     wxModule::RegisterModules();
@@ -135,10 +116,6 @@ void wxApp::CleanUp()
 
     wxModule::CleanUpModules();
 
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-
     wxDeleteStockObjects() ;
 
     // Destroy all GDI lists, etc.
@@ -148,16 +125,6 @@ void wxApp::CleanUp()
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 
-#if wxUSE_POSTSCRIPT
-    /* Done using wxModule now
-    wxInitializePrintSetupData(FALSE);
-    delete wxThePrintPaperDatabase;
-    wxThePrintPaperDatabase = NULL;
-    */
-#endif
-
-    wxBitmap::CleanUpHandlers();
-
     wxClassInfo::CleanUpClasses();
 
     delete wxTheApp;
@@ -244,8 +211,8 @@ int wxEntry( int argc, char *argv[] )
     if ( pLog != NULL && pLog->HasPendingMessages() )
         pLog->Flush();
 
-    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
-    // for further messages
+    // So dialog boxes aren't used for further messages
+    delete wxLog::SetActiveTarget(new wxLogStderr);
 
     if (wxTheApp->GetTopWindow())
     {
@@ -326,11 +293,14 @@ void wxApp::ExitMainLoop()
 // 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.
@@ -464,7 +434,7 @@ bool wxApp::OnInitGui()
     XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
 
     Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
-        (const char*) wxTheApp->GetClassName(), NULL, 0,
+        wxTheApp->GetClassName().c_str(), NULL, 0,
 # if XtSpecificationRelease < 5
         (Cardinal*) &argc,
 # else
@@ -477,7 +447,7 @@ bool wxApp::OnInitGui()
         delete wxLog::SetActiveTarget(new wxLogStderr);
         wxString className(wxTheApp->GetClassName());
         wxLogError(_("wxWindows could not open display for '%s': exiting."),
-                   (const char*) className);
+                   className.c_str());
         exit(-1);
     }
     m_initialDisplay = (WXDisplay*) dpy;
@@ -487,9 +457,11 @@ bool wxApp::OnInitGui()
     gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
 #endif // __WXDEBUG__
 
-    wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
-        applicationShellWidgetClass,dpy,
-        NULL,0) ;
+    wxTheApp->m_topLevelWidget =
+        (WXWidget) XtAppCreateShell((String)NULL,
+                                    wxTheApp->GetClassName().c_str(),
+                                    applicationShellWidgetClass,dpy,
+                                    NULL,0) ;
 
     // Add general resize proc
     XtActionsRec rec;
@@ -529,7 +501,8 @@ void wxExit()
 
     wxApp::CleanUp();
     /*
-    * Exit in some platform-specific way. Not recommended that the app calls this:
+    * Exit in some platform-specific way.
+    * Not recommended that the app calls this:
     * only for emergencies.
     */
     exit(retValue);