osx-cocoa updates

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index d2bd83d29b477bd84f3a689a656b163728f96e71..9e8fbdf5086fb10d8af4ad286e735b532ac11e6c 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -1032,6 +1032,8 @@ void wxEventHashTable::GrowEventTypeTable()
 
 wxEvtHandler::wxEvtHandler()
 {
+    m_beingDeleted = false;
+    
     m_nextHandler = (wxEvtHandler *) NULL;
     m_previousHandler = (wxEvtHandler *) NULL;
     m_enabled = true;
@@ -1045,6 +1047,8 @@ wxEvtHandler::wxEvtHandler()
 
 wxEvtHandler::~wxEvtHandler()
 {
+    m_beingDeleted = true;
+    
     // Takes itself out of the list of handlers
     if (m_previousHandler)
         m_previousHandler->m_nextHandler = m_nextHandler;
@@ -1061,9 +1065,7 @@ wxEvtHandler::~wxEvtHandler()
         {
             wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
 
-#if wxUSE_WEAKREF
             // Remove ourselves from sink destructor notifications
-            // (this has usually been been done, in wxTrackable destructor)
             wxEvtHandler *eventSink = entry->m_eventSink;
             if ( eventSink )
             {
@@ -1075,7 +1077,6 @@ wxEvtHandler::~wxEvtHandler()
                     delete evtConnRef;
                 }
             }
-#endif // wxUSE_WEAKREF
 
             if (entry->m_callbackUserData)
                 delete entry->m_callbackUserData;
@@ -1085,8 +1086,17 @@ 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;
+        delete m_pendingEvents;
+        m_pendingEvents = NULL;
+        
+        wxLEAVE_CRIT_SECT( m_pendingEventsLock );
+    }
 
     // Remove us from wxPendingEvents if necessary.
     if ( wxPendingEvents )
@@ -1134,6 +1144,9 @@ 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 );
 
@@ -1165,10 +1178,21 @@ void wxEvtHandler::ProcessPendingEvents()
 {
     wxENTER_CRIT_SECT( m_pendingEventsLock );
 
-    // 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" );
+    // 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;
+    }
 
     wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
     wxEventPtr event(wx_static_cast(wxEvent *, node->GetData()));
@@ -1379,7 +1403,6 @@ void wxEvtHandler::Connect( int id, int lastId,
     // Insert at the front of the list so most recent additions are found first
     m_dynamicEvents->Insert( (wxObject*) entry );
 
-#if wxUSE_WEAKREF
     // Make sure we get to know when a sink is destroyed
     if ( eventSink && eventSink != this )
     {
@@ -1389,7 +1412,6 @@ void wxEvtHandler::Connect( int id, int lastId,
         else
             evtConnRef = new wxEventConnectionRef(this, eventSink);
     }
-#endif // wxUSE_WEAKREF
 }
 
 bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
@@ -1400,7 +1422,6 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
     if (!m_dynamicEvents)
         return false;
 
-#if wxUSE_WEAKREF
     // Remove connection from tracker node (wxEventConnectionRef)
     if ( eventSink && eventSink != this )
     {
@@ -1408,7 +1429,6 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
         if ( evtConnRef )
             evtConnRef->DecRef();
     }
-#endif // wxUSE_WEAKREF
 
     wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
     while (node)
@@ -1500,7 +1520,6 @@ void *wxEvtHandler::DoGetClientData() const
     return m_clientData;
 }
 
-#if wxUSE_WEAKREF
 // A helper to find an wxEventConnectionRef object
 wxEventConnectionRef *
 wxEvtHandler::FindRefInTrackerList(wxEvtHandler *eventSink)
@@ -1540,7 +1559,6 @@ void wxEvtHandler::OnSinkDestroyed( wxEvtHandler *sink )
         node = node_nxt;
     }
 }
-#endif // wxUSE_WEAKREF
 
 #endif // wxUSE_BASE