Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

[wxWidgets.git] / src / common / msgout.cpp

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 30e50e9..bf98eb4
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/msgout.cpp
+// Name:        src/common/msgout.cpp

 // Purpose:     wxMessageOutput implementation
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     17.07.02
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +16,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "msgout.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -32,34 +27,41 @@
     #include "wx/string.h"
     #include "wx/ffile.h"
     #include "wx/app.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"
     #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>
 
 #include <stdarg.h>
 #include <stdio.h>
 

+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h"
+#endif
+

 // ===========================================================================
 // implementation
 // ===========================================================================
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 

+#if wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxMessageOutput
+// ----------------------------------------------------------------------------
+

 wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
 
 wxMessageOutput* wxMessageOutput::Get()
 {
 wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
 
 wxMessageOutput* wxMessageOutput::Get()
 {

-    // FIXME this is an hack
-    static bool inGet = FALSE;
-
-    if(!ms_msgOut && wxTheApp && !inGet)
+    if ( !ms_msgOut && wxTheApp )

     {
     {

-        inGet = TRUE;
-        wxTheApp->DoInit();
+        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();

     }
 
     }
 

-    inGet = FALSE;

     return ms_msgOut;
 }
 
     return ms_msgOut;
 }
 


@@ -70,11 +72,8 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
     return old;
 }
 
     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);
 {
     va_list args;
     va_start(args, format);


@@ -83,16 +82,12 @@ void wxMessageOutputStderr::Printf(const wxChar* format, ...)
     out.PrintfV(format, args);
     va_end(args);
 
     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);
 {
     va_list args;
     va_start(args, format);


@@ -101,29 +96,121 @@ void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
     out.PrintfV(format, args);
     va_end(args);
 
     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
+// ----------------------------------------------------------------------------
+
+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) )
+    {
+        if ( hasStderr && traits->WriteToStderr(AppendLineFeedIfNeeded(str)) )
+            return;
+    }
+
+    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__
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputStderr
+// ----------------------------------------------------------------------------
+
+wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str)
+{
+    wxString strLF(str);
+    if ( strLF.empty() || *strLF.rbegin() != '\n' )
+        strLF += '\n';
+
+    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());
+
+    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
+}

 
 // ----------------------------------------------------------------------------
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
 

-void wxMessageOutputLog::Printf(const wxChar* format, ...)
+void wxMessageOutputLog::Output(const wxString& str)

 {
 {

-    va_list args;
-    va_start(args, format);
-    wxString out;
+    wxString out(str);

 
 

-    out.PrintfV(format, args);
-    va_end(args);
+    out.Replace(wxT("\t"), wxT("        "));
+
+    wxLogMessage(wxT("%s"), out.c_str());
+}
+
+#endif // wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputMessageBox
+// ----------------------------------------------------------------------------

 
 

-    out.Replace("\t","        ");
-    // under Motif, wxMessageDialog needs a parent window, so we use
-    // wxLog, which is better than nothing
-    ::wxLogMessage("%s", out.c_str());
+#if wxUSE_GUI && wxUSE_MSGDLG
+
+extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
+
+void wxMessageOutputMessageBox::Output(const wxString& str)
+{
+    wxString out(str);
+
+    // the native MSW msg box understands the TABs, others don't
+#ifndef __WINDOWS__
+    out.Replace(wxT("\t"), wxT("        "));
+#endif
+
+    wxString title = wxT("wxWidgets") ;
+    if (wxTheApp) title = wxTheApp->GetAppDisplayName();
+
+    ::wxMessageBox(out, title);

 }
 }

+
+#endif // wxUSE_GUI