add wxGenericStaticText (#9656)

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

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

-    ::MessageBox(NULL, str.wx_str(), NULL, MB_ICONINFORMATION | MB_OK);
+    ::MessageBox(NULL, str.t_str(), NULL, 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 +140,13 @@ 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 )
         fprintf(stderr, "%s", (const char*) buf);
     else // print at least something
 
     if ( buf )
         fprintf(stderr, "%s", (const char*) buf);
     else // print at least something

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

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


@@ -158,7 +159,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);


@@ -195,7 +196,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);
 }