Compile fixes

[wxWidgets.git] / include / wx / event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index 4de9cac013b4803a0a82323d1b09643c57ea35c8..e04df5470756e078c5a9b6a80ec3262420bee02c 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1185,7 +1185,7 @@ public:
         g_isPainting++;
     }
 
-    ~wxPaintEvent()
+    virtual ~wxPaintEvent()
     {
         g_isPainting--;
     }
@@ -2398,7 +2398,6 @@ public:
     // add an event to be processed later
     void AddPendingEvent(wxEvent& event);
 
-    // process all pending events
     void ProcessPendingEvents();
 
 #if wxUSE_THREADS
@@ -2458,6 +2457,11 @@ 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
     //
@@ -2527,6 +2531,9 @@ 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;