The size_type typedef must be public.

[wxWidgets.git] / include / wx / log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index 44266ab80e35ecc967c4a15dff898c9b55a064e4..f4b5163c2bd897661a4f93e65f7df4b2ff603453 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -12,7 +12,7 @@
 #ifndef   _WX_LOG_H_
 #define   _WX_LOG_H_
 
 #ifndef   _WX_LOG_H_
 #define   _WX_LOG_H_
 

-#ifdef  __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "log.h"
 #endif
 
     #pragma interface "log.h"
 #endif
 


@@ -40,7 +40,9 @@ typedef unsigned long wxLogLevel;
 
 #if wxUSE_LOG
 
 
 #if wxUSE_LOG
 

+#ifndef __WXWINCE__

 #include <time.h>   // for time_t
 #include <time.h>   // for time_t

+#endif

 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 


@@ -177,6 +179,8 @@ public:
     static void RemoveTraceMask(const wxString& str);
         // remove all string trace masks
     static void ClearTraceMasks();
     static void RemoveTraceMask(const wxString& str);
         // remove all string trace masks
     static void ClearTraceMasks();

+       // get string trace masks
+    static const wxArrayString &GetTraceMasks() { return ms_aTraceMasks; }

 
         // sets the timestamp string: this is used as strftime() format string
         // for the log targets which add time stamps to the messages - set it
 
         // sets the timestamp string: this is used as strftime() format string
         // for the log targets which add time stamps to the messages - set it


@@ -596,3 +600,4 @@ void WXDLLEXPORT wxSafeShowMessage(const wxString& title, const wxString& text);
 
 #endif  // _WX_LOG_H_
 
 
 #endif  // _WX_LOG_H_
 

+// vi:sts=4:sw=4:et