// Created: 17.07.02
// RCS-ID: $Id$
// Copyright: (c) the wxWidgets team
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
// Some older compilers (such as EMX) cannot handle
-// #pragma interface/implementation correctly, iff
+// #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).
#include <stdarg.h>
#include <stdio.h>
-#ifdef __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
// ----------------------------------------------------------------------------
SysBreakStr(pstr);
#endif
}
-#else // !MSW, !Mac
- // FIXME: why is wxFputs() not defined under Linux?
- fputs(out.mb_str(), stderr);
- fflush(stderr);
+#else
+ wxFputs( out , stderr ) ;
+ if ( out.Right(1) != wxT("\n") )
+ wxFputs( wxT("\n") , stderr ) ;
+ fflush( stderr ) ;
#endif // platform
}