X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4732e2dca973b039b9a7db604a8adf59d99dc1a7..c363ead1e206e599d6564ac939ac7342d165e0e3:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 6ba5895089..3a32fb3719 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -145,11 +145,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule) // List containing event handlers with pending events (each handler can occur // at most once here) -wxList *wxPendingEvents = NULL; +wxList *wxHandlersWithPendingEvents = NULL; #if wxUSE_THREADS - // protects wxPendingEvents list - wxCriticalSection *wxPendingEventsLocker = NULL; + // protects wxHandlersWithPendingEvents list + wxCriticalSection *wxHandlersWithPendingEventsLocker = NULL; #endif // common event types are defined here, other event types are defined by the @@ -183,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 @@ -367,7 +368,7 @@ wxEvent::wxEvent(int theId, wxEventType commandType ) m_propagationLevel = wxEVENT_PROPAGATE_NONE; } -wxEvent::wxEvent(const wxEvent &src) +wxEvent::wxEvent(const wxEvent& src) : wxObject(src) , m_eventObject(src.m_eventObject) , m_eventType(src.m_eventType) @@ -380,6 +381,22 @@ wxEvent::wxEvent(const wxEvent &src) { } +wxEvent& wxEvent::operator=(const wxEvent& src) +{ + wxObject::operator=(src); + + m_eventObject = src.m_eventObject; + m_eventType = src.m_eventType; + m_timeStamp = src.m_timeStamp; + m_id = src.m_id; + m_callbackUserData = src.m_callbackUserData; + m_propagationLevel = src.m_propagationLevel; + m_skipped = src.m_skipped; + m_isCommandEvent = src.m_isCommandEvent; + + return *this; +} + #endif // wxUSE_BASE #if wxUSE_GUI @@ -533,11 +550,6 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType) m_aux1Down = false; m_aux2Down = false; - m_controlDown = false; - m_shiftDown = false; - m_altDown = false; - m_metaDown = false; - m_clickCount = -1; m_wheelRotation = 0; @@ -548,7 +560,11 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType) void wxMouseEvent::Assign(const wxMouseEvent& event) { - m_eventType = event.m_eventType; + wxEvent::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(this) = event; m_x = event.m_x; m_y = event.m_y; @@ -559,11 +575,6 @@ void wxMouseEvent::Assign(const wxMouseEvent& event) m_aux1Down = event.m_aux1Down; m_aux2Down = event.m_aux2Down; - m_controlDown = event.m_controlDown; - m_shiftDown = event.m_shiftDown; - m_altDown = event.m_altDown; - m_metaDown = event.m_metaDown; - m_wheelRotation = event.m_wheelRotation; m_wheelDelta = event.m_wheelDelta; m_linesPerAction = event.m_linesPerAction; @@ -748,10 +759,6 @@ wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const wxKeyEvent::wxKeyEvent(wxEventType type) { m_eventType = type; - m_shiftDown = false; - m_controlDown = false; - m_metaDown = false; - m_altDown = false; m_keyCode = 0; m_scanCode = 0; #if wxUSE_UNICODE @@ -760,17 +767,14 @@ wxKeyEvent::wxKeyEvent(wxEventType type) } wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt) - : wxEvent(evt) + : wxEvent(evt), + wxKeyboardState(evt) { m_x = evt.m_x; m_y = evt.m_y; m_keyCode = evt.m_keyCode; - m_controlDown = evt.m_controlDown; - m_shiftDown = evt.m_shiftDown; - m_altDown = evt.m_altDown; - m_metaDown = evt.m_metaDown; m_scanCode = evt.m_scanCode; m_rawCode = evt.m_rawCode; m_rawFlags = evt.m_rawFlags; @@ -1060,7 +1064,6 @@ 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; @@ -1074,7 +1077,6 @@ wxEvtHandler::~wxEvtHandler() delete evtConnRef; } } -#endif // wxUSE_WEAKREF if (entry->m_callbackUserData) delete entry->m_callbackUserData; @@ -1087,25 +1089,25 @@ wxEvtHandler::~wxEvtHandler() m_pendingEvents->DeleteContents(true); delete m_pendingEvents; - // Remove us from wxPendingEvents if necessary. - if ( wxPendingEvents ) + // Remove us from wxHandlersWithPendingEvents if necessary. + if ( wxHandlersWithPendingEvents ) { #if wxUSE_THREADS - if (wxPendingEventsLocker) - wxENTER_CRIT_SECT(*wxPendingEventsLocker); + if (wxHandlersWithPendingEventsLocker) + wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker); #endif - if ( wxPendingEvents->DeleteObject(this) ) + if ( wxHandlersWithPendingEvents->DeleteObject(this) ) { // check that we were present only once in the list - wxASSERT_MSG( !wxPendingEvents->Find(this), - "Handler occurs twice in wxPendingEvents list" ); + wxASSERT_MSG( !wxHandlersWithPendingEvents->Find(this), + "Handler occurs twice in wxHandlersWithPendingEvents list" ); } //else: we weren't in this list at all, it's ok #if wxUSE_THREADS - if (wxPendingEventsLocker) - wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); + if (wxHandlersWithPendingEventsLocker) + wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker); #endif } @@ -1129,37 +1131,37 @@ 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(); - - // 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") ); + wxCHECK_RET( event, "NULL event can't be posted" ); + // 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); - - wxLEAVE_CRIT_SECT( m_pendingEventsLock ); + m_pendingEvents->Append(event); // 2) Add this event handler to list of event handlers that // have pending events. - wxENTER_CRIT_SECT(*wxPendingEventsLocker); + wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker); + + if ( !wxHandlersWithPendingEvents ) + wxHandlersWithPendingEvents = new wxList; + if ( !wxHandlersWithPendingEvents->Find(this) ) + wxHandlersWithPendingEvents->Append(this); - if ( !wxPendingEvents ) - wxPendingEvents = new wxList; - if ( !wxPendingEvents->Find(this) ) - wxPendingEvents->Append(this); + wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker); - 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 wxHandlersWithPendingEvents 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. @@ -1176,7 +1178,7 @@ void wxEvtHandler::ProcessPendingEvents() "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(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 @@ -1186,7 +1188,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() ) - wxPendingEvents->DeleteObject(this); + { +#if wxUSE_THREADS + if (wxHandlersWithPendingEventsLocker) + wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker); +#endif + wxHandlersWithPendingEvents->DeleteObject(this); +#if wxUSE_THREADS + if (wxHandlersWithPendingEventsLocker) + wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker); +#endif + } wxLEAVE_CRIT_SECT( m_pendingEventsLock ); @@ -1244,6 +1256,13 @@ wxEvtHandler::ProcessEventIfMatches(const wxEventTableEntryBase& entry, 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 @@ -1275,6 +1294,16 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) //else: proceed normally } + if ( ProcessEventHere(event) ) + return true; + + // propagate the event upwards the window chain and/or to the application + // object if it wasn't processed at this level + return TryParent(event); +} + +bool wxEvtHandler::ProcessEventHere(wxEvent& event) +{ // An event handler can be enabled or disabled if ( GetEvtHandlerEnabled() ) { @@ -1293,17 +1322,11 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) } // Try going down the event handler chain - if ( GetNextHandler() ) - { - // notice that we shouldn't let the parent have the event even if the - // next handler does not process it because it will have already passed - // it to the parent in this case - return GetNextHandler()->ProcessEvent(event); - } + if ( GetNextHandler() && GetNextHandler()->ProcessEventHere(event) ) + return true; - // Finally propagate the event upwards the window chain and/or to the - // application object as necessary - return TryParent(event); + // We don't have a handler for this event. + return false; } bool wxEvtHandler::SafelyProcessEvent(wxEvent& event) @@ -1360,7 +1383,7 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) } void wxEvtHandler::Connect( int id, int lastId, - int eventType, + wxEventType eventType, wxObjectEventFunction func, wxObject *userData, wxEvtHandler* eventSink ) @@ -1374,17 +1397,15 @@ 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 ) + if ( eventSink && eventSink != this ) { wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink); if ( evtConnRef ) evtConnRef->IncRef( ); else - evtConnRef = new wxEventConnectionRef(this, eventSink); + new wxEventConnectionRef(this, eventSink); } -#endif // wxUSE_WEAKREF } bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, @@ -1395,15 +1416,13 @@ 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 ) + if ( eventSink && eventSink != this ) { wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink); if ( evtConnRef ) evtConnRef->DecRef(); } -#endif // wxUSE_WEAKREF wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(); while (node) @@ -1495,7 +1514,6 @@ void *wxEvtHandler::DoGetClientData() const return m_clientData; } -#if wxUSE_WEAKREF // A helper to find an wxEventConnectionRef object wxEventConnectionRef * wxEvtHandler::FindRefInTrackerList(wxEvtHandler *eventSink) @@ -1535,7 +1553,6 @@ void wxEvtHandler::OnSinkDestroyed( wxEvtHandler *sink ) node = node_nxt; } } -#endif // wxUSE_WEAKREF #endif // wxUSE_BASE