Remove MSVS 2003, a.k.a. MSVC 7, support from the code
It was probably not supported since quite some time anyhow, because wx own code uses CallAfter() which wouldn't compile with it, but now we can can get rid of wxHAS_CALL_AFTER checks too.
This commit is contained in:
@@ -35,10 +35,8 @@
|
|||||||
define special symbols for different VC version instead of writing tests
|
define special symbols for different VC version instead of writing tests
|
||||||
for magic numbers such as 1200, 1300 &c repeatedly
|
for magic numbers such as 1200, 1300 &c repeatedly
|
||||||
*/
|
*/
|
||||||
#if __VISUALC__ < 1300
|
#if __VISUALC__ < 1400
|
||||||
# error "This Visual C++ version is not supported any longer (at least MSVC 2003 required)."
|
# error "This Visual C++ version is not supported any longer (at least MSVC 2005 required)."
|
||||||
#elif __VISUALC__ < 1400
|
|
||||||
# define __VISUALC7__
|
|
||||||
#elif __VISUALC__ < 1500
|
#elif __VISUALC__ < 1500
|
||||||
# define __VISUALC8__
|
# define __VISUALC8__
|
||||||
#elif __VISUALC__ < 1600
|
#elif __VISUALC__ < 1600
|
||||||
|
@@ -31,14 +31,10 @@
|
|||||||
#include "wx/vector.h"
|
#include "wx/vector.h"
|
||||||
|
|
||||||
#include "wx/meta/convertible.h"
|
#include "wx/meta/convertible.h"
|
||||||
|
#include "wx/meta/removeref.h"
|
||||||
|
|
||||||
// Currently VC7 is known to not be able to compile CallAfter() code, so
|
// This is now always defined, but keep it for backwards compatibility.
|
||||||
// disable it for it (FIXME-VC7).
|
#define wxHAS_CALL_AFTER
|
||||||
#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(8)
|
|
||||||
#include "wx/meta/removeref.h"
|
|
||||||
|
|
||||||
#define wxHAS_CALL_AFTER
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// forward declarations
|
// forward declarations
|
||||||
@@ -1373,8 +1369,6 @@ private:
|
|||||||
// done asynchronously, i.e. at some later time, instead of immediately when
|
// done asynchronously, i.e. at some later time, instead of immediately when
|
||||||
// the event object is constructed.
|
// the event object is constructed.
|
||||||
|
|
||||||
#ifdef wxHAS_CALL_AFTER
|
|
||||||
|
|
||||||
// This is a base class used to process all method calls.
|
// This is a base class used to process all method calls.
|
||||||
class wxAsyncMethodCallEvent : public wxEvent
|
class wxAsyncMethodCallEvent : public wxEvent
|
||||||
{
|
{
|
||||||
@@ -1555,9 +1549,6 @@ private:
|
|||||||
FunctorType m_fn;
|
FunctorType m_fn;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // wxHAS_CALL_AFTER
|
|
||||||
|
|
||||||
|
|
||||||
#if wxUSE_GUI
|
#if wxUSE_GUI
|
||||||
|
|
||||||
|
|
||||||
@@ -3705,7 +3696,6 @@ public:
|
|||||||
static void WXConsumeException();
|
static void WXConsumeException();
|
||||||
#endif // wxUSE_EXCEPTIONS
|
#endif // wxUSE_EXCEPTIONS
|
||||||
|
|
||||||
#ifdef wxHAS_CALL_AFTER
|
|
||||||
// Asynchronous method calls: these methods schedule the given method
|
// Asynchronous method calls: these methods schedule the given method
|
||||||
// pointer for a later call (during the next idle event loop iteration).
|
// pointer for a later call (during the next idle event loop iteration).
|
||||||
//
|
//
|
||||||
@@ -3749,7 +3739,6 @@ public:
|
|||||||
{
|
{
|
||||||
QueueEvent(new wxAsyncMethodCallEventFunctor<T>(this, fn));
|
QueueEvent(new wxAsyncMethodCallEventFunctor<T>(this, fn));
|
||||||
}
|
}
|
||||||
#endif // wxHAS_CALL_AFTER
|
|
||||||
|
|
||||||
|
|
||||||
// Connecting and disconnecting
|
// Connecting and disconnecting
|
||||||
|
@@ -1615,7 +1615,6 @@ bool wxEvtHandler::TryHereOnly(wxEvent& event)
|
|||||||
if ( GetEventHashTable().HandleEvent(event, this) )
|
if ( GetEventHashTable().HandleEvent(event, this) )
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
#ifdef wxHAS_CALL_AFTER
|
|
||||||
// There is an implicit entry for async method calls processing in every
|
// There is an implicit entry for async method calls processing in every
|
||||||
// event handler:
|
// event handler:
|
||||||
if ( event.GetEventType() == wxEVT_ASYNC_METHOD_CALL &&
|
if ( event.GetEventType() == wxEVT_ASYNC_METHOD_CALL &&
|
||||||
@@ -1624,7 +1623,6 @@ bool wxEvtHandler::TryHereOnly(wxEvent& event)
|
|||||||
static_cast<wxAsyncMethodCallEvent&>(event).Execute();
|
static_cast<wxAsyncMethodCallEvent&>(event).Execute();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif // wxHAS_CALL_AFTER
|
|
||||||
|
|
||||||
// We don't have a handler for this event.
|
// We don't have a handler for this event.
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user