wxAcceleratorEntry::MatchesEvent is NOT used by wxX11

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

diff --git a/include/wx/log.h b/include/wx/log.h
index 006e8a467262b9d8bc3b896eb524c9d7a715e1c0..edbddebb630616f40b198fde3b15e3fd4f291bf4 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -103,6 +103,12 @@ public:
     // ctor
     wxLog();
 
     // ctor
     wxLog();
 

+    // Internal buffer.
+        // Allow replacement of the fixed size static buffer with
+        // a user allocated one.  Pass in NULL to restore the
+        // built in static buffer.
+    static wxChar *SetLogBuffer( wxChar *buf, size_t size = 0 );
+

     // these functions allow to completely disable all log messages
         // is logging disabled now?
     static bool IsEnabled() { return ms_doLog; }
     // these functions allow to completely disable all log messages
         // is logging disabled now?
     static bool IsEnabled() { return ms_doLog; }


@@ -475,11 +481,11 @@ WXDLLEXPORT const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
 // -------------------
 
 #define DECLARE_LOG_FUNCTION(level)                                 \
 // -------------------
 
 #define DECLARE_LOG_FUNCTION(level)                                 \

-extern void WXDLLEXPORT wxLog##level(const wxChar *szFormat,        \
+extern void WXDLLEXPORT wxVLog##level(const wxChar *szFormat,       \

                                       va_list argptr);              \
 extern void WXDLLEXPORT wxLog##level(const wxChar *szFormat, ...)
 #define DECLARE_LOG_FUNCTION2(level, arg1)                          \
                                       va_list argptr);              \
 extern void WXDLLEXPORT wxLog##level(const wxChar *szFormat, ...)
 #define DECLARE_LOG_FUNCTION2(level, arg1)                          \

-extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat,  \
+extern void WXDLLEXPORT wxVLog##level(arg1, const wxChar *szFormat, \

                                       va_list argptr);              \
 extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...)
 
                                       va_list argptr);              \
 extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...)
 


@@ -487,11 +493,11 @@ extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...)
 
 // log functions do nothing at all
 #define DECLARE_LOG_FUNCTION(level)                                 \
 
 // log functions do nothing at all
 #define DECLARE_LOG_FUNCTION(level)                                 \

-inline void WXDLLEXPORT wxLog##level(const wxChar *szFormat,        \
+inline void WXDLLEXPORT wxVLog##level(const wxChar *szFormat,       \

                                      va_list argptr) {}             \
 inline void WXDLLEXPORT wxLog##level(const wxChar *szFormat, ...) {}
 #define DECLARE_LOG_FUNCTION2(level, arg1)                          \
                                      va_list argptr) {}             \
 inline void WXDLLEXPORT wxLog##level(const wxChar *szFormat, ...) {}
 #define DECLARE_LOG_FUNCTION2(level, arg1)                          \

-inline void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat,  \
+inline void WXDLLEXPORT wxVLog##level(arg1, const wxChar *szFormat, \

                                      va_list argptr) {}             \
 inline void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...) {}
 
                                      va_list argptr) {}             \
 inline void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...) {}
 


@@ -541,13 +547,13 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
     DECLARE_LOG_FUNCTION2(Trace, wxTraceMask mask);
 #else   //!debug
     // these functions do nothing in release builds
     DECLARE_LOG_FUNCTION2(Trace, wxTraceMask mask);
 #else   //!debug
     // these functions do nothing in release builds

-    inline void wxLogDebug(const wxChar *, va_list) { }
+    inline void wxVLogDebug(const wxChar *, va_list) { }

     inline void wxLogDebug(const wxChar *, ...) { }
     inline void wxLogDebug(const wxChar *, ...) { }

-    inline void wxLogTrace(const wxChar *, va_list) { }
+    inline void wxVLogTrace(const wxChar *, va_list) { }

     inline void wxLogTrace(const wxChar *, ...) { }
     inline void wxLogTrace(const wxChar *, ...) { }

-    inline void wxLogTrace(wxTraceMask, const wxChar *, va_list) { }
+    inline void wxVLogTrace(wxTraceMask, const wxChar *, va_list) { }

     inline void wxLogTrace(wxTraceMask, const wxChar *, ...) { }
     inline void wxLogTrace(wxTraceMask, const wxChar *, ...) { }

-    inline void wxLogTrace(const wxChar *, const wxChar *, va_list) { }
+    inline void wxVLogTrace(const wxChar *, const wxChar *, va_list) { }

     inline void wxLogTrace(const wxChar *, const wxChar *, ...) { }
 #endif // debug/!debug
 
     inline void wxLogTrace(const wxChar *, const wxChar *, ...) { }
 #endif // debug/!debug
 


@@ -579,3 +585,5 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
 #endif  //debug/!debug
 
 #endif  // _WX_LOG_H_
 #endif  //debug/!debug
 
 #endif  // _WX_LOG_H_

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