Remove MSVC6 support.
Don't support this compiler any more, this allows to get rid of tons of MSVC6-specific workarounds, in particular we can now use Bind() and natural template functions calls in the library code. Also remove MSVC6 project and solution files and don't generate them when bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj from the bakefiles results in weird bake-time errors, so it's simpler to just leave them there). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -152,16 +152,14 @@ name##PluginSentinel m_pluginsentinel
|
||||
#define wxDynamicCastThis(className) \
|
||||
(IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)
|
||||
|
||||
// FIXME-VC6: dummy argument needed because VC6 doesn't support explicitly
|
||||
// choosing the template function to call
|
||||
template <class T>
|
||||
inline T *wxCheckCast(const void *ptr, T * = NULL)
|
||||
inline T *wxCheckCast(const void *ptr)
|
||||
{
|
||||
wxASSERT_MSG( wxDynamicCast(ptr, T), "wxStaticCast() used incorrectly" );
|
||||
return const_cast<T *>(static_cast<const T *>(ptr));
|
||||
}
|
||||
|
||||
#define wxStaticCast(obj, className) wxCheckCast((obj), (className *)NULL)
|
||||
#define wxStaticCast(obj, className) wxCheckCast<className>(obj)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// set up memory debugging macros
|
||||
@@ -194,8 +192,7 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
|
||||
#define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
|
||||
#endif
|
||||
|
||||
// Only VC++ 6 gets overloaded delete that matches new
|
||||
#if (defined(__VISUALC__) && (__VISUALC__ >= 1200))
|
||||
#if defined(__VISUALC__)
|
||||
#define _WX_WANT_DELETE_VOID_WXCHAR_INT
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user