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

implement wxLogTrace(wxTraceMask, format, ...) overload too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-07-09 20:30:27 +00:00
parent af58844636
commit ff2e9e2cc4
1 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
include/wx/log.h
View File

@@ -838,8 +838,8 @@ public:
) )
// special versions for wxLogTrace() which is passed either string or // special versions for wxLogTrace() which is passed either string or
// integer (TODO) mask as first argument determining whether the message // integer mask as first argument determining whether the message should be
// should be logged or not // logged or not
WX_DEFINE_VARARG_FUNC_VOID WX_DEFINE_VARARG_FUNC_VOID
( (
LogTrace, LogTrace,
@@ -847,6 +847,15 @@ public:
DoLogTrace, DoLogTraceUtf8 DoLogTrace, DoLogTraceUtf8
) )
#if WXWIN_COMPATIBILITY_2_8
WX_DEFINE_VARARG_FUNC_VOID
(
LogTrace,
2, (wxTraceMask, const wxFormatString&),
DoLogTraceMask, DoLogTraceMaskUtf8
)
#endif // WXWIN_COMPATIBILITY_2_8
#ifdef __WATCOMC__ #ifdef __WATCOMC__
// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351 // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
WX_VARARG_WATCOM_WORKAROUND(void, Log, WX_VARARG_WATCOM_WORKAROUND(void, Log,
@@ -913,6 +922,21 @@ public:
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace, WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
2, (const wxString&, const wchar_t *), 2, (const wxString&, const wchar_t *),
(f1, wxFormatString(f2))) (f1, wxFormatString(f2)))
#if WXWIN_COMPATIBILITY_2_8
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
2, (wxTraceMask, wxTraceMask),
(f1, wxFormatString(f2)))
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
2, (wxTraceMask, const wxCStrData&),
(f1, wxFormatString(f2)))
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
2, (wxTraceMask, const char *),
(f1, wxFormatString(f2)))
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
2, (wxTraceMask, const wchar_t *),
(f1, wxFormatString(f2)))
#endif // WXWIN_COMPATIBILITY_2_8
#endif // __WATCOMC__ #endif // __WATCOMC__
private: private:
@@ -968,6 +992,21 @@ private:
DoCallOnLog(format, argptr); DoCallOnLog(format, argptr);
va_end(argptr); va_end(argptr);
} }
#if WXWIN_COMPATIBILITY_2_8
void DoLogTraceMask(wxTraceMask mask, const wxChar *format, ...)
{
if ( (wxLog::GetTraceMask() & mask) != mask )
return;
Store(wxLOG_KEY_TRACE_MASK, mask);
va_list argptr;
va_start(argptr, format);
DoCallOnLog(format, argptr);
va_end(argptr);
}
#endif // WXWIN_COMPATIBILITY_2_8
#endif // !wxUSE_UTF8_LOCALE_ONLY #endif // !wxUSE_UTF8_LOCALE_ONLY
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_UTF8
@@ -1022,6 +1061,21 @@ private:
DoCallOnLog(format, argptr); DoCallOnLog(format, argptr);
va_end(argptr); va_end(argptr);
} }
#if WXWIN_COMPATIBILITY_2_8
void DoLogTraceMaskUtf8(wxTraceMask mask, const char *format, ...)
{
if ( (wxLog::GetTraceMask() & mask) != mask )
return;
Store(wxLOG_KEY_TRACE_MASK, mask);
va_list argptr;
va_start(argptr, format);
DoCallOnLog(format, argptr);
va_end(argptr);
}
#endif // WXWIN_COMPATIBILITY_2_8
#endif // wxUSE_UNICODE_UTF8 #endif // wxUSE_UNICODE_UTF8
void DoCallOnLog(wxLogLevel level, const wxString& format, va_list argptr) void DoCallOnLog(wxLogLevel level, const wxString& format, va_list argptr)