X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/589f0e3e6070d8d1e6649b410f318ec2aa98ae4e..520e470fdd0daef09c77938db642e4583933c90d:/src/stubs/app.cpp diff --git a/src/stubs/app.cpp b/src/stubs/app.cpp index 6274caf50e..86438cf060 100644 --- a/src/stubs/app.cpp +++ b/src/stubs/app.cpp @@ -29,14 +29,10 @@ #include "wx/module.h" #include "wx/memory.h" -#if USE_WX_RESOURCES +#if wxUSE_WX_RESOURCES #include "wx/resource.h" #endif -#if USE_POSTSCRIPT -#include "wx/postscrp.h" -#endif - #include extern char *wxBuffer; @@ -61,7 +57,7 @@ bool wxApp::Initialize() wxBuffer = new char[BUFSIZ + 512]; #endif -#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT streambuf* sBuf = new wxDebugStreamBuf; ostream* oStr = new ostream(sBuf) ; @@ -75,17 +71,10 @@ bool wxApp::Initialize() wxTheColourDatabase->Initialize(); wxInitializeStockObjects(); -#if USE_WX_RESOURCES +#if wxUSE_WX_RESOURCES wxInitializeResourceSystem(); #endif - // For PostScript printing -#if USE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); -#endif - wxBitmap::InitStandardHandlers(); wxModule::RegisterModules(); @@ -98,7 +87,7 @@ void wxApp::CleanUp() { wxModule::CleanUpModules(); -#if USE_WX_RESOURCES +#if wxUSE_WX_RESOURCES wxCleanUpResourceSystem(); #endif @@ -121,12 +110,6 @@ void wxApp::CleanUp() delete wxTheColourDatabase; wxTheColourDatabase = NULL; -#if USE_POSTSCRIPT - wxInitializePrintSetupData(FALSE); - delete wxThePrintPaperDatabase; - wxThePrintPaperDatabase = NULL; -#endif - wxBitmap::CleanUpHandlers(); delete[] wxBuffer; @@ -192,7 +175,7 @@ int wxEntry( int argc, char *argv[] ) delete wxTheApp; wxTheApp = NULL; -#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT // At this point we want to check if there are any memory // blocks that aren't part of the wxDebugContext itself, // as a special case. Then when dumping we need to ignore