X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/532d575bd9baedbbf1c52907a66255975f527530..49c48f81905323f2a1fdd719b093528048e538aa:/src/common/msgout.cpp diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp index 87d9e708d4..3e9471de8d 100755 --- a/src/common/msgout.cpp +++ b/src/common/msgout.cpp @@ -92,6 +92,21 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout) // 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; @@ -102,9 +117,7 @@ void wxMessageOutputBest::Printf(const wxChar* format, ...) 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); }