fix for always terminating intermediate UniChar String for 4 bytes wchar_t

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 9bdcdae51996418cb72ea777a506c33e5ed7a664..961e0c4614838533e3b284fa1b3d438ea6b18d36 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -17,7 +17,14 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma implementation "msgout.h"
 #endif
 
@@ -32,28 +39,43 @@
     #include "wx/string.h"
     #include "wx/ffile.h"
     #include "wx/app.h"
+    #include "wx/intl.h"
     #if wxUSE_GUI
         #include "wx/msgdlg.h"
     #endif // wxUSE_GUI
 #endif
 
 #include "wx/msgout.h"
+#include "wx/apptrait.h"
 #include "wx/log.h"
-                                                                            
+
 #include <stdarg.h>
 #include <stdio.h>
 
+#ifdef __WXMSW__
+    #include "wx/msw/private.h"
+#endif
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+
 // ===========================================================================
 // implementation
 // ===========================================================================
 
+#if wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxMessageOutput
+// ----------------------------------------------------------------------------
+
 wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
 
 wxMessageOutput* wxMessageOutput::Get()
 {
     if ( !ms_msgOut && wxTheApp )
     {
-        ms_msgOut = wxTheApp->CreateMessageOutput();
+        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
     }
 
     return ms_msgOut;
@@ -83,28 +105,43 @@ void wxMessageOutputStderr::Printf(const wxChar* format, ...)
 }
 
 // ----------------------------------------------------------------------------
-// wxMessageOutputMessageBox
+// wxMessageOutputDebug
 // ----------------------------------------------------------------------------
 
-#if wxUSE_GUI
-
-void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
+void wxMessageOutputDebug::Printf(const wxChar* format, ...)
 {
+    wxString out;
+
     va_list args;
     va_start(args, format);
-    wxString out;
 
     out.PrintfV(format, args);
     va_end(args);
 
-#ifndef __WXMSW__
-    out.Replace(wxT("\t"),wxT("        "));
-#endif
-    ::wxMessageBox(out);
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    out.Replace(wxT("\t"), wxT("        "));
+    out += _T("\r\n");
+    ::OutputDebugString(out);
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    if ( wxIsDebuggerRunning() )
+    {
+        Str255 pstr;
+        wxString output = out + wxT(";g") ;
+        wxMacStringToPascal(output.c_str(), pstr);
+
+        #ifdef __powerc
+            DebugStr(pstr);
+        #else
+            SysBreakStr(pstr);
+        #endif
+    }
+#else // !MSW, !Mac
+    // FIXME: why is wxFputs() not defined under Linux?
+    fputs(out.mb_str(), stderr);
+    fflush(stderr);
+#endif // platform
 }
 
-#endif // wxUSE_GUI
-
 // ----------------------------------------------------------------------------
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
@@ -119,7 +156,39 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...)
     out.PrintfV(format, args);
     va_end(args);
 
-    out.Replace(wxT("\t"),wxT("        "));
+    out.Replace(wxT("\t"), wxT("        "));
 
     ::wxLogMessage(wxT("%s"), out.c_str());
 }
+
+#endif // wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputMessageBox
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI
+
+void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+    // the native MSW msg box understands the TABs, others don't
+#ifndef __WXMSW__
+    out.Replace(wxT("\t"), wxT("        "));
+#endif
+
+    wxString title;
+    if ( wxTheApp )
+        title.Printf(_("%s message"), wxTheApp->GetAppName().c_str());
+
+    ::wxMessageBox(out, title);
+}
+
+#endif // wxUSE_GUI
+