fixing osx_carbon

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index e6a471d9b3178f72aec9f3bb42733e724541e418..975dabe0aea14b9715b9307ddd91da970d5601d9 100644 (file)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -118,7 +118,13 @@ void wxMessageOutputBest::Output(const wxString& str)
             return;
     }
 
             return;
     }
 

-    ::MessageBox(NULL, str.wx_str(), NULL, MB_ICONINFORMATION | MB_OK);
+    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);
 #else // !__WINDOWS__
     // TODO: use the native message box for the other ports too
     wxMessageOutputStderr::Output(str);


@@ -140,12 +146,15 @@ wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str)
 
 void wxMessageOutputStderr::Output(const wxString& str)
 {
 
 void wxMessageOutputStderr::Output(const wxString& str)
 {

-    const wxWX2MBbuf buf = AppendLineFeedIfNeeded(str).mb_str();
+    const wxString strWithLF = AppendLineFeedIfNeeded(str);
+    const wxWX2MBbuf buf = strWithLF.mb_str();

 
     if ( buf )
 
     if ( buf )

-        fprintf(stderr, "%s", (const char*) buf);
+        fprintf(m_fp, "%s", (const char*) buf);

     else // print at least something
     else // print at least something

-        fprintf(stderr, "%s", (const char*) str.ToAscii());
+        fprintf(m_fp, "%s", (const char*) strWithLF.ToAscii());
+
+    fflush(m_fp);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -158,7 +167,7 @@ void wxMessageOutputDebug::Output(const wxString& str)
     wxString out(AppendLineFeedIfNeeded(str));
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     wxString out(AppendLineFeedIfNeeded(str));
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));

-    ::OutputDebugString(out.wx_str());
+    ::OutputDebugString(out.t_str());

 #else
     // TODO: use native debug output function for the other ports too
     wxMessageOutputStderr::Output(str);
 #else
     // TODO: use native debug output function for the other ports too
     wxMessageOutputStderr::Output(str);


@@ -175,7 +184,7 @@ void wxMessageOutputLog::Output(const wxString& 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


@@ -186,6 +195,8 @@ void wxMessageOutputLog::Output(const wxString& str)
 
 #if wxUSE_GUI && wxUSE_MSGDLG
 
 
 #if wxUSE_GUI && wxUSE_MSGDLG
 

+extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
+

 void wxMessageOutputMessageBox::Output(const wxString& str)
 {
     wxString out(str);
 void wxMessageOutputMessageBox::Output(const wxString& str)
 {
     wxString out(str);


@@ -195,7 +206,8 @@ void wxMessageOutputMessageBox::Output(const wxString& str)
     out.Replace(wxT("\t"), wxT("        "));
 #endif
 
     out.Replace(wxT("\t"), wxT("        "));
 #endif
 

-    wxString title = wxTheApp ? wxTheApp->GetAppDisplayName() : wxT("wxWidgets");
+    wxString title = wxT("wxWidgets") ;
+    if (wxTheApp) title = wxTheApp->GetAppDisplayName();

 
     ::wxMessageBox(out, title);
 }
 
     ::wxMessageBox(out, title);
 }