Fix a number of mingw compile errors.

[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 d24514d..975dabe
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxMessageOutput implementation
 // Author:      Mattia Barbon
 // Modified by:
 // Purpose:     wxMessageOutput implementation
 // Author:      Mattia Barbon
 // Modified by:


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
-// Some older compilers (such as EMX) cannot handle
-// #pragma interface/implementation correctly, iff 
-// #pragma implementation is used in _two_ translation
-// units (as created by e.g. event.cpp compiled for
-// libwx_base and event.cpp compiled for libwx_gui_core).
-// So we must not use those pragmas for those compilers in
-// such files.
-    #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"
 


@@ -40,6 +29,7 @@
     #include "wx/ffile.h"
     #include "wx/app.h"
     #include "wx/intl.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
     #if wxUSE_GUI
         #include "wx/msgdlg.h"
     #endif // wxUSE_GUI


@@ -47,17 +37,12 @@
 
 #include "wx/msgout.h"
 #include "wx/apptrait.h"
 
 #include "wx/msgout.h"
 #include "wx/apptrait.h"

-#include "wx/log.h"
-

 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
 

-#ifdef __WXMSW__
+#if defined(__WINDOWS__)

     #include "wx/msw/private.h"
 #endif
     #include "wx/msw/private.h"
 #endif

-#ifdef __WXMAC__
-    #include "wx/mac/private.h"
-#endif

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


@@ -88,11 +73,22 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
     return old;
 }
 
     return old;
 }
 

-// ----------------------------------------------------------------------------
-// wxMessageOutputStderr
-// ----------------------------------------------------------------------------
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+    Output(out);
+}
+#endif // !wxUSE_UTF8_LOCALE_ONLY

 
 

-void wxMessageOutputStderr::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,51 +97,80 @@ void wxMessageOutputStderr::Printf(const wxChar* format, ...)
     out.PrintfV(format, args);
     va_end(args);
 
     out.PrintfV(format, args);
     va_end(args);
 

-    fprintf(stderr, "%s", (const char*) out.mb_str());
+    Output(out);

 }
 }

+#endif // wxUSE_UNICODE_UTF8

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// wxMessageOutputDebug
+// wxMessageOutputBest

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    wxString out;
+#ifdef __WINDOWS__
+    // decide whether to use console output or not
+    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    const bool hasStderr = traits ? traits->CanUseStderr() : false;

 
 

-    va_list args;
-    va_start(args, format);
+    if ( !(m_flags & wxMSGOUT_PREFER_MSGBOX) )
+    {
+        if ( hasStderr && traits->WriteToStderr(AppendLineFeedIfNeeded(str)) )
+            return;
+    }

 
 

-    out.PrintfV(format, args);
-    va_end(args);
+    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__
+}
+
+// ----------------------------------------------------------------------------
+// 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(__WXMSW__) && !defined(__WXMICROWIN__)
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)

+    wxString out(AppendLineFeedIfNeeded(str));

     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));

-    ::OutputDebugString(out);
-#elif defined(__WXMAC__) 
-#if !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
 #else

-    wxFputs( out , stderr ) ;
-    if ( out.Right(1) != wxT("\n") )
-        wxFputs( wxT("\n") , stderr ) ;
-    fflush( stderr ) ;
-#endif
-#else // !MSW, !Mac
-    // FIXME: why is wxFputs() not defined under Linux?
-    fputs(out.mb_str(), stderr);
-    fflush(stderr);
+    // TODO: use native debug output function for the other ports too
+    wxMessageOutputStderr::Output(str);

 #endif // platform
 }
 
 #endif // platform
 }
 


@@ -153,19 +178,13 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
 // wxMessageOutputLog
 // ----------------------------------------------------------------------------
 
 // 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("        "));
 
 
     out.Replace(wxT("\t"), wxT("        "));
 

-    ::wxLogMessage(wxT("%s"), out.c_str());
+    wxLogMessage(wxT("%s"), out.c_str());

 }
 
 #endif // wxUSE_BASE
 }
 
 #endif // wxUSE_BASE


@@ -174,28 +193,23 @@ void wxMessageOutputLog::Printf(const wxChar* format, ...)
 // wxMessageOutputMessageBox
 // ----------------------------------------------------------------------------
 
 // 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
 
 
     // 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
 
     ::wxMessageBox(out, title);
 }
 
 #endif // wxUSE_GUI

-