X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67393addd823ea1a9b653a93c8554e7fd013ecfa..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/log.h diff --git a/include/wx/log.h b/include/wx/log.h index 4561205cbe..229380c94c 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -81,7 +81,7 @@ typedef unsigned long wxLogLevel; // ---------------------------------------------------------------------------- // different standard log levels (you may also define your own) -enum +enum wxLogLevelValues { wxLOG_FatalError, // program can't continue, abort immediately wxLOG_Error, // a serious error, user must be informed about it @@ -539,6 +539,12 @@ public: #define DECLARE_LOG_FUNCTION2(level, argclass, arg) \ DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, WXDLLIMPEXP_BASE) +// VC6 produces a warning if we a macro expanding to nothing to +// DECLARE_LOG_FUNCTION2_IMPL: +#if defined(__VISUALC__) && __VISUALC__ < 1300 + // "not enough actual parameters for macro 'DECLARE_LOG_FUNCTION2_EXP_IMPL'" + #pragma warning(disable:4003) +#endif // a generic function for all levels (level is passes as parameter) DECLARE_LOG_FUNCTION2(Generic, wxLogLevel, level); @@ -562,7 +568,7 @@ DECLARE_LOG_FUNCTION_IMPL(Status); DECLARE_LOG_FUNCTION2_EXP_IMPL(Status, wxFrame *, pFrame, WXDLLIMPEXP_CORE); #endif // wxUSE_GUI -DECLARE_LOG_FUNCTION_PUBLIC(Status); +DECLARE_LOG_FUNCTION_PUBLIC(Status) // additional one: as wxLogError, but also logs last system call error code // and the corresponding error message if available @@ -572,7 +578,7 @@ DECLARE_LOG_FUNCTION_IMPL(SysError); // that don't set the errno (like registry APIs in Win32)) DECLARE_LOG_FUNCTION2_IMPL(SysError, long, lErrCode); -DECLARE_LOG_FUNCTION_PUBLIC(SysError); +DECLARE_LOG_FUNCTION_PUBLIC(SysError) // debug functions do nothing in release mode #if wxUSE_LOG && wxUSE_LOG_DEBUG @@ -589,7 +595,7 @@ DECLARE_LOG_FUNCTION_PUBLIC(SysError); // wxLog::GetActive()->GetTraceMask() -- it's deprecated in favour of // string identifiers DECLARE_LOG_FUNCTION2_IMPL(Trace, wxTraceMask, mask); - DECLARE_LOG_FUNCTION_PUBLIC(Trace); + DECLARE_LOG_FUNCTION_PUBLIC(Trace) #else //!debug || !wxUSE_LOG // these functions do nothing in release builds, but don't define them as // nothing as it could result in different code structure in debug and @@ -620,6 +626,10 @@ DECLARE_LOG_FUNCTION_PUBLIC(SysError); #endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS #endif // debug/!debug +#if defined(__VISUALC__) && __VISUALC__ < 1300 + #pragma warning(default:4003) +#endif + // wxLogFatalError helper: show the (fatal) error to the user in a safe way, // i.e. without using wxMessageBox() for example because it could crash void WXDLLIMPEXP_BASE