Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index e01073c9099c6a2d90dd07b632b26895548b34f6..9647088067e24c9ff33cca816872d84f6065e779 100644 (file)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -163,7 +163,7 @@ void wxMessageOutputStderr::Output(const wxString& str)
 
 void wxMessageOutputDebug::Output(const wxString& str)
 {
 
 void wxMessageOutputDebug::Output(const wxString& str)
 {

-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

     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"));


@@ -195,12 +195,14 @@ 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);
 
     // the native MSW msg box understands the TABs, others don't
 void wxMessageOutputMessageBox::Output(const wxString& str)
 {
     wxString out(str);
 
     // the native MSW msg box understands the TABs, others don't

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

     out.Replace(wxT("\t"), wxT("        "));
 #endif
 
     out.Replace(wxT("\t"), wxT("        "));
 #endif