don't use the hack with adding hidden columns to the native control because it doesn...

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 7bc5cd914ff9f35182c9759ac3d47cf09ce660e3..23f1f353766161d4875c69aec522820da80267c2 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -69,7 +69,7 @@ typedef int wxEventType;
 
 // this is used to make the event table entry type safe, so that for an event
 // handler only a function with proper parameter list can be given.
-#define wxStaticCastEvent(type, val) wx_static_cast(type, val)
+#define wxStaticCastEvent(type, val) static_cast<type>(val)
 
 #define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
     wxEventTableEntry(type, winid, idLast, fn, obj)
@@ -908,10 +908,13 @@ public:
     // example)
     wxKeyEvent& operator=(const wxKeyEvent& evt)
     {
-        if (&evt != this)
+        if ( &evt != this )
         {
             wxEvent::operator=(evt);
-            wxKeyboardState::operator=(evt);
+
+            // Borland C++ 5.82 doesn't compile an explicit call to an
+            // implicitly defined operator=() so need to do it this way:
+            *static_cast<wxKeyboardState *>(this) = evt;
 
             m_x = evt.m_x;
             m_y = evt.m_y;
@@ -2294,21 +2297,21 @@ public:
     // winid and event type
     void Connect(int winid,
                  int lastId,
-                 int eventType,
+                 wxEventType eventType,
                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL);
 
     // Convenience function: take just one id
     void Connect(int winid,
-                 int eventType,
+                 wxEventType eventType,
                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
         { Connect(winid, wxID_ANY, eventType, func, userData, eventSink); }
 
     // Even more convenient: without id (same as using id of wxID_ANY)
-    void Connect(int eventType,
+    void Connect(wxEventType eventType,
                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
@@ -2419,8 +2422,6 @@ protected:
 
     // Is event handler enabled?
     bool                m_enabled;
-    // Avoid adding events from another thread during dtor
-    bool                m_beingDeleted;
 
 
     // The user data: either an object which will be deleted by the container