Remove (Open)Watcom support.
This compiler is not being developed since several years and almost certainly can't be used to build the current wxWidgets sources anyhow, so remove all support for it, including a lot of extremely ugly workarounds for its bugs with template functions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
36666a975f
commit
49b8d79c87
199 changed files with 115 additions and 50897 deletions
112
include/wx/log.h
112
include/wx/log.h
|
|
@ -1018,89 +1018,6 @@ public:
|
|||
)
|
||||
#endif // WXWIN_COMPATIBILITY_2_8
|
||||
|
||||
#ifdef __WATCOMC__
|
||||
// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
1, (const wxString&),
|
||||
(wxFormatString(f1)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
1, (const wxCStrData&),
|
||||
(wxFormatString(f1)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
1, (const char*),
|
||||
(wxFormatString(f1)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
1, (const wchar_t*),
|
||||
(wxFormatString(f1)))
|
||||
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
2, (long, const wxString&),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
2, (long, const wxCStrData&),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
2, (long, const char *),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
2, (long, const wchar_t *),
|
||||
(f1, wxFormatString(f2)))
|
||||
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
2, (wxObject *, const wxString&),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
2, (wxObject *, const wxCStrData&),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
2, (wxObject *, const char *),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, Log,
|
||||
2, (wxObject *, const wchar_t *),
|
||||
(f1, wxFormatString(f2)))
|
||||
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, LogAtLevel,
|
||||
2, (wxLogLevel, const wxString&),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, LogAtLevel,
|
||||
2, (wxLogLevel, const wxCStrData&),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, LogAtLevel,
|
||||
2, (wxLogLevel, const char *),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, LogAtLevel,
|
||||
2, (wxLogLevel, const wchar_t *),
|
||||
(f1, wxFormatString(f2)))
|
||||
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
|
||||
2, (const wxString&, const wxString&),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
|
||||
2, (const wxString&, const wxCStrData&),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
|
||||
2, (const wxString&, const char *),
|
||||
(f1, wxFormatString(f2)))
|
||||
WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
|
||||
2, (const wxString&, const wchar_t *),
|
||||
(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__
|
||||
|
||||
private:
|
||||
#if !wxUSE_UTF8_LOCALE_ONLY
|
||||
void DoLog(const wxChar *format, ...)
|
||||
|
|
@ -1441,34 +1358,14 @@ WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
|
|||
#undef wxUSE_LOG_TRACE
|
||||
#define wxUSE_LOG_TRACE 0
|
||||
|
||||
#if defined(__WATCOMC__) || defined(__MINGW32__)
|
||||
// Mingw has similar problem with wxLogSysError:
|
||||
#define WX_WATCOM_OR_MINGW_ONLY_CODE( x ) x
|
||||
#else
|
||||
#define WX_WATCOM_OR_MINGW_ONLY_CODE( x )
|
||||
#endif
|
||||
|
||||
// define macros for defining log functions which do nothing at all
|
||||
//
|
||||
// WX_WATCOM_ONLY_CODE is needed to work around
|
||||
// http://bugzilla.openwatcom.org/show_bug.cgi?id=351
|
||||
#define wxDEFINE_EMPTY_LOG_FUNCTION(level) \
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wxFormatString&)) \
|
||||
WX_WATCOM_ONLY_CODE( \
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const char*)) \
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wchar_t*)) \
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wxCStrData&)) \
|
||||
) \
|
||||
inline void wxVLog##level(const wxFormatString& WXUNUSED(format), \
|
||||
va_list WXUNUSED(argptr)) { } \
|
||||
|
||||
#define wxDEFINE_EMPTY_LOG_FUNCTION2(level, argclass) \
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wxFormatString&)) \
|
||||
WX_WATCOM_OR_MINGW_ONLY_CODE( \
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const char*)) \
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wchar_t*)) \
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wxCStrData&)) \
|
||||
) \
|
||||
inline void wxVLog##level(argclass WXUNUSED(arg), \
|
||||
const wxFormatString& WXUNUSED(format), \
|
||||
va_list WXUNUSED(argptr)) {}
|
||||
|
|
@ -1562,11 +1459,6 @@ public:
|
|||
WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (wxTraceMask, const wxFormatString&))
|
||||
#endif
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wxString&, const wxFormatString&))
|
||||
#ifdef __WATCOMC__
|
||||
// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const char*, const char*))
|
||||
WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wchar_t*, const wchar_t*))
|
||||
#endif
|
||||
#endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS
|
||||
#endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE
|
||||
|
||||
|
|
@ -1607,10 +1499,6 @@ wxSafeShowMessage(const wxString& title, const wxString& text);
|
|||
#include "wx/cocoa/log.h"
|
||||
#endif
|
||||
|
||||
#ifdef WX_WATCOM_ONLY_CODE
|
||||
#undef WX_WATCOM_ONLY_CODE
|
||||
#endif
|
||||
|
||||
// macro which disables debug logging in release builds: this is done by
|
||||
// default by wxIMPLEMENT_APP() so usually it doesn't need to be used explicitly
|
||||
#if defined(NDEBUG) && wxUSE_LOG_DEBUG
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue