VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / generic / logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index bf9af38c4867411da5cddae62569ea8da4c0ba7d..c38a09de2700549ff203c43fa804ac655615f086 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -45,6 +45,11 @@
 #include "wx/file.h"
 #include "wx/textfile.h"
 
 #include "wx/file.h"
 #include "wx/textfile.h"
 

+#ifdef  __WXMSW__
+  // for OutputDebugString()
+  #include  "wx/msw/private.h"
+#endif // Windows
+

 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------


@@ -94,7 +99,7 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString msg;
     TimeStamp(&msg);
 {
     wxString msg;
     TimeStamp(&msg);

-    msg << szString << T('\n');
+    msg << szString << wxT('\n');

 
     m_pTextCtrl->AppendText(msg);
 }
 
     m_pTextCtrl->AppendText(msg);
 }


@@ -138,7 +143,7 @@ void wxLogGui::Flush()
         if ( nLines > 25 )  // don't put too many lines in message box
             break;
 
         if ( nLines > 25 )  // don't put too many lines in message box
             break;
 

-        str << m_aMessages[n - 1] << T("\n");
+        str << m_aMessages[n - 1] << wxT("\n");

     }
 
     const wxChar *title;
     }
 
     const wxChar *title;


@@ -208,13 +213,13 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
                         // debug window anyhow, but do put a timestamp
                         wxString str;
                         TimeStamp(&str);
                         // debug window anyhow, but do put a timestamp
                         wxString str;
                         TimeStamp(&str);

-                        str << szString << T("\n\r");
+                        str << szString << wxT("\n\r");

                         OutputDebugString(str);
                     #else
                         // send them to stderr
                         OutputDebugString(str);
                     #else
                         // send them to stderr

-                        wxFprintf(stderr, T("%s: %s\n"),
-                                  level == wxLOG_Trace ? T("Trace")
-                                                       : T("Debug"),
+                        wxFprintf(stderr, wxT("%s: %s\n"),
+                                  level == wxLOG_Trace ? wxT("Trace")
+                                                       : wxT("Debug"),

                                   szString);
                         fflush(stderr);
                     #endif
                                   szString);
                         fflush(stderr);
                     #endif


@@ -351,7 +356,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {
     // get the file name
     // -----------------
 {
     // get the file name
     // -----------------

-    const wxChar *szFileName = wxSaveFileSelector(T("log"), T("txt"), T("log.txt"));
+    const wxChar *szFileName = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"));

     if ( szFileName == NULL ) {
         // cancelled
         return;
     if ( szFileName == NULL ) {
         // cancelled
         return;


@@ -511,7 +516,7 @@ void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
     wxString msg;
     TimeStamp(&msg);
 
     wxString msg;
     TimeStamp(&msg);

-    msg << szString << T('\n');
+    msg << szString << wxT('\n');

 
     pText->AppendText(msg);
 
 
     pText->AppendText(msg);