make it possible to use wxToolBarSimple as wxToolBar with wxUniv

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 4ee9687b9f421527eba4c5d1134941ba188078d4..03838b73d743a2527378cd6a9746af83e61f4c41 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -57,9 +57,11 @@
 #include  <stdlib.h>
 #include  <time.h>
 
 #include  <stdlib.h>
 #include  <time.h>
 

-#ifdef  __WXMSW__
+#if defined(__WXMSW__)

   #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
   #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString

-#else   //Unix
+#endif
+
+#if !defined(__WXMSW__) || defined(__WXMICROWIN__)

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


@@ -513,7 +515,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
     // under Windows, programs usually don't have stderr at all, so show the
     // messages also under debugger - unless it's a console program
 
     // under Windows, programs usually don't have stderr at all, so show the
     // messages also under debugger - unless it's a console program

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

     str += wxT("\r\n") ;
     OutputDebugString(str.c_str());
 #endif // MSW
     str += wxT("\r\n") ;
     OutputDebugString(str.c_str());
 #endif // MSW


@@ -639,7 +641,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 // get error code from syste
 unsigned long wxSysErrorCode()
 {
 // get error code from syste
 unsigned long wxSysErrorCode()
 {

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

 #ifdef  __WIN32__
     return ::GetLastError();
 #else   //WIN16
 #ifdef  __WIN32__
     return ::GetLastError();
 #else   //WIN16


@@ -657,7 +659,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
     if ( nErrCode == 0 )
         nErrCode = wxSysErrorCode();
 
     if ( nErrCode == 0 )
         nErrCode = wxSysErrorCode();
 

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

 #ifdef  __WIN32__
     static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
 
 #ifdef  __WIN32__
     static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
 


@@ -714,7 +716,7 @@ bool wxAssertIsEqual(int x, int y)
 // break into the debugger
 void wxTrap()
 {
 // break into the debugger
 void wxTrap()
 {

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

     DebugBreak();
 #elif defined(__WXMAC__)
 #if __powerc
     DebugBreak();
 #elif defined(__WXMAC__)
 #if __powerc


@@ -772,14 +774,14 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         // send it to the normal log destination
         wxLogDebug(szBuf);
 
         // send it to the normal log destination
         wxLogDebug(szBuf);
 

-#if wxUSE_GUI || defined(__WXMSW__)
+#if (wxUSE_GUI && wxUSE_MSGDLG) || defined(__WXMSW__)

         // this message is intentionally not translated - it is for
         // developpers only
         wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings."));
 
         // use the native message box if available: this is more robust than
         // using our own
         // this message is intentionally not translated - it is for
         // developpers only
         wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings."));
 
         // use the native message box if available: this is more robust than
         // using our own

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

         switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
                               MB_YESNOCANCEL | MB_ICONSTOP ) ) {
             case IDYES:
         switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
                               MB_YESNOCANCEL | MB_ICONSTOP ) ) {
             case IDYES: