/////////////////////////////////////////////////////////////////////////////
-// Name: common/msgout.cpp
+// Name: src/common/msgout.cpp
// Purpose: wxMessageOutput implementation
// Author: Mattia Barbon
// Modified by:
// Created: 17.07.02
// RCS-ID: $Id$
-// Copyright: (c) the wxWindows team
+// Copyright: (c) the wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "msgout.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/string.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
#endif
#include "wx/msgout.h"
-
+#include "wx/apptrait.h"
#include <stdarg.h>
#include <stdio.h>
+#if defined(__WINDOWS__)
+ #include "wx/msw/private.h"
+#endif
+
// ===========================================================================
// implementation
// ===========================================================================
+#if wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxMessageOutput
+// ----------------------------------------------------------------------------
+
wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
wxMessageOutput* wxMessageOutput::Get()
{
+ if ( !ms_msgOut && wxTheApp )
+ {
+ ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
+ }
+
return ms_msgOut;
}
return old;
}
-// ----------------------------------------------------------------------------
-// wxMessageOutputStderr
-// ----------------------------------------------------------------------------
-
-void wxMessageOutputStderr::Printf(const wxChar* format, ...)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...)
{
va_list args;
va_start(args, format);
out.PrintfV(format, args);
va_end(args);
- fprintf(stderr, "%s", out.mb_str());
+ Output(out);
}
+#endif // !wxUSE_UTF8_LOCALE_ONLY
-// ----------------------------------------------------------------------------
-// wxMessageOutputMessageBox
-// ----------------------------------------------------------------------------
-
-#if wxUSE_GUI
-
-void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
+#if wxUSE_UNICODE_UTF8
+void wxMessageOutput::DoPrintfUtf8(const char *format, ...)
{
va_list args;
va_start(args, format);
out.PrintfV(format, args);
va_end(args);
-#ifndef __WXMSW__
- out.Replace("\t"," ");
-#endif
- ::wxMessageBox(out);
+ Output(out);
}
+#endif // wxUSE_UNICODE_UTF8
-#endif // wxUSE_GUI
+// ----------------------------------------------------------------------------
+// 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::Output(const wxString& str)
+{
+#ifdef __WINDOWS__
+ if ( !IsInConsole() )
+ {
+ ::MessageBox(NULL, str.wx_str(), _T("wxWidgets"),
+ MB_ICONINFORMATION | MB_OK);
+ }
+ else
+#endif // __WINDOWS__/!__WINDOWS__
+ {
+ const wxWX2MBbuf buf = str.mb_str();
+
+ if ( buf )
+ fprintf(stderr, "%s", (const char*) buf);
+ else // print at least something
+ fprintf(stderr, "%s", (const char*) str.ToAscii());
+ }
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputStderr
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputStderr::Output(const wxString& str)
+{
+ const wxWX2MBbuf buf = str.mb_str();
+
+ if ( buf )
+ fprintf(stderr, "%s", (const char*) buf);
+ else // print at least something
+ fprintf(stderr, "%s", (const char*) str.ToAscii());
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputDebug
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputDebug::Output(const wxString& str)
+{
+ wxString out(str);
+
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+ out.Replace(wxT("\t"), wxT(" "));
+ out.Replace(wxT("\n"), wxT("\r\n"));
+ ::OutputDebugString(out.wx_str());
+#else
+ wxFputs( out , stderr ) ;
+ if ( out.Right(1) != wxT("\n") )
+ wxFputs( wxT("\n") , stderr ) ;
+ fflush( stderr ) ;
+#endif // platform
+}
// ----------------------------------------------------------------------------
// wxMessageOutputLog
// ----------------------------------------------------------------------------
-#if wxUSE_GUI && defined(__WXMOTIF__)
+void wxMessageOutputLog::Output(const wxString& str)
+{
+ wxString out(str);
+
+ out.Replace(wxT("\t"), wxT(" "));
+
+ ::wxLogMessage(wxT("%s"), out.c_str());
+}
+
+#endif // wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputMessageBox
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI && wxUSE_MSGDLG
-void wxMessageOutputLog::Printf(const wxChar* format, ...)
+void wxMessageOutputMessageBox::Output(const wxString& str)
{
- va_list args;
- va_start(args, format);
- wxString out;
+ wxString out(str);
- out.PrintfV(format, args);
- va_end(args);
+ // the native MSW msg box understands the TABs, others don't
+#ifndef __WXMSW__
+ out.Replace(wxT("\t"), wxT(" "));
+#endif
+
+ wxString title;
+ if ( wxTheApp )
+ title.Printf(_("%s message"), wxTheApp->GetAppDisplayName().c_str());
- out.Replace("\t"," ");
- // under Motif, wxMessageDialog needs a parent window, so we use
- // wxLog, which is better than nothing
- ::wxLogMessage("%s", out.c_str());
+ ::wxMessageBox(out, title);
}
#endif // wxUSE_GUI