X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5e27805de786dbb3976782ba2a3365c27256031..5dcf05ae082a2da39102dec13ab3ad4c483221c8:/src/common/event.cpp?ds=inline diff --git a/src/common/event.cpp b/src/common/event.cpp index c84e70f38c..402ee199c2 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -35,6 +35,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) +IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) @@ -370,17 +371,11 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) { int i = 0; int commandId = event.GetId(); - - while (table.entries[i].m_fn != -#ifdef __SGI_CC__ - 0L -#else - NULL -#endif - ) - { -// wxEventType eventType = (wxEventType) table.entries[i].m_eventType; + // BC++ doesn't like while (table.entries[i].m_fn) + + while (table.entries[i].m_fn != 0L) + { if ((event.GetEventType() == table.entries[i].m_eventType) && (table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1) (table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) || @@ -431,8 +426,6 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) { wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); -// wxEventType eventType = (wxEventType) entry->m_eventType; - if (entry->m_fn) { if ((event.GetEventType() == entry->m_eventType) && @@ -451,7 +444,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) else return TRUE; } - }; + } node = node->Next(); } return FALSE;