Disable wxEvtHandler::CallAfter() for VC6, it's too broken for it.
There is no clear way to implement wxRemoveRef() for VC6 so just disable it, and CallAfter() as it relies on it, for this compiler. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,6 +35,12 @@
|
||||
|
||||
#include "wx/meta/removeref.h"
|
||||
|
||||
#ifdef wxHAS_REMOVEREF
|
||||
// CallAfter() implementation requires wxRemoveRef(), so just disable it
|
||||
// for compilers too broken to not allow defining it.
|
||||
#define wxHAS_CALL_AFTER
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// forward declarations
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -1276,6 +1282,8 @@ private:
|
||||
// done asynchronously, i.e. at some later time, instead of immediately when
|
||||
// the event object is constructed.
|
||||
|
||||
#ifdef wxHAS_CALL_AFTER
|
||||
|
||||
// This is a base class used to process all method calls.
|
||||
class wxAsyncMethodCallEvent : public wxEvent
|
||||
{
|
||||
@@ -1423,6 +1431,9 @@ private:
|
||||
const ParamType2 m_param2;
|
||||
};
|
||||
|
||||
#endif // wxHAS_CALL_AFTER
|
||||
|
||||
|
||||
#if wxUSE_GUI
|
||||
|
||||
|
||||
@@ -3294,6 +3305,7 @@ public:
|
||||
// NOTE: uses AddPendingEvent(); call only from secondary threads
|
||||
#endif
|
||||
|
||||
#ifdef wxHAS_CALL_AFTER
|
||||
// Asynchronous method calls: these methods schedule the given method
|
||||
// pointer for a later call (during the next idle event loop iteration).
|
||||
//
|
||||
@@ -3331,6 +3343,7 @@ public:
|
||||
static_cast<T*>(this), method, x1, x2)
|
||||
);
|
||||
}
|
||||
#endif // wxHAS_CALL_AFTER
|
||||
|
||||
|
||||
// Connecting and disconnecting
|
||||
|
Reference in New Issue
Block a user