slightly better error reporting (could still be improved)

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 7bc5cd914ff9f35182c9759ac3d47cf09ce660e3..0d31e326f5e973b30e53bb05bacf612870319b06 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -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;
@@ -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