Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 54cd442fa1ff14db7c9198ce349efdf393847a46..84bb0547e4462b0188af678013239d189820bc10 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -52,7 +52,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 

-#if defined(__WXMSW__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__)

     #include "wx/msw/private.h"
 #endif
 #ifdef __WXMAC__
     #include "wx/msw/private.h"
 #endif
 #ifdef __WXMAC__


@@ -88,6 +88,33 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
     return old;
 }
 
     return old;
 }
 

+// ----------------------------------------------------------------------------
+// wxMessageOutputBest
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputBest::Printf(const wxChar* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+#ifdef __WINDOWS__
+    // check if we're running in a console
+    HANDLE hStdErr = ::GetStdHandle(STD_ERROR_HANDLE);
+    if ( !hStdErr || hStdErr == INVALID_HANDLE_VALUE )
+    {
+        ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
+    }
+    else
+#endif // __WINDOWS__/!__WINDOWS__
+    {
+        fprintf(stderr, "%s", (const char*) out.mb_str());
+    }
+}
+

 // ----------------------------------------------------------------------------
 // wxMessageOutputStderr
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMessageOutputStderr
 // ----------------------------------------------------------------------------


@@ -118,7 +145,7 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
     out.PrintfV(format, args);
     va_end(args);
 
     out.PrintfV(format, args);
     va_end(args);
 

-#if defined(__WXMSW__) && !defined(__WXMICROWIN__) && !defined(__WXPALMOS__)
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)

     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out);
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out);