More COMPATIBILITY_2_4 fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 6e51ac79dda7b73031e23c6ae7c0960c858581cd..86a83f0954a0dbaf67ae3b0fc028eca2b30afbfa 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -384,7 +384,7 @@ wxLog *wxLog::GetActiveTarget()
 
             // ask the application to create a log target for us
             if ( wxTheApp != NULL )
-                ms_pLogger = wxTheApp->CreateLogTarget();
+                ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();
             else
                 ms_pLogger = new wxLogStderr;
 
@@ -425,7 +425,7 @@ void wxLog::RemoveTraceMask(const wxString& str)
 {
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )
-        ms_aTraceMasks.Remove((size_t)index);
+        ms_aTraceMasks.RemoveAt((size_t)index);
 }
 
 void wxLog::ClearTraceMasks()

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index c9994ce41d0c61f384f4303d8a3d8a2a407daef5..1225ae88d06bb22146c5b1886bdaf2961ca9265d 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -33,6 +33,7 @@
     #include "wx/ffile.h"
     #include "wx/app.h"
     #include "wx/intl.h"
+    #include "wx/apptrait.h"
     #if wxUSE_GUI
         #include "wx/msgdlg.h"
     #endif // wxUSE_GUI
@@ -64,7 +65,7 @@ wxMessageOutput* wxMessageOutput::Get()
 {
     if ( !ms_msgOut && wxTheApp )
     {
-        ms_msgOut = wxTheApp->CreateMessageOutput();
+        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
     }
 
     return ms_msgOut;