/////////////////////////////////////////////////////////////////////////////
-// Name: common/msgout.cpp
+// Name: src/common/msgout.cpp
// Purpose: wxMessageOutput implementation
// Author: Mattia Barbon
// Modified by:
#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(__WINDOWS__)
#include "wx/msw/private.h"
#endif
-#ifdef __WXMAC__
- #include "wx/mac/private.h"
-#endif
// ===========================================================================
// implementation
return old;
}
-// ----------------------------------------------------------------------------
-// wxMessageOutputBest
-// ----------------------------------------------------------------------------
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...)
+{
+ va_list args;
+ va_start(args, format);
+ wxString out;
-#ifdef __WINDOWS__
+ out.PrintfV(format, args);
+ va_end(args);
-// 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__
+ Output(out);
}
+#endif // !wxUSE_UTF8_LOCALE_ONLY
-#endif // __WINDOWS__
-
-void wxMessageOutputBest::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);
+ Output(out);
+}
+#endif // wxUSE_UNICODE_UTF8
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputBest
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputBest::Output(const wxString& str)
+{
#ifdef __WINDOWS__
- if ( !IsInConsole() )
+ // 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) )
{
- ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
+ if ( hasStderr && traits->WriteToStderr(AppendLineFeedIfNeeded(str)) )
+ return;
}
- else
+
+ 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__
+ // TODO: use the native message box for the other ports too
+ wxMessageOutputStderr::Output(str);
#endif // __WINDOWS__/!__WINDOWS__
- {
- fprintf(stderr, "%s", (const char*) out.mb_str());
- }
}
// ----------------------------------------------------------------------------
// wxMessageOutputStderr
// ----------------------------------------------------------------------------
-void wxMessageOutputStderr::Printf(const wxChar* format, ...)
+wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str)
{
- va_list args;
- va_start(args, format);
- wxString out;
+ wxString strLF(str);
+ if ( strLF.empty() || *strLF.rbegin() != '\n' )
+ strLF += '\n';
- out.PrintfV(format, args);
- va_end(args);
+ return strLF;
+}
+
+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());
- fprintf(stderr, "%s", (const char*) out.mb_str());
+ fflush(m_fp);
}
// ----------------------------------------------------------------------------
// wxMessageOutputDebug
// ----------------------------------------------------------------------------
-void wxMessageOutputDebug::Printf(const wxChar* format, ...)
+void wxMessageOutputDebug::Output(const wxString& str)
{
- wxString out;
-
- va_list args;
- va_start(args, format);
-
- out.PrintfV(format, args);
- va_end(args);
-
#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+ wxString out(AppendLineFeedIfNeeded(str));
out.Replace(wxT("\t"), wxT(" "));
out.Replace(wxT("\n"), wxT("\r\n"));
- ::OutputDebugString(out);
-#elif defined(__WXMAC__) && !defined(__DARWIN__)
- if ( wxIsDebuggerRunning() )
- {
- Str255 pstr;
- wxString output = out + wxT(";g") ;
- wxMacStringToPascal(output.c_str(), pstr);
-
- #ifdef __powerc
- DebugStr(pstr);
- #else
- SysBreakStr(pstr);
- #endif
- }
+ ::OutputDebugString(out.t_str());
#else
- wxFputs( out , stderr ) ;
- if ( out.Right(1) != wxT("\n") )
- wxFputs( wxT("\n") , stderr ) ;
- fflush( stderr ) ;
+ // TODO: use native debug output function for the other ports too
+ wxMessageOutputStderr::Output(str);
#endif // platform
}
// wxMessageOutputLog
// ----------------------------------------------------------------------------
-void wxMessageOutputLog::Printf(const wxChar* format, ...)
+void wxMessageOutputLog::Output(const wxString& str)
{
- wxString out;
-
- va_list args;
- va_start(args, format);
-
- out.PrintfV(format, args);
- va_end(args);
+ wxString out(str);
out.Replace(wxT("\t"), wxT(" "));
- ::wxLogMessage(wxT("%s"), out.c_str());
+ wxLogMessage(wxT("%s"), out.c_str());
}
#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__
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