X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7bc03c94bba504a4ce68352af0c9782e1a5eb14..2cdd63c6b1d473ffd7726f619085997b0737952e:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 49601ef677..bda30d8451 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -17,7 +17,14 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__) +// Some older compilers (such as EMX) cannot handle +// #pragma interface/implementation correctly, iff +// #pragma implementation is used in _two_ translation +// units (as created by e.g. event.cpp compiled for +// libwx_base and event.cpp compiled for libwx_gui_core). +// So we must not use those pragmas for those compilers in +// such files. #pragma implementation "event.h" #endif @@ -37,10 +44,12 @@ #include "wx/control.h" #include "wx/utils.h" #include "wx/dc.h" + #include "wx/textctrl.h" #endif // wxUSE_GUI #endif #include "wx/event.h" +#include "wx/module.h" #if wxUSE_GUI #include "wx/validate.h" @@ -86,7 +95,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent) @@ -112,6 +121,24 @@ wxEventHashTable wxEvtHandler::sm_eventHashTable(wxEvtHandler::sm_eventTable); const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) }; + +#ifdef __WXDEBUG__ +// Clear up event hash table contents or we can get problems +// when C++ is cleaning up the static object +class wxEventTableEntryModule: public wxModule +{ +DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule) +public: + wxEventTableEntryModule() {} + bool OnInit() { return true; } + void OnExit() + { + wxEventHashTable::ClearAll(); + } +}; +IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule) +#endif + // ---------------------------------------------------------------------------- // global variables // ---------------------------------------------------------------------------- @@ -304,16 +331,6 @@ int wxNewEventType() // MT-FIXME static int s_lastUsedEventType = wxEVT_FIRST; -#if WXWIN_COMPATIBILITY_2 - // check that we don't overlap with the user-defined types: if it does - // happen, the best solution is probably to update the existing code to - // use wxNewEventType() instead of wxEVT_USER_FIRST - // - // due to the uncertainty - wxASSERT_MSG( s_lastUsedEventType < wxEVT_USER_FIRST - 1, - _T("possible event type conflict") ); -#endif // WXWIN_COMPATIBILITY_2 - return s_lastUsedEventType++; } @@ -322,7 +339,7 @@ int wxNewEventType() // ---------------------------------------------------------------------------- /* - * General wxWindows events, covering + * General wxWidgets events, covering * all interesting things that might happen (button clicking, resizing, * setting text in widgets, etc.). * @@ -336,9 +353,9 @@ wxEvent::wxEvent(int theId, wxEventType commandType ) m_eventObject = (wxObject *) NULL; m_timeStamp = 0; m_id = theId; - m_skipped = FALSE; + m_skipped = false; m_callbackUserData = (wxObject *) NULL; - m_isCommandEvent = FALSE; + m_isCommandEvent = false; m_propagationLevel = wxEVENT_PROPAGATE_NONE; } @@ -364,19 +381,47 @@ wxEvent::wxEvent(const wxEvent &src) * */ +#ifdef __VISUALC__ + // 'this' : used in base member initializer list (for m_commandString) + #pragma warning(disable:4355) +#endif + wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) : wxEvent(theId, commandType) +#if WXWIN_COMPATIBILITY_2_4 + , m_commandString(this) +#endif { m_clientData = (char *) NULL; m_clientObject = (wxClientData *) NULL; m_extraLong = 0; m_commandInt = 0; - m_isCommandEvent = TRUE; + m_isCommandEvent = true; // the command events are propagated upwards by default m_propagationLevel = wxEVENT_PROPAGATE_MAX; } +#ifdef __VISUALC__ + #pragma warning(default:4355) +#endif + +wxString wxCommandEvent::GetString() const +{ + if(m_eventType != wxEVT_COMMAND_TEXT_UPDATED || !m_eventObject) + return m_cmdString; + else + { +#if wxUSE_TEXTCTRL + wxTextCtrl *txt = wxDynamicCast(m_eventObject, wxTextCtrl); + if(txt) + return txt->GetValue(); + else +#endif // wxUSE_TEXTCTRL + return m_cmdString; + } +} + /* * UI update events */ @@ -397,27 +442,27 @@ bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win) if (win && (GetMode() == wxUPDATE_UI_PROCESS_SPECIFIED && ((win->GetExtraStyle() & wxWS_EX_PROCESS_UI_UPDATES) == 0))) - return FALSE; + return false; if (sm_updateInterval == -1) - return FALSE; - else if (sm_updateInterval == 0) - return TRUE; - else - { + return false; + + if (sm_updateInterval == 0) + return true; + #if wxUSE_STOPWATCH && wxUSE_LONGLONG - wxLongLong now = wxGetLocalTimeMillis(); - if (now > (sm_lastUpdate + sm_updateInterval)) - { - return TRUE; - } + wxLongLong now = wxGetLocalTimeMillis(); + if (now > (sm_lastUpdate + sm_updateInterval)) + { + return true; + } + + return false; #else - // If we don't have wxStopWatch or wxLongLong, we - // should err on the safe side and update now anyway. - return TRUE; + // If we don't have wxStopWatch or wxLongLong, we + // should err on the safe side and update now anyway. + return true; #endif - } - return FALSE; } // Reset the update time to provide a delay until the next @@ -450,9 +495,9 @@ bool wxIdleEvent::CanSend(wxWindow* win) if (win && (GetMode() == wxIDLE_PROCESS_SPECIFIED && ((win->GetExtraStyle() & wxWS_EX_PROCESS_IDLE) == 0))) - return FALSE; + return false; - return TRUE; + return true; } /* @@ -490,13 +535,13 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, wxMouseEvent::wxMouseEvent(wxEventType commandType) { m_eventType = commandType; - m_metaDown = FALSE; - m_altDown = FALSE; - m_controlDown = FALSE; - m_shiftDown = FALSE; - m_leftDown = FALSE; - m_rightDown = FALSE; - m_middleDown = FALSE; + m_metaDown = false; + m_altDown = false; + m_controlDown = false; + m_shiftDown = false; + m_leftDown = false; + m_rightDown = false; + m_middleDown = false; m_x = 0; m_y = 0; m_wheelRotation = 0; @@ -525,106 +570,120 @@ void wxMouseEvent::Assign(const wxMouseEvent& event) m_linesPerAction = event.m_linesPerAction; } -// True if was a button dclick event (1 = left, 2 = middle, 3 = right) -// or any button dclick event (but = -1) +// return true if was a button dclick event bool wxMouseEvent::ButtonDClick(int but) const { switch (but) { - case -1: + default: + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick")); + // fall through + + case wxMOUSE_BTN_ANY: return (LeftDClick() || MiddleDClick() || RightDClick()); - case 1: + + case wxMOUSE_BTN_LEFT: return LeftDClick(); - case 2: + + case wxMOUSE_BTN_MIDDLE: return MiddleDClick(); - case 3: + + case wxMOUSE_BTN_RIGHT: return RightDClick(); - default: - wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick")); } - - return FALSE; } -// True if was a button down event (1 = left, 2 = middle, 3 = right) -// or any button down event (but = -1) +// return true if was a button down event bool wxMouseEvent::ButtonDown(int but) const { switch (but) { - case -1: + default: + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown")); + // fall through + + case wxMOUSE_BTN_ANY: return (LeftDown() || MiddleDown() || RightDown()); - case 1: + + case wxMOUSE_BTN_LEFT: return LeftDown(); - case 2: + + case wxMOUSE_BTN_MIDDLE: return MiddleDown(); - case 3: + + case wxMOUSE_BTN_RIGHT: return RightDown(); - default: - wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown")); } - - return FALSE; } -// True if was a button up event (1 = left, 2 = middle, 3 = right) -// or any button up event (but = -1) +// return true if was a button up event bool wxMouseEvent::ButtonUp(int but) const { switch (but) { - case -1: + default: + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp")); + // fall through + + case wxMOUSE_BTN_ANY: return (LeftUp() || MiddleUp() || RightUp()); - case 1: + + case wxMOUSE_BTN_LEFT: return LeftUp(); - case 2: + + case wxMOUSE_BTN_MIDDLE: return MiddleUp(); - case 3: + + case wxMOUSE_BTN_RIGHT: return RightUp(); - default: - wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp")); } - - return FALSE; } -// True if the given button is currently changing state +// return true if the given button is currently changing state bool wxMouseEvent::Button(int but) const { switch (but) { - case -1: - return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)); - case 1: - return (LeftDown() || LeftUp() || LeftDClick()); - case 2: - return (MiddleDown() || MiddleUp() || MiddleDClick()); - case 3: - return (RightDown() || RightUp() || RightDClick()); default: wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button")); - } + // fall through + + case wxMOUSE_BTN_ANY: + return ButtonUp(wxMOUSE_BTN_ANY) || + ButtonDown(wxMOUSE_BTN_ANY) || + ButtonDClick(wxMOUSE_BTN_ANY); - return FALSE; + case wxMOUSE_BTN_LEFT: + return LeftDown() || LeftUp() || LeftDClick(); + + case wxMOUSE_BTN_MIDDLE: + return MiddleDown() || MiddleUp() || MiddleDClick(); + + case wxMOUSE_BTN_RIGHT: + return RightDown() || RightUp() || RightDClick(); + } } bool wxMouseEvent::ButtonIsDown(int but) const { switch (but) { - case -1: - return (LeftIsDown() || MiddleIsDown() || RightIsDown()); - case 1: + default: + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown")); + // fall through + + case wxMOUSE_BTN_ANY: + return LeftIsDown() || MiddleIsDown() || RightIsDown(); + + case wxMOUSE_BTN_LEFT: return LeftIsDown(); - case 2: + + case wxMOUSE_BTN_MIDDLE: return MiddleIsDown(); - case 3: + + case wxMOUSE_BTN_RIGHT: return RightIsDown(); - default: - wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown")); } - - return FALSE; } int wxMouseEvent::GetButton() const @@ -637,7 +696,7 @@ int wxMouseEvent::GetButton() const } } - return -1; + return wxMOUSE_BTN_NONE; } // Find the logical position of the event given the DC @@ -656,10 +715,10 @@ 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_shiftDown = false; + m_controlDown = false; + m_metaDown = false; + m_altDown = false; m_keyCode = 0; m_scanCode = 0; #if wxUSE_UNICODE @@ -720,16 +779,35 @@ wxChildFocusEvent::wxChildFocusEvent(wxWindow *win) // wxEventHashTable // ---------------------------------------------------------------------------- -static const int EVENT_TYPE_TABLE_INIT_SIZE = 31; // Not to big not to small... +static const int EVENT_TYPE_TABLE_INIT_SIZE = 31; // Not too big not too small... + +wxEventHashTable* wxEventHashTable::sm_first = NULL; wxEventHashTable::wxEventHashTable(const wxEventTable &table) : m_table(table), - m_rebuildHash(TRUE) + m_rebuildHash(true) { AllocEventTypeTable(EVENT_TYPE_TABLE_INIT_SIZE); + + m_next = sm_first; + if (m_next) + m_next->m_previous = this; + sm_first = this; } wxEventHashTable::~wxEventHashTable() +{ + if (m_next) + m_next->m_previous = m_previous; + if (m_previous) + m_previous->m_next = m_next; + if (sm_first == this) + sm_first = m_next; + + Clear(); +} + +void wxEventHashTable::Clear() { size_t i; for(i = 0; i < m_size; i++) @@ -741,7 +819,24 @@ wxEventHashTable::~wxEventHashTable() } } - delete[] m_eventTypeTable; + // Necessary in order to not invoke the + // overloaded delete operator when statics are cleaned up + if (m_eventTypeTable) + delete[] m_eventTypeTable; + + m_eventTypeTable = NULL; + m_size = 0; +} + +// Clear all tables +void wxEventHashTable::ClearAll() +{ + wxEventHashTable* table = sm_first; + while (table) + { + table->Clear(); + table = table->m_next; + } } bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self) @@ -749,9 +844,12 @@ bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self) if (m_rebuildHash) { InitHashTable(); - m_rebuildHash = FALSE; + m_rebuildHash = false; } + if (!m_eventTypeTable) + return false; + // Find all entries for the given event type. wxEventType eventType = event.GetEventType(); const EventTypeTablePointer eTTnode = m_eventTypeTable[eventType % m_size]; @@ -759,36 +857,21 @@ bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self) { // Now start the search for an event handler // that can handle an event with the given ID. - int eventId = event.GetId(); - const wxEventTableEntryPointerArray &eventEntryTable = eTTnode->eventEntryTable; + const wxEventTableEntryPointerArray& + eventEntryTable = eTTnode->eventEntryTable; - size_t n; - size_t count = eventEntryTable.GetCount(); - for (n = 0; n < count; n++) + const size_t count = eventEntryTable.GetCount(); + for (size_t n = 0; n < count; n++) { - const wxEventTableEntry* entry = eventEntryTable[n]; - int tableId1 = entry->m_id, - tableId2 = entry->m_lastId; - - if ((tableId1 == -1) || - (tableId2 == -1 && tableId1 == eventId) || - (tableId2 != -1 && - (eventId >= tableId1 && eventId <= tableId2))) + if ( wxEvtHandler:: + ProcessEventIfMatches(*eventEntryTable[n], self, event) ) { - event.Skip(FALSE); - event.m_callbackUserData = entry->m_callbackUserData; - - (self->*((wxEventFunction) (entry->m_fn)))(event); - - if (!event.GetSkipped()) - return TRUE; + return true; } } - - return FALSE; } - return FALSE; + return false; } void wxEventHashTable::InitHashTable() @@ -824,6 +907,10 @@ void wxEventHashTable::InitHashTable() void wxEventHashTable::AddEntry(const wxEventTableEntry &entry) { + // This might happen 'accidentally' as the app is exiting + if (!m_eventTypeTable) + return; + EventTypeTablePointer *peTTnode = &m_eventTypeTable[entry.m_eventType % m_size]; EventTypeTablePointer eTTnode = *peTTnode; @@ -892,6 +979,7 @@ void wxEventHashTable::GrowEventTypeTable() delete[] oldEventTypeTable; } + // ---------------------------------------------------------------------------- // wxEvtHandler // ---------------------------------------------------------------------------- @@ -904,7 +992,7 @@ wxEvtHandler::wxEvtHandler() { m_nextHandler = (wxEvtHandler *) NULL; m_previousHandler = (wxEvtHandler *) NULL; - m_enabled = TRUE; + m_enabled = true; m_dynamicEvents = (wxList *) NULL; m_pendingEvents = (wxList *) NULL; #if wxUSE_THREADS @@ -977,9 +1065,17 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) AddPendingEvent(event); - return TRUE; + return true; } +void wxEvtHandler::ClearEventLocker() +{ +#if !defined(__VISAGECPP__) + delete m_eventsLocker; + m_eventsLocker = NULL; +#endif +}; + #endif // wxUSE_THREADS void wxEvtHandler::AddPendingEvent(wxEvent& event) @@ -993,22 +1089,14 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) wxCHECK_RET( eventCopy, _T("events of this type aren't supposed to be posted") ); -#if defined(__VISAGECPP__) - wxENTER_CRIT_SECT( m_eventsLocker); -#else - wxENTER_CRIT_SECT( *m_eventsLocker); -#endif + wxENTER_CRIT_SECT( Lock() ); if ( !m_pendingEvents ) m_pendingEvents = new wxList; m_pendingEvents->Append(eventCopy); -#if defined(__VISAGECPP__) - wxLEAVE_CRIT_SECT( m_eventsLocker); -#else - wxLEAVE_CRIT_SECT( *m_eventsLocker); -#endif + wxLEAVE_CRIT_SECT( Lock() ); // 2) Add this event handler to list of event handlers that // have pending events. @@ -1028,46 +1116,84 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) void wxEvtHandler::ProcessPendingEvents() { -#if defined(__VISAGECPP__) - wxENTER_CRIT_SECT( m_eventsLocker); -#else - wxENTER_CRIT_SECT( *m_eventsLocker); -#endif - - wxList::compatibility_iterator node = m_pendingEvents->GetFirst(); - while ( node ) + // this method is only called by wxApp if this handler does have pending + // events + wxCHECK_RET( m_pendingEvents, + wxT("Please call wxApp::ProcessPendingEvents() instead") ); + + wxENTER_CRIT_SECT( Lock() ); + + // we leave the loop once we have processed all events that were present at + // the start of ProcessPendingEvents because otherwise we could get into + // infinite loop if the pending event handler execution resulted in another + // event being posted + size_t n = m_pendingEvents->size(); + for ( wxList::compatibility_iterator node = m_pendingEvents->GetFirst(); + node; + node = m_pendingEvents->GetFirst() ) { wxEvent *event = (wxEvent *)node->GetData(); + m_pendingEvents->Erase(node); - // In ProcessEvent, new events might get added and - // we can safely leave the crtical section here. -#if defined(__VISAGECPP__) - wxLEAVE_CRIT_SECT( m_eventsLocker); -#else - wxLEAVE_CRIT_SECT( *m_eventsLocker); -#endif + wxLEAVE_CRIT_SECT( Lock() ); + ProcessEvent(*event); delete event; -#if defined(__VISAGECPP__) - wxENTER_CRIT_SECT( m_eventsLocker); -#else - wxENTER_CRIT_SECT( *m_eventsLocker); -#endif - node = m_pendingEvents->GetFirst(); + wxENTER_CRIT_SECT( Lock() ); + + if ( !--n ) + break; } -#if defined(__VISAGECPP__) - wxLEAVE_CRIT_SECT( m_eventsLocker); -#else - wxLEAVE_CRIT_SECT( *m_eventsLocker); -#endif + wxLEAVE_CRIT_SECT( Lock() ); } /* * Event table stuff */ +/* static */ bool +wxEvtHandler::ProcessEventIfMatches(const wxEventTableEntryBase& entry, + wxEvtHandler *handler, + wxEvent& event) +{ + int tableId1 = entry.m_id, + tableId2 = entry.m_lastId; + + // match only if the event type is the same and the id is either -1 in + // the event table (meaning "any") or the event id matches the id + // specified in the event table either exactly or by falling into + // range between first and last + if ((tableId1 == wxID_ANY) || + (tableId2 == wxID_ANY && tableId1 == event.GetId()) || + (tableId2 != wxID_ANY && + (event.GetId() >= tableId1 && event.GetId() <= tableId2))) + { + event.Skip(false); + event.m_callbackUserData = entry.m_callbackUserData; + +#if wxUSE_EXCEPTIONS + if ( wxTheApp ) + { + // call the handler via wxApp method which allows the user to catch + // any exceptions which may be thrown by any handler in the program + // in one place + wxTheApp->HandleEvent(handler, (wxEventFunction)entry.m_fn, event); + } + else +#endif // wxUSE_EXCEPTIONS + { + // no need for an extra virtual function call + (handler->*((wxEventFunction) (entry.m_fn)))(event); + } + + if (!event.GetSkipped()) + return true; + } + + return false; +} bool wxEvtHandler::TryParent(wxEvent& event) { @@ -1079,11 +1205,11 @@ bool wxEvtHandler::TryParent(wxEvent& event) if ( event.GetEventType() != wxEVT_IDLE ) { if ( wxTheApp->ProcessEvent(event) ) - return TRUE; + return true; } } - return FALSE; + return false; } bool wxEvtHandler::ProcessEvent(wxEvent& event) @@ -1107,25 +1233,23 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) { // if we have a validator, it has higher priority than our own event // table -#if wxUSE_VALIDATORS if ( TryValidator(event) ) - return TRUE; -#endif // wxUSE_VALIDATORS + return true; // Handle per-instance dynamic event tables first if ( m_dynamicEvents && SearchDynamicEventTable(event) ) - return TRUE; + return true; // Then static per-class event tables if ( GetEventHashTable().HandleEvent(event, this) ) - return TRUE; + return true; } // Try going down the event handler chain if ( GetNextHandler() ) { if ( GetNextHandler()->ProcessEvent(event) ) - return TRUE; + return true; } // Finally propagate the event upwards the window chain and/or to the @@ -1136,46 +1260,18 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) { - wxEventType eventType = event.GetEventType(); - int eventId = event.GetId(); - - // BC++ doesn't like testing for m_fn without != 0 + const wxEventType eventType = event.GetEventType(); for ( int i = 0; table.entries[i].m_fn != 0; i++ ) { - // the line using reference exposes a bug in gcc: although it _seems_ - // to work, it leads to weird crashes later on during program - // execution -#ifdef __GNUG__ - wxEventTableEntry entry = table.entries[i]; -#else const wxEventTableEntry& entry = table.entries[i]; -#endif - - // match only if the event type is the same and the id is either -1 in - // the event table (meaning "any") or the event id matches the id - // specified in the event table either exactly or by falling into - // range between first and last if ( eventType == entry.m_eventType ) { - int tableId1 = entry.m_id, - tableId2 = entry.m_lastId; - - if ( (tableId1 == -1) || - (tableId2 == -1 && eventId == tableId1) || - (tableId2 != -1 && - (eventId >= tableId1 && eventId <= tableId2)) ) - { - event.Skip(FALSE); - event.m_callbackUserData = entry.m_callbackUserData; - - (this->*((wxEventFunction) (entry.m_fn)))(event); - - return !event.GetSkipped(); - } + if ( ProcessEventIfMatches(entry, this, event) ) + return true; } } - return FALSE; + return false; } void wxEvtHandler::Connect( int id, int lastId, @@ -1209,7 +1305,7 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, wxEvtHandler* eventSink ) { if (!m_dynamicEvents) - return FALSE; + return false; wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(); while (node) @@ -1221,7 +1317,7 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES if ((entry->m_id == id) && - ((entry->m_lastId == lastId) || (lastId == -1)) && + ((entry->m_lastId == lastId) || (lastId == wxID_ANY)) && ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) && ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) && ((entry->m_eventSink == eventSink) || (eventSink == (wxEvtHandler*)NULL)) && @@ -1231,55 +1327,46 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, delete entry->m_callbackUserData; m_dynamicEvents->Erase( node ); delete entry; - return TRUE; + return true; } node = node->GetNext(); } - return FALSE; + return false; } bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) { - wxCHECK_MSG( m_dynamicEvents, FALSE, + wxCHECK_MSG( m_dynamicEvents, false, wxT("caller should check that we have dynamic events") ); - int commandId = event.GetId(); - wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(); while (node) { #if WXWIN_COMPATIBILITY_EVENT_TYPES - wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData(); + wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData(); #else // !WXWIN_COMPATIBILITY_EVENT_TYPES - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData(); + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData(); #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES - if (entry->m_fn) + if ((event.GetEventType() == entry->m_eventType) && (entry->m_fn != 0)) { - // Match, if event spec says any id will do (id == -1) - if ( (event.GetEventType() == entry->m_eventType) && - (entry->m_id == -1 || - (entry->m_lastId == -1 && commandId == entry->m_id) || - (entry->m_lastId != -1 && - (commandId >= entry->m_id && commandId <= entry->m_lastId))) ) - { - event.Skip(FALSE); - event.m_callbackUserData = entry->m_callbackUserData; - + wxEvtHandler *handler = #if !WXWIN_COMPATIBILITY_EVENT_TYPES - if (entry->m_eventSink) - ((entry->m_eventSink)->*((wxEventFunction) (entry->m_fn)))(event); - else + entry->m_eventSink ? entry->m_eventSink + : #endif - (this->*((wxEventFunction) (entry->m_fn)))(event); + this; - if ( ! event.GetSkipped() ) - return TRUE; + if ( ProcessEventIfMatches(*entry, handler, event) ) + { + return true; } } + node = node->GetNext(); } - return FALSE; + + return false; }; void wxEvtHandler::DoSetClientObject( wxClientData *data ) @@ -1323,17 +1410,6 @@ void *wxEvtHandler::DoGetClientData() const return m_clientData; } - -#if WXWIN_COMPATIBILITY -bool wxEvtHandler::OnClose() -{ - if (GetNextHandler()) - return GetNextHandler()->OnClose(); - else - return FALSE; -} -#endif // WXWIN_COMPATIBILITY - #endif // wxUSE_BASE #if wxUSE_GUI