don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/log.h b/include/wx/log.h
index d948772c244d9e2717dc954c8faae71dd8453ffb..88b6475240d41708ece92078833dca82bad2942c 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -230,7 +230,7 @@ public:
     // return the current loglevel limit
     static wxLogLevel GetLogLevel() { return ms_logLevel; }
 
     // return the current loglevel limit
     static wxLogLevel GetLogLevel() { return ms_logLevel; }
 

-    // get the current timestamp format string (may be NULL)
+    // get the current timestamp format string (maybe empty)

     static const wxString& GetTimestamp() { return ms_timestamp; }
 
 
     static const wxString& GetTimestamp() { return ms_timestamp; }
 
 


@@ -347,7 +347,7 @@ private:
 
     static size_t      ms_suspendCount; // if positive, logs are not flushed
 
 
     static size_t      ms_suspendCount; // if positive, logs are not flushed
 

-    // format string for strftime(), if NULL, time stamping log messages is
+    // format string for strftime(), if empty, time stamping log messages is

     // disabled
     static wxString    ms_timestamp;
 
     // disabled
     static wxString    ms_timestamp;
 


@@ -705,6 +705,7 @@ public:
 // VC6 produces a warning if we a macro expanding to nothing to
 // DECLARE_LOG_FUNCTION2:
 #if defined(__VISUALC__) && __VISUALC__ < 1300
 // VC6 produces a warning if we a macro expanding to nothing to
 // DECLARE_LOG_FUNCTION2:
 #if defined(__VISUALC__) && __VISUALC__ < 1300

+    #pragma warning(push)

     // "not enough actual parameters for macro 'DECLARE_LOG_FUNCTION2_EXP'"
     #pragma warning(disable:4003)
 #endif
     // "not enough actual parameters for macro 'DECLARE_LOG_FUNCTION2_EXP'"
     #pragma warning(disable:4003)
 #endif


@@ -818,7 +819,7 @@ DECLARE_LOG_FUNCTION2(SysError, unsigned long, lErrCode);
 #endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE
 
 #if defined(__VISUALC__) && __VISUALC__ < 1300
 #endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE
 
 #if defined(__VISUALC__) && __VISUALC__ < 1300

-    #pragma warning(default:4003)
+    #pragma warning(pop)

 #endif
 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,
 #endif
 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,