#ifdefed out Ole... functions for Cygwin.

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index fb2b01148f97db78ee25275dbe14619e1d3247ba..52e44a77e182b1828c3a00529350481d896bd714 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -52,6 +52,8 @@
 
 #ifdef  __WXMSW__
   #include  <windows.h>
 
 #ifdef  __WXMSW__
   #include  <windows.h>

+  // Redefines OutputDebugString if necessary
+  #include  "wx/msw/private.h"

 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix
 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix


@@ -256,6 +258,8 @@ wxLog *wxLog::GetActiveTarget()
         // ask the application to create a log target for us
         if ( wxTheApp != NULL )
           ms_pLogger = wxTheApp->CreateLogTarget();
         // ask the application to create a log target for us
         if ( wxTheApp != NULL )
           ms_pLogger = wxTheApp->CreateLogTarget();

+        else
+          ms_pLogger = new wxLogStderr;

       #endif
 
       s_bInGetActiveTarget = FALSE;
       #endif
 
       s_bInGetActiveTarget = FALSE;


@@ -338,8 +342,11 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
     case wxLOG_Trace:
     case wxLOG_Debug:
       #ifdef __WXDEBUG__
     case wxLOG_Trace:
     case wxLOG_Debug:
       #ifdef __WXDEBUG__

-        DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
-                        << ": " << szString);
+      //        DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
+      //                        << ": " << szString);
+      // JACS: we don't really want to prefix with 'Debug'. It's just extra
+      // verbiage.
+              DoLogString(szString);

       #endif
 
       break;
       #endif
 
       break;


@@ -500,18 +507,22 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
         {
           wxString strTime = TimeStamp();
 
         {
           wxString strTime = TimeStamp();
 

-          #if (defined(__WIN32__) || defined(__WIN16__)) && !defined(__WXSTUBS__)
+          #ifdef __WXMSW__

               // don't prepend debug/trace here: it goes to the debug window
               // anyhow, but do put a timestamp
               OutputDebugString(strTime + szString + "\n\r");
               // don't prepend debug/trace here: it goes to the debug window
               // anyhow, but do put a timestamp
               OutputDebugString(strTime + szString + "\n\r");

-          #else   //!WIN32
+          #else  

             // send them to stderr
             // send them to stderr

+    /*

             fprintf(stderr, "%s %s: %s\n",
                     strTime.c_str(),
                     level == wxLOG_Trace ? _("Trace") : _("Debug"),
                     szString);
             fprintf(stderr, "%s %s: %s\n",
                     strTime.c_str(),
                     level == wxLOG_Trace ? _("Trace") : _("Debug"),
                     szString);

+     */
+            fprintf(stderr, "%s\n",
+                    szString);

             fflush(stderr);
             fflush(stderr);

-          #endif  // WIN32
+          #endif

         }
       #endif
       break;
         }
       #endif
       break;