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 0f30a9e562502016902a98b240dc1bed1d8e2ef3..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
 


@@ -112,23 +114,9 @@ static inline bool IsLoggingEnabled()
 // generic log function
 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {
 // generic log function
 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {

-<<<<<<< log.cpp
-  if ( wxLog::GetActiveTarget() != NULL ) {
-    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
-
-    va_list argptr;
-    va_start(argptr, szFormat);
-    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
-    va_end(argptr);
-=======

     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);

->>>>>>> 1.93.2.3

 
 

-<<<<<<< log.cpp
-    wxLog::OnLog(level, s_szBuf, time(NULL));
-  }
-=======

         va_list argptr;
         va_start(argptr, szFormat);
         wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
         va_list argptr;
         va_start(argptr, szFormat);
         wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);


@@ -136,7 +124,6 @@ void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 
         wxLog::OnLog(level, s_szBuf, time(NULL));
     }
 
         wxLog::OnLog(level, s_szBuf, time(NULL));
     }

->>>>>>> 1.93.2.3

 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                               \
 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                               \


@@ -338,6 +325,16 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
     return pOldLogger;
 }
 
     return pOldLogger;
 }
 

+void wxLog::DontCreateOnDemand()
+{
+    ms_bAutoCreate = FALSE;
+
+    // this is usually called at the end of the program and we assume that it
+    // is *always* called at the end - so we free memory here to avoid false
+    // memory leak reports from wxWin  memory tracking code
+    ClearTraceMasks();
+}
+

 void wxLog::RemoveTraceMask(const wxString& str)
 {
     int index = ms_aTraceMasks.Index(str);
 void wxLog::RemoveTraceMask(const wxString& str)
 {
     int index = ms_aTraceMasks.Index(str);


@@ -345,6 +342,11 @@ void wxLog::RemoveTraceMask(const wxString& str)
         ms_aTraceMasks.Remove((size_t)index);
 }
 
         ms_aTraceMasks.Remove((size_t)index);
 }
 

+void wxLog::ClearTraceMasks()
+{
+    ms_aTraceMasks.Clear();
+}
+

 void wxLog::TimeStamp(wxString *str)
 {
     if ( ms_timestamp )
 void wxLog::TimeStamp(wxString *str)
 {
     if ( ms_timestamp )


@@ -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


@@ -556,10 +558,10 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM

-wxLogStream::wxLogStream(ostream *ostr)
+wxLogStream::wxLogStream(wxSTD ostream *ostr)

 {
     if ( ostr == NULL )
 {
     if ( ostr == NULL )

-        m_ostr = &cerr;
+        m_ostr = &wxSTD cerr;

     else
         m_ostr = ostr;
 }
     else
         m_ostr = ostr;
 }


@@ -568,7 +570,7 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
     TimeStamp(&str);
 {
     wxString str;
     TimeStamp(&str);

-    (*m_ostr) << str << wxConvertWX2MB(szString) << endl;
+    (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl;

 }
 #endif // wxUSE_STD_IOSTREAM
 
 }
 #endif // wxUSE_STD_IOSTREAM
 


@@ -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];
 


@@ -705,10 +707,16 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 
 #ifdef  __WXDEBUG__
 
 
 #ifdef  __WXDEBUG__
 

+// wxASSERT() helper
+bool wxAssertIsEqual(int x, int y)
+{
+    return x == y;
+}
+

 // break into the debugger
 // break into the debugger

-void Trap()
+void wxTrap()

 {
 {

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

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


@@ -732,7 +740,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
     if ( s_bInAssert ) {
         // He-e-e-e-elp!! we're trapped in endless loop
 
     if ( s_bInAssert ) {
         // He-e-e-e-elp!! we're trapped in endless loop

-        Trap();
+        wxTrap();

 
         s_bInAssert = FALSE;
 
 
         s_bInAssert = FALSE;
 


@@ -766,18 +774,18 @@ 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:

-                Trap();
+                wxTrap();

                 break;
 
             case IDCANCEL:
                 break;
 
             case IDCANCEL:


@@ -790,7 +798,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
         switch ( wxMessageBox(szBuf, wxT("Debug"),
                               wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
             case wxYES:
         switch ( wxMessageBox(szBuf, wxT("Debug"),
                               wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
             case wxYES:

-                Trap();
+                wxTrap();

                 break;
 
             case wxCANCEL:
                 break;
 
             case wxCANCEL:


@@ -802,7 +810,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 #endif // GUI or MSW
 
 #else // !GUI
 #endif // GUI or MSW
 
 #else // !GUI

-        Trap();
+        wxTrap();

 #endif // GUI/!GUI
     }
 
 #endif // GUI/!GUI
     }