/////////////////////////////////////////////////////////////////////////////
-// 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/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/log.h"
-
+#include "wx/apptrait.h"
#include <stdarg.h>
#include <stdio.h>
+#if defined(__WINDOWS__)
+ #include "wx/msw/private.h"
+#endif
+
// ===========================================================================
// implementation
// ===========================================================================
-#ifdef __WXBASE__
+#if wxUSE_BASE
// ----------------------------------------------------------------------------
// wxMessageOutput
{
if ( !ms_msgOut && wxTheApp )
{
- ms_msgOut = wxTheApp->CreateMessageOutput();
+ 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", (const char*) out.mb_str());
+ Output(out);
}
+#endif // !wxUSE_UTF8_LOCALE_ONLY
-// ----------------------------------------------------------------------------
-// wxMessageOutputDebug
-// ----------------------------------------------------------------------------
-
-void wxMessageOutputDebug::Printf(const wxChar* format, ...)
+#if wxUSE_UNICODE_UTF8
+void wxMessageOutput::DoPrintfUtf8(const char *format, ...)
{
- wxString out;
-
va_list args;
va_start(args, format);
+ wxString out;
out.PrintfV(format, args);
va_end(args);
-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
- out.Replace(wxT("\t"), wxT(" "));
- out += _T("\r\n");
- ::OutputDebugString(out);
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- if ( wxIsDebuggerRunning() )
+ Output(out);
+}
+#endif // wxUSE_UNICODE_UTF8
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputBest
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputBest::Output(const wxString& str)
+{
+#ifdef __WINDOWS__
+ // decide whether to use console output or not
+ wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+ const bool hasStderr = traits ? traits->CanUseStderr() : false;
+
+ if ( !(m_flags & wxMSGOUT_PREFER_MSGBOX) )
{
- Str255 pstr;
- wxString output = str + wxT(";g") ;
- wxMacStringToPascal(output.c_str(), pstr);
-
- #ifdef __powerc
- DebugStr(pstr);
- #else
- SysBreakStr(pstr);
- #endif
+ if ( hasStderr && traits->WriteToStderr(AppendLineFeedIfNeeded(str)) )
+ return;
}
-#else // !MSW, !Mac
- // FIXME: why is wxFputs() not defined under Linux?
- fputs(out.mb_str(), stderr);
- fflush(stderr);
-#endif // platform
+
+ wxString title;
+ if ( wxTheApp )
+ title = wxTheApp->GetAppDisplayName();
+ else // Use some title to avoid default "Error"
+ title = _("Message");
+
+ ::MessageBox(NULL, str.t_str(), title.t_str(), MB_ICONINFORMATION | MB_OK);
+#else // !__WINDOWS__
+ wxUnusedVar(m_flags);
+
+ // TODO: use the native message box for the other ports too
+ wxMessageOutputStderr::Output(str);
+#endif // __WINDOWS__/!__WINDOWS__
}
// ----------------------------------------------------------------------------
-// wxMessageOutputLog
+// wxMessageOutputStderr
// ----------------------------------------------------------------------------
-void wxMessageOutputLog::Printf(const wxChar* format, ...)
+wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str)
{
- wxString out;
+ wxString strLF(str);
+ if ( strLF.empty() || *strLF.rbegin() != '\n' )
+ strLF += '\n';
- va_list args;
- va_start(args, format);
+ return strLF;
+}
- out.PrintfV(format, args);
- va_end(args);
+void wxMessageOutputStderr::Output(const wxString& str)
+{
+ const wxString strWithLF = AppendLineFeedIfNeeded(str);
+ const wxWX2MBbuf buf = strWithLF.mb_str();
+ if ( buf )
+ fprintf(m_fp, "%s", (const char*) buf);
+ else // print at least something
+ fprintf(m_fp, "%s", (const char*) strWithLF.ToAscii());
+
+ fflush(m_fp);
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputDebug
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputDebug::Output(const wxString& str)
+{
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+ wxString out(AppendLineFeedIfNeeded(str));
out.Replace(wxT("\t"), wxT(" "));
+ out.Replace(wxT("\n"), wxT("\r\n"));
+ ::OutputDebugString(out.t_str());
+#else
+ // TODO: use native debug output function for the other ports too
+ wxMessageOutputStderr::Output(str);
+#endif // platform
+}
- ::wxLogMessage(wxT("%s"), out.c_str());
+// ----------------------------------------------------------------------------
+// wxMessageOutputLog
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputLog::Output(const wxString& str)
+{
+ wxString out(str);
+
+ out.Replace(wxT("\t"), wxT(" "));
+
+ wxLogMessage(wxT("%s"), out.c_str());
}
-#endif // __WXBASE__
+#endif // wxUSE_BASE
// ----------------------------------------------------------------------------
// wxMessageOutputMessageBox
// ----------------------------------------------------------------------------
-#if wxUSE_GUI
+#if wxUSE_GUI && wxUSE_MSGDLG
-void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
-{
- va_list args;
- va_start(args, format);
- wxString out;
+extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
- out.PrintfV(format, args);
- va_end(args);
+void wxMessageOutputMessageBox::Output(const wxString& str)
+{
+ wxString out(str);
// the native MSW msg box understands the TABs, others don't
-#ifndef __WXMSW__
+#ifndef __WINDOWS__
out.Replace(wxT("\t"), wxT(" "));
#endif
- wxString title;
- if ( wxTheApp )
- title.Printf(_("%s message"), wxTheApp->GetAppName().c_str());
+ wxString title = wxT("wxWidgets") ;
+ if (wxTheApp) title = wxTheApp->GetAppDisplayName();
::wxMessageBox(out, title);
}
#endif // wxUSE_GUI
-
projects / wxWidgets.git / blobdiff