X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fa150e233fa449ee270ac26ecf074f5c40acb1e..f321ab7fb40525098cea6594ffbf2daf0186b1a3:/include/wx/event.h?ds=sidebyside

diff --git a/include/wx/event.h b/include/wx/event.h
index e04df54707..538c1be5d4 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -13,6 +13,7 @@
 #define _WX_EVENT_H__
 
 #include "wx/defs.h"
+#include "wx/cpp.h"
 #include "wx/object.h"
 #include "wx/clntdata.h"
 
@@ -94,8 +95,6 @@ typedef int wxEventType;
 #define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
     wxEventTableEntry(type, winid, idLast, fn, obj)
 
-#define EMPTY_PARAMETER_VALUE /* Fake macro parameter value */
-
 #define BEGIN_DECLARE_EVENT_TYPES()
 #define END_DECLARE_EVENT_TYPES()
 #define DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value) \
@@ -103,7 +102,7 @@ typedef int wxEventType;
 #define DECLARE_EVENT_TYPE(name, value) \
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, name, value)
 #define DECLARE_LOCAL_EVENT_TYPE(name, value) \
-    DECLARE_EXPORTED_EVENT_TYPE(EMPTY_PARAMETER_VALUE, name, value)
+    DECLARE_EXPORTED_EVENT_TYPE(wxEMPTY_PARAMETER_VALUE, name, value)
 #define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
 #define DEFINE_LOCAL_EVENT_TYPE(name) DEFINE_EVENT_TYPE(name)
 
@@ -2457,11 +2456,6 @@ public:
     void SetClientData( void *data ) { DoSetClientData(data); }
     void *GetClientData() const { return DoGetClientData(); }
 
-    // reentrance guard
-    void AllowReentrance( bool allow = true ) { m_reentranceAllowed = allow; }
-    bool IsReentranceAllowed()                { return m_reentranceAllowed; }
-    bool IsEventHandlingInProgress()          { return m_eventHandlingInProgress; } 
-    
     // check if the given event table entry matches this event and call the
     // handler if it does
     //
@@ -2531,9 +2525,6 @@ protected:
 #  endif
 #endif
 
-    bool                m_reentranceAllowed;          // Reentrance is allowed for this handler?
-    bool                m_eventHandlingInProgress;    // Eventhandling is in progress?
-    
     // Is event handler enabled?
     bool                m_enabled;