typo: PrintfInLogBug() was probably supposed to be called PrintfInLogBuf()

[wxWidgets.git] / src / common / appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 7f31949cb4a0ca0708881a96ae40c7392872448d..3316cced794a86c0cf87aa3ab7e75642ec55f634 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -25,14 +25,15 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/list.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
     #include "wx/intl.h"
-    #include "wx/list.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/bitmap.h"
     #include "wx/confbase.h"
+    #include "wx/utils.h"
 #endif
 
 #include "wx/apptrait.h"
@@ -40,7 +41,6 @@
 #include "wx/evtloop.h"
 #include "wx/msgout.h"
 #include "wx/thread.h"
-#include "wx/utils.h"
 #include "wx/ptr_scpd.h"
 
 #if defined(__WXMSW__)
@@ -63,9 +63,6 @@ WX_CHECK_BUILD_OPTIONS("wxCore")
 // this defines wxEventLoopPtr
 wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
 
-// define it here as we don't have common/evtloopcmn.cpp for now
-wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
-
 // ============================================================================
 // wxAppBase implementation
 // ============================================================================
@@ -107,7 +104,6 @@ bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
 #endif
 
     wxInitializeStockLists();
-    wxInitializeStockObjects();
 
     wxBitmap::InitStandardHandlers();
 
@@ -140,7 +136,7 @@ void wxAppBase::CleanUp()
     // undo everything we did in Initialize() above
     wxBitmap::CleanUpHandlers();
 
-    wxDeleteStockObjects();
+    wxStockGDI::DeleteAll();
 
     wxDeleteStockLists();