fixed win32 code to not use MB_ERR_INVALID_CHARS on win version where it isn't availa...

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 87d9e708d4b6a39c4c3f9bbc326984684511f600..b0c10d92b3468be753765bf6a4f31504106f4e68 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -17,17 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#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
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -92,6 +81,21 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
 // wxMessageOutputBest
 // ----------------------------------------------------------------------------
 
 // wxMessageOutputBest
 // ----------------------------------------------------------------------------
 

+#ifdef __WINDOWS__
+
+// check if we're running in a console under Windows
+static inline bool IsInConsole()
+{
+#ifdef __WXWINCE__
+    return false;
+#else // !__WXWINCE__
+    HANDLE hStdErr = ::GetStdHandle(STD_ERROR_HANDLE);
+    return hStdErr && hStdErr != INVALID_HANDLE_VALUE;
+#endif // __WXWINCE__/!__WXWINCE__
+}
+
+#endif // __WINDOWS__
+

 void wxMessageOutputBest::Printf(const wxChar* format, ...)
 {
     va_list args;
 void wxMessageOutputBest::Printf(const wxChar* format, ...)
 {
     va_list args;


@@ -102,9 +106,7 @@ void wxMessageOutputBest::Printf(const wxChar* format, ...)
     va_end(args);
 
 #ifdef __WINDOWS__
     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 )
+    if ( !IsInConsole() )

     {
         ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
     }
     {
         ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
     }