fixes for user dash handling (patch 717736)

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 81ab68239bb4e0ff2d5291b4a8e31e9d0c82d541..02b83693bfc8bbc3f2dfc6ed0fdff2b76a8b616d 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -65,6 +65,11 @@
   #include  "wx/mac/private.h"  // includes mac headers
 #endif
 
   #include  "wx/mac/private.h"  // includes mac headers
 #endif
 

+#if defined(__MWERKS__) && wxUSE_UNICODE
+    #include <wtime.h>
+#endif
+
+

 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------


@@ -717,9 +722,8 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
 #if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
     Str255 pstr ;
 
 #if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
     Str255 pstr ;

-    strcpy( (char*) pstr , str.c_str() ) ;
-    strcat( (char*) pstr , ";g" ) ;
-    c2pstr( (char*) pstr ) ;
+    wxString output = str + wxT(";g") ;
+    wxMacStringToPascal( output.c_str() , pstr ) ;

 
     Boolean running = false ;
 
 
     Boolean running = false ;