Applied patch [ 603104 ] wxX11 wxClientDC, wxPaintDC fix

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index e162226ed61c8a88b3b15eb5534496c2d221da16..9bdcdae51996418cb72ea777a506c33e5ed7a664 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -38,7 +38,8 @@
 #endif
 
 #include "wx/msgout.h"
 #endif
 
 #include "wx/msgout.h"

-
+#include "wx/log.h"
+                                                                            

 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 


@@ -50,16 +51,11 @@ wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
 
 wxMessageOutput* wxMessageOutput::Get()
 {
 
 wxMessageOutput* wxMessageOutput::Get()
 {

-    // FIXME this is an hack
-    static bool inGet = FALSE;
-
-    if(!ms_msgOut && wxTheApp && !inGet)
+    if ( !ms_msgOut && wxTheApp )

     {
     {

-        inGet = TRUE;
-        wxTheApp->DoInit();
+        ms_msgOut = wxTheApp->CreateMessageOutput();

     }
 
     }
 

-    inGet = FALSE;

     return ms_msgOut;
 }
 
     return ms_msgOut;
 }
 


@@ -115,15 +111,15 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
 
 void wxMessageOutputLog::Printf(const wxChar* format, ...)
 {
 
 void wxMessageOutputLog::Printf(const wxChar* format, ...)
 {

+    wxString out;
+

     va_list args;
     va_start(args, format);
     va_list args;
     va_start(args, format);

-    wxString out;

 
     out.PrintfV(format, args);
     va_end(args);
 
     out.Replace(wxT("\t"),wxT("        "));
 
     out.PrintfV(format, args);
     va_end(args);
 
     out.Replace(wxT("\t"),wxT("        "));

-    // under Motif, wxMessageDialog needs a parent window, so we use
-    // wxLog, which is better than nothing
+

     ::wxLogMessage(wxT("%s"), out.c_str());
 }
     ::wxLogMessage(wxT("%s"), out.c_str());
 }