From d03bb63c48d02a9f98e460236bcf9e20d859e546 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Wed, 2 Apr 2003 20:59:59 +0000 Subject: [PATCH] Remove dulicated call to wxBitmap::Init/CleanupStandardHandlers, which is already called from a module in bmpbase.cpp. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/motif/app.cpp | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 096845166f..1d226a24a9 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -101,17 +101,6 @@ bool wxApp::Initialize() wxInitializeStockLists(); wxInitializeStockObjects(); - // 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(); @@ -136,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; @@ -232,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()) { @@ -522,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);