X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b94d99978a9b42cc6aa8454ed64d239189879f1..2d6c58d653b8f61eae0cc439fa7b4511fd1cf477:/include/wx/log.h?ds=sidebyside diff --git a/include/wx/log.h b/include/wx/log.h index 44266ab80e..f4b5163c2b 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -12,7 +12,7 @@ #ifndef _WX_LOG_H_ #define _WX_LOG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "log.h" #endif @@ -40,7 +40,9 @@ typedef unsigned long wxLogLevel; #if wxUSE_LOG +#ifndef __WXWINCE__ #include // for time_t +#endif #include "wx/dynarray.h" @@ -177,6 +179,8 @@ public: 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 @@ -596,3 +600,4 @@ void WXDLLEXPORT wxSafeShowMessage(const wxString& title, const wxString& text); #endif // _WX_LOG_H_ +// vi:sts=4:sw=4:et