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
This commit is contained in:
parent
be05eab690
commit
d03bb63c48
@ -101,17 +101,6 @@ bool wxApp::Initialize()
|
|||||||
wxInitializeStockLists();
|
wxInitializeStockLists();
|
||||||
wxInitializeStockObjects();
|
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);
|
wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
|
||||||
|
|
||||||
wxModule::RegisterModules();
|
wxModule::RegisterModules();
|
||||||
@ -136,16 +125,6 @@ void wxApp::CleanUp()
|
|||||||
delete wxTheColourDatabase;
|
delete wxTheColourDatabase;
|
||||||
wxTheColourDatabase = NULL;
|
wxTheColourDatabase = NULL;
|
||||||
|
|
||||||
#if wxUSE_POSTSCRIPT
|
|
||||||
/* Done using wxModule now
|
|
||||||
wxInitializePrintSetupData(FALSE);
|
|
||||||
delete wxThePrintPaperDatabase;
|
|
||||||
wxThePrintPaperDatabase = NULL;
|
|
||||||
*/
|
|
||||||
#endif
|
|
||||||
|
|
||||||
wxBitmap::CleanUpHandlers();
|
|
||||||
|
|
||||||
wxClassInfo::CleanUpClasses();
|
wxClassInfo::CleanUpClasses();
|
||||||
|
|
||||||
delete wxTheApp;
|
delete wxTheApp;
|
||||||
@ -232,8 +211,8 @@ int wxEntry( int argc, char *argv[] )
|
|||||||
if ( pLog != NULL && pLog->HasPendingMessages() )
|
if ( pLog != NULL && pLog->HasPendingMessages() )
|
||||||
pLog->Flush();
|
pLog->Flush();
|
||||||
|
|
||||||
delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
|
// So dialog boxes aren't used for further messages
|
||||||
// for further messages
|
delete wxLog::SetActiveTarget(new wxLogStderr);
|
||||||
|
|
||||||
if (wxTheApp->GetTopWindow())
|
if (wxTheApp->GetTopWindow())
|
||||||
{
|
{
|
||||||
@ -522,7 +501,8 @@ void wxExit()
|
|||||||
|
|
||||||
wxApp::CleanUp();
|
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.
|
* only for emergencies.
|
||||||
*/
|
*/
|
||||||
exit(retValue);
|
exit(retValue);
|
||||||
|
Loading…
Reference in New Issue
Block a user