// wxWin macros
// ----------------------------------------------------------------------------
- IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
- IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
- #if wxUSE_GUI
- IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
- #endif // wxUSE_GUI
+#if wxUSE_GUI
+ IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
+#endif // wxUSE_GUI
- const wxEventTable *wxEvtHandler::GetEventTable() const
- { return &wxEvtHandler::sm_eventTable; }
+const wxEventTable *wxEvtHandler::GetEventTable() const
+ { return &wxEvtHandler::sm_eventTable; }
- const wxEventTable wxEvtHandler::sm_eventTable =
- { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
+const wxEventTable wxEvtHandler::sm_eventTable =
+ { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
- const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
- { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } };
+const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
+ { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } };
// ----------------------------------------------------------------------------
}
wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
- : wxEvent()
{
SetEventType(wxEVT_CREATE);
SetEventObject(win);
}
wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
- : wxEvent()
{
SetEventType(wxEVT_DESTROY);
SetEventObject(win);
wxPendingEvents = new wxList;
wxPendingEvents->Append(this);
+ wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+
// 3) Inform the system that new pending events are somwehere,
// and that these should be processed in idle time.
-
wxWakeUpIdle();
-
- wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
}
void wxEvtHandler::ProcessPendingEvents()
delete node;
// In ProcessEvent, new events might get added and
- // we can safely leave the crtical section here.
+ // we can safely leave the crtical section here.
#if defined(__VISAGECPP__)
wxLEAVE_CRIT_SECT( m_eventsLocker);
#else
bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
{
- int i = 0;
- int commandId = event.GetId();
-
- // BC++ doesn't like while (table.entries[i].m_fn)
+ wxEventType eventType = event.GetEventType();
+ int eventId = event.GetId();
-#ifdef __SC__
- while (table.entries[i].m_fn != 0)
+ // BC++ doesn't like testing for m_fn without != 0
+ 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
- while (table.entries[i].m_fn != 0L)
+ const wxEventTableEntry& entry = table.entries[i];
#endif
- {
- 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) ||
- (table.entries[i].m_lastId != -1 &&
- (commandId >= table.entries[i].m_id && commandId <= table.entries[i].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 ( eventType == entry.m_eventType )
{
- event.Skip(FALSE);
- event.m_callbackUserData = table.entries[i].m_callbackUserData;
+ 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) (table.entries[i].m_fn)))(event);
+ (this->*((wxEventFunction) (entry.m_fn)))(event);
- if ( event.GetSkipped() )
- return FALSE;
- else
- return TRUE;
+ return !event.GetSkipped();
+ }
}
- i++;
}
+
return FALSE;
}
projects / wxWidgets.git / blobdiff