implemented wxSS::GetMetric on wxGTK2 (patch 950618)

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

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 2ebef597da0fd1325764ad5a4978dc593e6d3c19..d24514d7c3c71994e30fd8912b79f0ba489effd5 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -6,7 +6,7 @@
 // Created:     17.07.02
 // RCS-ID:      $Id$
 // Copyright:   (c) the wxWidgets team
 // Created:     17.07.02
 // RCS-ID:      $Id$
 // Copyright:   (c) the wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -122,7 +122,8 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out);
     out.Replace(wxT("\t"), wxT("        "));
     out.Replace(wxT("\n"), wxT("\r\n"));
     ::OutputDebugString(out);

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
+#elif defined(__WXMAC__) 
+#if !defined(__DARWIN__)

     if ( wxIsDebuggerRunning() )
     {
         Str255 pstr;
     if ( wxIsDebuggerRunning() )
     {
         Str255 pstr;


@@ -135,6 +136,12 @@ void wxMessageOutputDebug::Printf(const wxChar* format, ...)
             SysBreakStr(pstr);
         #endif
     }
             SysBreakStr(pstr);
         #endif
     }

+#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);
 #else // !MSW, !Mac
     // FIXME: why is wxFputs() not defined under Linux?
     fputs(out.mb_str(), stderr);