trying to resolve GSocketManager API mess: the meaning of Install/Uninstall_Callback...

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 6c504bc51ccb95371fb7454aa0dd8364682851f7..590c3adf3e0939eee70349257d7f743f21b964f2 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);
 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;
 
     m_x = event.m_x;
     m_y = event.m_y;


@@ -1032,8 +1035,6 @@ void wxEventHashTable::GrowEventTypeTable()
 
 wxEvtHandler::wxEvtHandler()
 {
 
 wxEvtHandler::wxEvtHandler()
 {

-    m_beingDeleted = false;
-    

     m_nextHandler = (wxEvtHandler *) NULL;
     m_previousHandler = (wxEvtHandler *) NULL;
     m_enabled = true;
     m_nextHandler = (wxEvtHandler *) NULL;
     m_previousHandler = (wxEvtHandler *) NULL;
     m_enabled = true;


@@ -1047,8 +1048,6 @@ wxEvtHandler::wxEvtHandler()
 
 wxEvtHandler::~wxEvtHandler()
 {
 
 wxEvtHandler::~wxEvtHandler()
 {

-    m_beingDeleted = true;
-    

     // Takes itself out of the list of handlers
     if (m_previousHandler)
         m_previousHandler->m_nextHandler = m_nextHandler;
     // 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
             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 )
             {
             wxEvtHandler *eventSink = entry->m_eventSink;
             if ( eventSink )
             {


@@ -1086,17 +1086,8 @@ wxEvtHandler::~wxEvtHandler()
     };
 
     if (m_pendingEvents)
     };
 
     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);
         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 )
 
     // 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" );
 
 {
     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 );
 
     // 1) Add this event to our list of pending events
     wxENTER_CRIT_SECT( m_pendingEventsLock );
 


@@ -1155,8 +1143,6 @@ void wxEvtHandler::QueueEvent(wxEvent *event)
 
     m_pendingEvents->Append(event);
 
 
     m_pendingEvents->Append(event);
 

-    wxLEAVE_CRIT_SECT( m_pendingEventsLock );
-

     // 2) Add this event handler to list of event handlers that
     //    have pending events.
 
     // 2) Add this event handler to list of event handlers that
     //    have pending events.
 


@@ -1169,6 +1155,14 @@ void wxEvtHandler::QueueEvent(wxEvent *event)
 
     wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
 
 
     wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
 

+    // only release m_pendingEventsLock now because otherwise there is a race
+    // condition as described in the ticket #9093: we could process the event
+    // just added to m_pendingEvents in our ProcessPendingEvents() below before
+    // we had time to append this pointer to wxPendingEvents list; thus
+    // breaking the invariant that a handler should be in the list iff it has
+    // any pending events to process
+    wxLEAVE_CRIT_SECT( m_pendingEventsLock );
+

     // 3) Inform the system that new pending events are somewhere,
     //    and that these should be processed in idle time.
     wxWakeUpIdle();
     // 3) Inform the system that new pending events are somewhere,
     //    and that these should be processed in idle time.
     wxWakeUpIdle();


@@ -1178,24 +1172,13 @@ void wxEvtHandler::ProcessPendingEvents()
 {
     wxENTER_CRIT_SECT( m_pendingEventsLock );
 
 {
     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();
 
     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
 
     // 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


@@ -1273,6 +1256,13 @@ wxEvtHandler::ProcessEventIfMatches(const wxEventTableEntryBase& entry,
 
 bool wxEvtHandler::TryParent(wxEvent& event)
 {
 
 bool wxEvtHandler::TryParent(wxEvent& event)
 {

+    if ( GetNextHandler() )
+    {
+        // the next handler will pass it to wxTheApp if it doesn't process it,
+        // so return from here to avoid doing it again
+        return GetNextHandler()->TryParent(event);
+    }
+

     if ( wxTheApp && (this != wxTheApp) )
     {
         // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always
     if ( wxTheApp && (this != wxTheApp) )
     {
         // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always


@@ -1308,7 +1298,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
         return true;
 
     // propagate the event upwards the window chain and/or to the application
         return true;
 
     // propagate the event upwards the window chain and/or to the application

-    // object if it wasn't processed at this level 
+    // object if it wasn't processed at this level

     return TryParent(event);
 }
 
     return TryParent(event);
 }
 


@@ -1393,7 +1383,7 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
 }
 
 void wxEvtHandler::Connect( int id, int lastId,
 }
 
 void wxEvtHandler::Connect( int id, int lastId,

-                            int eventType,
+                            wxEventType eventType,

                             wxObjectEventFunction func,
                             wxObject *userData,
                             wxEvtHandler* eventSink )
                             wxObjectEventFunction func,
                             wxObject *userData,
                             wxEvtHandler* eventSink )


@@ -1414,7 +1404,7 @@ void wxEvtHandler::Connect( int id, int lastId,
         if ( evtConnRef )
             evtConnRef->IncRef( );
         else
         if ( evtConnRef )
             evtConnRef->IncRef( );
         else

-            evtConnRef = new wxEventConnectionRef(this, eventSink);
+            new wxEventConnectionRef(this, eventSink);

     }
 }
 
     }
 }