Unicode-enabled the STC sample

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index b41e0ebcd8ffce0a928d6ab3de54e8ae04e463dc..1d226a24a96b9b9d0ad56ad8f9c7e5006938f24e 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -42,10 +42,6 @@
     #include "wx/thread.h"
 #endif
 
     #include "wx/thread.h"
 #endif
 

-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
-#endif
-

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif


@@ -105,21 +101,6 @@ bool wxApp::Initialize()
     wxInitializeStockLists();
     wxInitializeStockObjects();
 
     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();
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 
     wxModule::RegisterModules();


@@ -135,10 +116,6 @@ void wxApp::CleanUp()
 
     wxModule::CleanUpModules();
 
 
     wxModule::CleanUpModules();
 

-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-

     wxDeleteStockObjects() ;
 
     // Destroy all GDI lists, etc.
     wxDeleteStockObjects() ;
 
     // Destroy all GDI lists, etc.


@@ -148,16 +125,6 @@ void wxApp::CleanUp()
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 

-#if wxUSE_POSTSCRIPT
-    /* Done using wxModule now
-    wxInitializePrintSetupData(FALSE);
-    delete wxThePrintPaperDatabase;
-    wxThePrintPaperDatabase = NULL;
-    */
-#endif
-
-    wxBitmap::CleanUpHandlers();
-

     wxClassInfo::CleanUpClasses();
 
     delete wxTheApp;
     wxClassInfo::CleanUpClasses();
 
     delete wxTheApp;


@@ -244,8 +211,8 @@ int wxEntry( int argc, char *argv[] )
     if ( pLog != NULL && pLog->HasPendingMessages() )
         pLog->Flush();
 
     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())
     {
 
     if (wxTheApp->GetTopWindow())
     {


@@ -534,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.
     */
     exit(retValue);
     * only for emergencies.
     */
     exit(retValue);