fix the incoherence pointed out by ifacecheck between wx docs, that documents usage...

[wxWidgets.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index d05742d1fd1a438924eeff0c9f712857ff8a017d..630a4f20cc9e3add75cd7582ef34167befc92e73 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -561,7 +561,10 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
 void wxMouseEvent::Assign(const wxMouseEvent& event)
 {
     wxEvent::operator=(event);
-    wxMouseState::operator=(event);
+
+    // Borland C++ 5.82 doesn't compile an explicit call to an implicitly
+    // defined operator=() so need to do it this way:
+    *static_cast<wxMouseState *>(this) = event;
 
     m_x = event.m_x;
     m_y = event.m_y;
@@ -1032,8 +1035,6 @@ void wxEventHashTable::GrowEventTypeTable()
 
 wxEvtHandler::wxEvtHandler()
 {
-    m_beingDeleted = false;
-    
     m_nextHandler = (wxEvtHandler *) NULL;
     m_previousHandler = (wxEvtHandler *) NULL;
     m_enabled = true;
@@ -1047,8 +1048,6 @@ wxEvtHandler::wxEvtHandler()
 
 wxEvtHandler::~wxEvtHandler()
 {
-    m_beingDeleted = true;
-    
     // Takes itself out of the list of handlers
     if (m_previousHandler)
         m_previousHandler->m_nextHandler = m_nextHandler;
@@ -1066,6 +1065,7 @@ wxEvtHandler::~wxEvtHandler()
             wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
 
             // Remove ourselves from sink destructor notifications
+            // (this has usually been been done, in wxTrackable destructor)
             wxEvtHandler *eventSink = entry->m_eventSink;
             if ( eventSink )
             {
@@ -1086,17 +1086,8 @@ wxEvtHandler::~wxEvtHandler()
     };
 
     if (m_pendingEvents)
-    {
-        // At this time, we could still be used from other threads. 
-        // Continue to use sync objects.
-        wxENTER_CRIT_SECT( m_pendingEventsLock );
-        
         m_pendingEvents->DeleteContents(true);
-        delete m_pendingEvents;
-        m_pendingEvents = NULL;
-        
-        wxLEAVE_CRIT_SECT( m_pendingEventsLock );
-    }
+    delete m_pendingEvents;
 
     // Remove us from wxPendingEvents if necessary.
     if ( wxPendingEvents )
@@ -1144,9 +1135,6 @@ void wxEvtHandler::QueueEvent(wxEvent *event)
 {
     wxCHECK_RET( event, "NULL event can't be posted" );
 
-    // Catch the situation where destructor is already invoked (in another thread)
-    if( m_beingDeleted ) return;
-
     // 1) Add this event to our list of pending events
     wxENTER_CRIT_SECT( m_pendingEventsLock );
 
@@ -1178,24 +1166,13 @@ void wxEvtHandler::ProcessPendingEvents()
 {
     wxENTER_CRIT_SECT( m_pendingEventsLock );
 
-    // This method is only called by wxApp if this handler does have
-    // pending events, but it happens occasionally when using multi-
-    // threading and we don't want a crash due to that.
-    if( !m_pendingEvents  )
-    {
-        wxLEAVE_CRIT_SECT( m_pendingEventsLock );
-        return;
-    }
-    
-    if( m_pendingEvents->IsEmpty() )
-    {
-        wxPendingEvents->DeleteObject(this);
-        wxLEAVE_CRIT_SECT( m_pendingEventsLock );
-        return;
-    }
+    // this method is only called by wxApp if this handler does have
+    // pending events
+    wxCHECK_RET( m_pendingEvents && !m_pendingEvents->IsEmpty(),
+                 "should have pending events if called" );
 
     wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
-    wxEventPtr event(wx_static_cast(wxEvent *, node->GetData()));
+    wxEventPtr event(static_cast<wxEvent *>(node->GetData()));
 
     // it's important we remove event from list before processing it, else a
     // nested event loop, for example from a modal dialog, might process the
@@ -1421,7 +1398,7 @@ void wxEvtHandler::Connect( int id, int lastId,
         if ( evtConnRef )
             evtConnRef->IncRef( );
         else
-            evtConnRef = new wxEventConnectionRef(this, eventSink);
+            new wxEventConnectionRef(this, eventSink);
     }
 }