/////////////////////////////////////////////////////////////////////////////
-// Name: common/msgout.cpp
+// Name: src/common/msgout.cpp
// Purpose: wxMessageOutput implementation
// Author: Mattia Barbon
// Modified by:
// 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"
#include "wx/ffile.h"
#include "wx/app.h"
#include "wx/intl.h"
+ #include "wx/log.h"
#if wxUSE_GUI
#include "wx/msgdlg.h"
#endif // wxUSE_GUI
#include "wx/msgout.h"
#include "wx/apptrait.h"
-#include "wx/log.h"
-
#include <stdarg.h>
#include <stdio.h>
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
#include "wx/msw/private.h"
#endif
#ifdef __WXMAC__
return old;
}
+// ----------------------------------------------------------------------------
+// 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;
+ va_start(args, format);
+ wxString out;
+
+ out.PrintfV(format, args);
+ va_end(args);
+
+#ifdef __WINDOWS__
+ if ( !IsInConsole() )
+ {
+ ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
+ }
+ else
+#endif // __WINDOWS__/!__WINDOWS__
+ {
+ fprintf(stderr, "%s", (const char*) out.mb_str());
+ }
+}
+
// ----------------------------------------------------------------------------
// wxMessageOutputStderr
// ----------------------------------------------------------------------------
}
#endif // wxUSE_GUI
-