Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warning fix for wxUSE_LOG off.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-04-05 15:11:44 +00:00
parent 8add533eb2
commit 339360262a
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/wx/log.h
View File

@@ -441,25 +441,31 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
#define DECLARE_LOG_FUNCTION(level) \ #define DECLARE_LOG_FUNCTION(level) \
extern void WXDLLIMPEXP_BASE wxVLog##level(const wxChar *szFormat, \ extern void WXDLLIMPEXP_BASE wxVLog##level(const wxChar *szFormat, \
va_list argptr); \ va_list argptr); \
extern void WXDLLIMPEXP_BASE wxLog##level(const wxChar *szFormat, \ extern void WXDLLIMPEXP_BASE wxLog##level(const wxChar *szFormat, \
...) ATTRIBUTE_PRINTF_1 ...) ATTRIBUTE_PRINTF_1
#define DECLARE_LOG_FUNCTION2_EXP(level, arg, expdecl) \ #define DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, expdecl) \
extern void expdecl wxVLog##level(arg, const wxChar *szFormat, \ extern void expdecl wxVLog##level(argclass arg, \
va_list argptr); \ const wxChar *szFormat, \
extern void expdecl wxLog##level(arg, const wxChar *szFormat, \ va_list argptr); \
...) ATTRIBUTE_PRINTF_2 extern void expdecl wxLog##level(argclass arg, \
const wxChar *szFormat, \
...) ATTRIBUTE_PRINTF_2
#else // !wxUSE_LOG #else // !wxUSE_LOG
// log functions do nothing at all // log functions do nothing at all
#define DECLARE_LOG_FUNCTION(level) \ #define DECLARE_LOG_FUNCTION(level) \
inline void wxVLog##level(const wxChar *szFormat, \ inline void wxVLog##level(const wxChar *WXUNUSED(szFormat), \
va_list argptr) { } \ va_list WXUNUSED(argptr)) { } \
inline void wxLog##level(const wxChar *szFormat, ...) { } inline void wxLog##level(const wxChar *WXUNUSED(szFormat), \
#define DECLARE_LOG_FUNCTION2_EXP(level, arg, expdecl) \ ...) { }
inline void wxVLog##level(arg, const wxChar *szFormat, \ #define DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, expdecl) \
va_list argptr) {} \ inline void wxVLog##level(argclass WXUNUSED(arg), \
inline void wxLog##level(arg, const wxChar *szFormat, ...) { } const wxChar *WXUNUSED(szFormat), \
va_list WXUNUSED(argptr)) {} \
inline void wxLog##level(argclass WXUNUSED(arg), \
const wxChar *WXUNUSED(szFormat), \
...) { }
// Empty Class to fake wxLogNull // Empty Class to fake wxLogNull
class WXDLLIMPEXP_BASE wxLogNull class WXDLLIMPEXP_BASE wxLogNull
@@ -476,12 +482,12 @@ public:
#define wxTRACE_OleCalls wxEmptyString // OLE interface calls #define wxTRACE_OleCalls wxEmptyString // OLE interface calls
#endif // wxUSE_LOG/!wxUSE_LOG #endif // wxUSE_LOG/!wxUSE_LOG
#define DECLARE_LOG_FUNCTION2(level, arg) \ #define DECLARE_LOG_FUNCTION2(level, argclass, arg) \
DECLARE_LOG_FUNCTION2_EXP(level, arg, WXDLLIMPEXP_BASE) DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, WXDLLIMPEXP_BASE)
// a generic function for all levels (level is passes as parameter) // a generic function for all levels (level is passes as parameter)
DECLARE_LOG_FUNCTION2(Generic, wxLogLevel level); DECLARE_LOG_FUNCTION2(Generic, wxLogLevel, level);
// one function per each level // one function per each level
DECLARE_LOG_FUNCTION(FatalError); DECLARE_LOG_FUNCTION(FatalError);
@@ -499,7 +505,7 @@ DECLARE_LOG_FUNCTION(Status);
// this one is the same as previous except that it allows to explicitly // this one is the same as previous except that it allows to explicitly
class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxFrame;
// specify the frame to which the output should go // specify the frame to which the output should go
DECLARE_LOG_FUNCTION2_EXP(Status, wxFrame *pFrame, WXDLLIMPEXP_CORE); DECLARE_LOG_FUNCTION2_EXP(Status, wxFrame *, pFrame, WXDLLIMPEXP_CORE);
#endif // wxUSE_GUI #endif // wxUSE_GUI
// additional one: as wxLogError, but also logs last system call error code // additional one: as wxLogError, but also logs last system call error code
@@ -508,7 +514,7 @@ DECLARE_LOG_FUNCTION(SysError);
// and another one which also takes the error code (for those broken APIs // and another one which also takes the error code (for those broken APIs
// that don't set the errno (like registry APIs in Win32)) // that don't set the errno (like registry APIs in Win32))
DECLARE_LOG_FUNCTION2(SysError, long lErrCode); DECLARE_LOG_FUNCTION2(SysError, long, lErrCode);
// debug functions do nothing in release mode // debug functions do nothing in release mode
#if wxUSE_LOG_DEBUG #if wxUSE_LOG_DEBUG
@@ -520,12 +526,12 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
// this version only logs the message if the mask had been added to the // this version only logs the message if the mask had been added to the
// list of masks with AddTraceMask() // list of masks with AddTraceMask()
DECLARE_LOG_FUNCTION2(Trace, const wxChar *mask); DECLARE_LOG_FUNCTION2(Trace, const wxChar *, mask);
// and this one does nothing if all of level bits are not set in // and this one does nothing if all of level bits are not set in
// wxLog::GetActive()->GetTraceMask() -- it's deprecated in favour of // wxLog::GetActive()->GetTraceMask() -- it's deprecated in favour of
// string identifiers // string identifiers
DECLARE_LOG_FUNCTION2(Trace, wxTraceMask mask); DECLARE_LOG_FUNCTION2(Trace, wxTraceMask, mask);
#else //!debug #else //!debug
// these functions do nothing in release builds // these functions do nothing in release builds
inline void wxVLogDebug(const wxChar *, va_list) { } inline void wxVLogDebug(const wxChar *, va_list) { }