// 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
#endif
#include "wx/event.h"
+#include "wx/module.h"
#if wxUSE_GUI
#include "wx/validate.h"
+#if wxUSE_STOPWATCH
+ #include "wx/stopwatch.h"
+#endif
#endif // wxUSE_GUI
// ----------------------------------------------------------------------------
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)
const wxEventTable wxEvtHandler::sm_eventTable =
{ (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
+wxEventHashTable &wxEvtHandler::GetEventHashTable() const
+ { return wxEvtHandler::sm_eventHashTable; }
+
+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
// ----------------------------------------------------------------------------
// common event types are defined here, other event types are defined by the
// components which use them
+const wxEventType wxEVT_FIRST = 10000;
+const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
+
DEFINE_EVENT_TYPE(wxEVT_NULL)
+DEFINE_EVENT_TYPE(wxEVT_IDLE)
+DEFINE_EVENT_TYPE(wxEVT_SOCKET)
+
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+
DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED)
// Sockets and timers send events, too
-DEFINE_EVENT_TYPE(wxEVT_SOCKET)
DEFINE_EVENT_TYPE(wxEVT_TIMER)
// Mouse event types
DEFINE_EVENT_TYPE(wxEVT_NAVIGATION_KEY)
DEFINE_EVENT_TYPE(wxEVT_KEY_DOWN)
DEFINE_EVENT_TYPE(wxEVT_KEY_UP)
+#if wxUSE_HOTKEY
+DEFINE_EVENT_TYPE(wxEVT_HOTKEY)
+#endif
// Set cursor event
DEFINE_EVENT_TYPE(wxEVT_SET_CURSOR)
DEFINE_EVENT_TYPE(wxEVT_MEASURE_ITEM)
DEFINE_EVENT_TYPE(wxEVT_COMPARE_ITEM)
DEFINE_EVENT_TYPE(wxEVT_INIT_DIALOG)
-DEFINE_EVENT_TYPE(wxEVT_IDLE)
DEFINE_EVENT_TYPE(wxEVT_UPDATE_UI)
// Generic command events
#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
// ============================================================================
// implementation
// ============================================================================
// 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++;
}
// ----------------------------------------------------------------------------
/*
- * General wxWindows events, covering
+ * General wxWidgets events, covering
* all interesting things that might happen (button clicking, resizing,
* setting text in widgets, etc.).
*
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;
}
wxEvent::wxEvent(const wxEvent &src)
, 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)
{
*/
wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
- : wxEvent(theId, commandType)
+ : wxEvent(theId, commandType)
{
m_clientData = (char *) NULL;
m_clientObject = (wxClientData *) NULL;
m_extraLong = 0;
m_commandInt = 0;
- m_commandString = wxEmptyString;
- m_isCommandEvent = TRUE;
+ m_isCommandEvent = true;
+
+ // the command events are propagated upwards by default
+ m_propagationLevel = wxEVENT_PROPAGATE_MAX;
+}
+
+/*
+ * UI update events
+ */
+
+#if wxUSE_LONGLONG
+wxLongLong wxUpdateUIEvent::sm_lastUpdate = 0;
+#endif
+
+long wxUpdateUIEvent::sm_updateInterval = 0;
+
+wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
+
+// Can we update?
+bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)
+{
+ // Don't update if we've switched global updating off
+ // and this window doesn't support updates.
+ if (win &&
+ (GetMode() == wxUPDATE_UI_PROCESS_SPECIFIED &&
+ ((win->GetExtraStyle() & wxWS_EX_PROCESS_UI_UPDATES) == 0)))
+ return false;
+
+ if (sm_updateInterval == -1)
+ return false;
+
+ if (sm_updateInterval == 0)
+ return true;
+
+#if wxUSE_STOPWATCH && wxUSE_LONGLONG
+ 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;
+#endif
+}
+
+// Reset the update time to provide a delay until the next
+// time we should update
+void wxUpdateUIEvent::ResetUpdateTime()
+{
+#if wxUSE_STOPWATCH && wxUSE_LONGLONG
+ if (sm_updateInterval > 0)
+ {
+ wxLongLong now = wxGetLocalTimeMillis();
+ if (now > (sm_lastUpdate + sm_updateInterval))
+ {
+ sm_lastUpdate = now;
+ }
+ }
+#endif
+}
+
+/*
+ * Idle events
+ */
+
+wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL;
+
+// Can we send an idle event?
+bool wxIdleEvent::CanSend(wxWindow* win)
+{
+ // Don't update if we've switched global updating off
+ // and this window doesn't support updates.
+ if (win &&
+ (GetMode() == wxIDLE_PROCESS_SPECIFIED &&
+ ((win->GetExtraStyle() & wxWS_EX_PROCESS_IDLE) == 0)))
+ return false;
+
+ return true;
}
/*
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;
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);
+
+ case wxMOUSE_BTN_LEFT:
+ return LeftDown() || LeftUp() || LeftDClick();
- return FALSE;
+ 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
}
}
- return -1;
+ return wxMOUSE_BTN_NONE;
}
// Find the logical position of the event given the DC
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
#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
// ----------------------------------------------------------------------------
-// wxEvtHandler
+// wxEventHashTable
// ----------------------------------------------------------------------------
-#if wxUSE_BASE
+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)
+{
+ 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++)
+ {
+ EventTypeTablePointer eTTnode = m_eventTypeTable[i];
+ if (eTTnode)
+ {
+ delete eTTnode;
+ }
+ }
+
+ // 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)
+{
+ if (m_rebuildHash)
+ {
+ InitHashTable();
+ 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];
+ if (eTTnode && eTTnode->eventType == eventType)
+ {
+ // Now start the search for an event handler
+ // that can handle an event with the given ID.
+ const wxEventTableEntryPointerArray&
+ eventEntryTable = eTTnode->eventEntryTable;
+
+ const size_t count = eventEntryTable.GetCount();
+ for (size_t n = 0; n < count; n++)
+ {
+ if ( wxEvtHandler::
+ ProcessEventIfMatches(*eventEntryTable[n], self, event) )
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+void wxEventHashTable::InitHashTable()
+{
+ // Loop over the event tables and all its base tables.
+ const wxEventTable *table = &m_table;
+ while (table)
+ {
+ // Retrieve all valid event handler entries
+ const wxEventTableEntry *entry = table->entries;
+ while (entry->m_fn != 0)
+ {
+ // Add the event entry in the Hash.
+ AddEntry(*entry);
+
+ entry++;
+ }
+
+ table = table->baseTable;
+ }
+
+ // Lets free some memory.
+ size_t i;
+ for(i = 0; i < m_size; i++)
+ {
+ EventTypeTablePointer eTTnode = m_eventTypeTable[i];
+ if (eTTnode)
+ {
+ eTTnode->eventEntryTable.Shrink();
+ }
+ }
+}
+
+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;
+
+ if (eTTnode)
+ {
+ if (eTTnode->eventType != entry.m_eventType)
+ {
+ // Resize the table!
+ GrowEventTypeTable();
+ // Try again to add it.
+ AddEntry(entry);
+ return;
+ }
+ }
+ else
+ {
+ eTTnode = new EventTypeTable;
+ eTTnode->eventType = entry.m_eventType;
+ *peTTnode = eTTnode;
+ }
+
+ // Fill all hash entries between entry.m_id and entry.m_lastId...
+ eTTnode->eventEntryTable.Add(&entry);
+}
+
+void wxEventHashTable::AllocEventTypeTable(size_t size)
+{
+ m_eventTypeTable = new EventTypeTablePointer[size];
+ memset((void *)m_eventTypeTable, 0, sizeof(EventTypeTablePointer)*size);
+ m_size = size;
+}
+
+void wxEventHashTable::GrowEventTypeTable()
+{
+ size_t oldSize = m_size;
+ EventTypeTablePointer *oldEventTypeTable = m_eventTypeTable;
+
+ // TODO: Search the most optimal grow sequence
+ AllocEventTypeTable(/* GetNextPrime(oldSize) */oldSize*2+1);
+
+ for ( size_t i = 0; i < oldSize; /* */ )
+ {
+ EventTypeTablePointer eTToldNode = oldEventTypeTable[i];
+ if (eTToldNode)
+ {
+ EventTypeTablePointer *peTTnode = &m_eventTypeTable[eTToldNode->eventType % m_size];
+ EventTypeTablePointer eTTnode = *peTTnode;
+
+ // Check for collision, we don't want any.
+ if (eTTnode)
+ {
+ GrowEventTypeTable();
+ continue; // Don't increment the counter,
+ // as we still need to add this element.
+ }
+ else
+ {
+ // Get the old value and put it in the new table.
+ *peTTnode = oldEventTypeTable[i];
+ }
+ }
+
+ i++;
+ }
+
+ delete[] oldEventTypeTable;
+}
+
+
+// ----------------------------------------------------------------------------
+// wxEvtHandler
+// ----------------------------------------------------------------------------
/*
* Event handler
{
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
if (m_dynamicEvents)
{
- wxNode *node = m_dynamicEvents->GetFirst();
- while (node)
+ wxList::iterator it = m_dynamicEvents->begin(),
+ en = m_dynamicEvents->end();
+ for (;it != en; ++it)
{
#if WXWIN_COMPATIBILITY_EVENT_TYPES
- wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData();
+ wxEventTableEntry *entry = (wxEventTableEntry*)*it;
#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
- wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if (entry->m_callbackUserData)
delete entry->m_callbackUserData;
delete entry;
- node = node->GetNext();
}
delete m_dynamicEvents;
};
# if !defined(__VISAGECPP__)
delete m_eventsLocker;
# endif
-
+
// Remove us from wxPendingEvents if necessary.
if(wxPendingEventsLocker)
wxENTER_CRIT_SECT(*wxPendingEventsLocker);
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)
void wxEvtHandler::ProcessPendingEvents()
{
+ // this method is only called by wxApp if this handler does have pending
+ // events
+ wxCHECK_RET( m_pendingEvents,
+ wxT("Please call wxApp::ProcessPendingEvents() instead") );
+
#if defined(__VISAGECPP__)
wxENTER_CRIT_SECT( m_eventsLocker);
#else
wxENTER_CRIT_SECT( *m_eventsLocker);
#endif
- wxNode *node = m_pendingEvents->GetFirst();
+ wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
while ( node )
{
wxEvent *event = (wxEvent *)node->GetData();
- delete node;
+ m_pendingEvents->Erase(node);
// In ProcessEvent, new events might get added and
// we can safely leave the crtical section here.
#endif
}
-#endif // wxUSE_BASE
-
/*
* 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 == -1) ||
+ (tableId2 == -1 && tableId1 == event.GetId()) ||
+ (tableId2 != -1 &&
+ (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)
{
if ( event.GetEventType() != wxEVT_IDLE )
{
if ( wxTheApp->ProcessEvent(event) )
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
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 (and search upwards through the
- // inheritance hierarchy)
- for ( const wxEventTable *table = GetEventTable();
- table;
- table = table->baseTable )
- {
- if ( SearchEventTable((wxEventTable&)*table, event) )
- return TRUE;
- }
+ // Then static per-class event tables
+ if ( GetEventHashTable().HandleEvent(event, this) )
+ 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
return TryParent(event);
}
-#if wxUSE_BASE
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,
int eventType,
wxObjectEventFunction func,
- wxObject *userData )
+ wxObject *userData,
+ wxEvtHandler* eventSink )
{
#if WXWIN_COMPATIBILITY_EVENT_TYPES
wxEventTableEntry *entry = new wxEventTableEntry;
entry->m_callbackUserData = userData;
#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
wxDynamicEventTableEntry *entry =
- new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
+ new wxDynamicEventTableEntry(eventType, id, lastId, func, userData, eventSink);
#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if (!m_dynamicEvents)
bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
wxObjectEventFunction func,
- wxObject *userData )
+ wxObject *userData,
+ wxEvtHandler* eventSink )
{
if (!m_dynamicEvents)
- return FALSE;
+ return false;
- wxNode *node = m_dynamicEvents->GetFirst();
+ wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
while (node)
{
#if WXWIN_COMPATIBILITY_EVENT_TYPES
((entry->m_lastId == lastId) || (lastId == -1)) &&
((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
+ ((entry->m_eventSink == eventSink) || (eventSink == (wxEvtHandler*)NULL)) &&
((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
{
if (entry->m_callbackUserData)
delete entry->m_callbackUserData;
- m_dynamicEvents->DeleteNode( node );
+ 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();
-
- wxNode *node = m_dynamicEvents->GetFirst();
+ 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.m_eventType == 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;
-
- (this->*((wxEventFunction) (entry->m_fn)))(event);
+ wxEvtHandler *handler =
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+ entry->m_eventSink ? entry->m_eventSink
+ :
+#endif
+ 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 )
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
projects / wxWidgets.git / blobdiff