X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47b6fabc7d0405bbbd3d9efd516c44f0b5b94dfc..e0e2cbbe946954db58b28aab3d9cc207987a6a5a:/src/common/event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 0ba18aa5bc..9e8fbdf508 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -44,10 +44,13 @@
 #endif
 
 #include "wx/thread.h"
-#include "wx/ptr_scpd.h"
 
-wxDECLARE_SCOPED_PTR(wxEvent, wxEventPtr)
-wxDEFINE_SCOPED_PTR(wxEvent, wxEventPtr)
+#if wxUSE_BASE
+    #include "wx/ptr_scpd.h"
+
+    wxDECLARE_SCOPED_PTR(wxEvent, wxEventPtr)
+    wxDEFINE_SCOPED_PTR(wxEvent, wxEventPtr)
+#endif // wxUSE_BASE
 
 // ----------------------------------------------------------------------------
 // wxWin macros
@@ -180,6 +183,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED)
 
 // Mouse event types
@@ -1028,6 +1032,8 @@ void wxEventHashTable::GrowEventTypeTable()
 
 wxEvtHandler::wxEvtHandler()
 {
+    m_beingDeleted = false;
+    
     m_nextHandler = (wxEvtHandler *) NULL;
     m_previousHandler = (wxEvtHandler *) NULL;
     m_enabled = true;
@@ -1041,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;
@@ -1058,7 +1066,6 @@ 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 )
             {
@@ -1079,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 )
@@ -1124,23 +1140,20 @@ bool wxEvtHandler::ProcessThreadEvent(const wxEvent& event)
 
 #endif // wxUSE_THREADS
 
-void wxEvtHandler::AddPendingEvent(const wxEvent& event)
+void wxEvtHandler::QueueEvent(wxEvent *event)
 {
-    // 1) Add event to list of pending events of this event handler
-
-    wxEvent *eventCopy = event.Clone();
+    wxCHECK_RET( event, "NULL event can't be posted" );
 
-    // we must be able to copy the events here so the event class must
-    // implement Clone() properly instead of just providing a NULL stab for it
-    wxCHECK_RET( eventCopy,
-                 _T("events of this type aren't supposed to 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 );
 
     if ( !m_pendingEvents )
       m_pendingEvents = new wxList;
 
-    m_pendingEvents->Append(eventCopy);
+    m_pendingEvents->Append(event);
 
     wxLEAVE_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()));
@@ -1181,7 +1205,17 @@ void wxEvtHandler::ProcessPendingEvents()
     // if there are no more pending events left, we don't need to stay in this
     // list
     if ( m_pendingEvents->IsEmpty() )
+    {
+#if wxUSE_THREADS
+        if (wxPendingEventsLocker)
+            wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+#endif
         wxPendingEvents->DeleteObject(this);
+#if wxUSE_THREADS
+        if (wxPendingEventsLocker)
+            wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+#endif
+    }
 
     wxLEAVE_CRIT_SECT( m_pendingEventsLock );
 
@@ -1370,7 +1404,7 @@ void wxEvtHandler::Connect( int id, int lastId,
     m_dynamicEvents->Insert( (wxObject*) entry );
 
     // Make sure we get to know when a sink is destroyed
-    if ( eventSink )
+    if ( eventSink && eventSink != this )
     {
         wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
         if ( evtConnRef )
@@ -1389,7 +1423,7 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
         return false;
 
     // Remove connection from tracker node (wxEventConnectionRef)
-    if ( eventSink )
+    if ( eventSink && eventSink != this )
     {
         wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
         if ( evtConnRef )