X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..1be06faf7318abf88a35b299b90ceb2a49c0353b:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 79580ae5c1..87eda81fdb 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -6,9 +6,17 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "event.h" #endif @@ -22,21 +30,35 @@ #ifndef WX_PRECOMP #include "wx/defs.h" - #include "wx/control.h" - #include "wx/utils.h" #include "wx/app.h" - #include "wx/dc.h" + #include "wx/list.h" + + #if wxUSE_GUI + #include "wx/control.h" + #include "wx/utils.h" + #include "wx/dc.h" + #endif // wxUSE_GUI #endif #include "wx/event.h" -#include "wx/validate.h" -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) - IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) +#if wxUSE_GUI + #include "wx/validate.h" +#endif // wxUSE_GUI + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + +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) @@ -54,29 +76,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, 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, - #ifdef __SGI_CC__ - // stupid SGI compiler --- offer aug 98 - 0L } - #else // !SGI CC - NULL } - #endif // SGI/!SGI - }; -#endif // !USE_SHARED_LIBRARY +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- + +// To put pending event handlers +wxList *wxPendingEvents = (wxList *)NULL; + +#if wxUSE_THREADS + // protects wxPendingEvents list + wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL; +#endif + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxEvent +// ---------------------------------------------------------------------------- /* * General wxWindows events, covering @@ -91,13 +128,29 @@ wxEvent::wxEvent(int theId) { m_eventType = wxEVT_NULL; m_eventObject = (wxObject *) NULL; - m_eventHandle = (char *) NULL; m_timeStamp = 0; m_id = theId; m_skipped = FALSE; m_callbackUserData = (wxObject *) NULL; + m_isCommandEvent = FALSE; +} + +void wxEvent::CopyObject(wxObject& object_dest) const +{ + wxEvent *obj = (wxEvent *)&object_dest; + wxObject::CopyObject(object_dest); + + obj->m_eventType = m_eventType; + obj->m_eventObject = m_eventObject; + obj->m_timeStamp = m_timeStamp; + obj->m_id = m_id; + obj->m_skipped = m_skipped; + obj->m_callbackUserData = m_callbackUserData; + obj->m_isCommandEvent = m_isCommandEvent; } +#if wxUSE_GUI + /* * Command events * @@ -111,7 +164,34 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) m_extraLong = 0; m_commandInt = 0; m_id = theId; - m_commandString = (char *) NULL; + m_commandString = wxEmptyString; + m_isCommandEvent = TRUE; +} + +void wxCommandEvent::CopyObject(wxObject& obj_d) const +{ + wxCommandEvent *obj = (wxCommandEvent *)&obj_d; + + wxEvent::CopyObject(obj_d); + + obj->m_clientData = m_clientData; + obj->m_clientObject = m_clientObject; + obj->m_extraLong = m_extraLong; + obj->m_commandInt = m_commandInt; + obj->m_commandString = m_commandString; +} + +/* + * Notify events + */ + +void wxNotifyEvent::CopyObject(wxObject& obj_d) const +{ + wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d; + + wxEvent::CopyObject(obj_d); + + if (!m_bAllow) obj->Veto(); } /* @@ -128,6 +208,28 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType, m_commandInt = pos; } +/* + * ScrollWin events + */ + +wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, + int pos, + int orient) +{ + m_eventType = commandType; + m_extraLong = orient; + m_commandInt = pos; +} + +void wxScrollWinEvent::CopyObject(wxObject& obj_d) const +{ + wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d; + + wxEvent::CopyObject(obj_d); + + obj->m_extraLong = m_extraLong; + obj->m_commandInt = m_commandInt; +} /* * Mouse events @@ -148,6 +250,23 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType) m_y = 0; } +void wxMouseEvent::CopyObject(wxObject& obj_d) const +{ + wxMouseEvent *obj = (wxMouseEvent *)&obj_d; + + wxEvent::CopyObject(obj_d); + + obj->m_metaDown = m_metaDown; + obj->m_altDown = m_altDown; + obj->m_controlDown = m_controlDown; + obj->m_shiftDown = m_shiftDown; + obj->m_leftDown = m_leftDown; + obj->m_rightDown = m_rightDown; + obj->m_middleDown = m_middleDown; + obj->m_x = m_x; + obj->m_y = m_y; +} + // True if was a button dclick event (1 = left, 2 = middle, 3 = right) // or any button dclick event (but = -1) bool wxMouseEvent::ButtonDClick(int but) const @@ -163,7 +282,7 @@ bool wxMouseEvent::ButtonDClick(int but) const case 3: return RightDClick(); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::ButtonDClick"); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick")); } return FALSE; @@ -184,7 +303,7 @@ bool wxMouseEvent::ButtonDown(int but) const case 3: return RightDown(); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::ButtonDown"); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown")); } return FALSE; @@ -204,7 +323,7 @@ bool wxMouseEvent::ButtonUp(int but) const case 3: return RightUp(); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::ButtonUp"); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp")); } return FALSE; @@ -215,7 +334,7 @@ bool wxMouseEvent::Button(int but) const { switch (but) { case -1: - return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)) ; + return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1)); case 1: return (LeftDown() || LeftUp() || LeftDClick()); case 2: @@ -223,7 +342,7 @@ bool wxMouseEvent::Button(int but) const case 3: return (RightDown() || RightUp() || RightDClick()); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::Button"); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button")); } return FALSE; @@ -241,7 +360,7 @@ bool wxMouseEvent::ButtonIsDown(int but) const case 3: return RightIsDown(); default: - wxFAIL_MSG("invalid parameter in wxMouseEvent::ButtonIsDown"); + wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown")); } return FALSE; @@ -268,6 +387,163 @@ wxKeyEvent::wxKeyEvent(wxEventType type) m_metaDown = FALSE; m_altDown = FALSE; m_keyCode = 0; + m_scanCode = 0; +} + +void wxKeyEvent::CopyObject(wxObject& obj_d) const +{ + wxKeyEvent *obj = (wxKeyEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_x = m_x; + obj->m_y = m_y; + obj->m_keyCode = m_keyCode; + + obj->m_shiftDown = m_shiftDown; + obj->m_controlDown = m_controlDown; + obj->m_metaDown = m_metaDown; + obj->m_altDown = m_altDown; + obj->m_keyCode = m_keyCode; +} + + +/* + * Misc events + */ + +void wxSizeEvent::CopyObject(wxObject& obj_d) const +{ + wxSizeEvent *obj = (wxSizeEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_size = m_size; +} + +void wxMoveEvent::CopyObject(wxObject& obj_d) const +{ + wxMoveEvent *obj = (wxMoveEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_pos = m_pos; +} + +void wxEraseEvent::CopyObject(wxObject& obj_d) const +{ + wxEraseEvent *obj = (wxEraseEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_dc = m_dc; +} + +void wxActivateEvent::CopyObject(wxObject& obj_d) const +{ + wxActivateEvent *obj = (wxActivateEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_active = m_active; +} + +void wxMenuEvent::CopyObject(wxObject& obj_d) const +{ + wxMenuEvent *obj = (wxMenuEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_menuId = m_menuId; +} + +void wxCloseEvent::CopyObject(wxObject& obj_d) const +{ + wxCloseEvent *obj = (wxCloseEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_loggingOff = m_loggingOff; + obj->m_veto = m_veto; +#if WXWIN_COMPATIBILITY + obj->m_force = m_force; +#endif + obj->m_canVeto = m_canVeto; +} + +void wxShowEvent::CopyObject(wxObject& obj_d) const +{ + wxShowEvent *obj = (wxShowEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_show = m_show; +} + +void wxJoystickEvent::CopyObject(wxObject& obj_d) const +{ + wxJoystickEvent *obj = (wxJoystickEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_pos = m_pos; + obj->m_zPosition = m_zPosition; + obj->m_buttonChange = m_buttonChange; + obj->m_buttonState = m_buttonState; + obj->m_joyStick = m_joyStick; +} + +void wxDropFilesEvent::CopyObject(wxObject& obj_d) const +{ + wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_noFiles = m_noFiles; + obj->m_pos = m_pos; + // TODO: Problem with obj->m_files. It should be deallocated by the + // destructor of the event. +} + +void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const +{ + wxUpdateUIEvent *obj = (wxUpdateUIEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_checked = m_checked; + obj->m_enabled = m_enabled; + obj->m_text = m_text; + obj->m_setText = m_setText; + obj->m_setChecked = m_setChecked; + obj->m_setEnabled = m_setEnabled; +} + +void wxPaletteChangedEvent::CopyObject(wxObject &obj_d) const +{ + wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_changedWindow = m_changedWindow; +} + +void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const +{ + wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_paletteRealized = m_paletteRealized; +} + +wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) +{ + SetEventType(wxEVT_CREATE); + SetEventObject(win); +} + +wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) +{ + SetEventType(wxEVT_DESTROY); + SetEventObject(win); +} + +#endif // wxUSE_GUI + +void wxIdleEvent::CopyObject(wxObject& obj_d) const +{ + wxIdleEvent *obj = (wxIdleEvent *)&obj_d; + wxEvent::CopyObject(obj_d); + + obj->m_requestMore = m_requestMore; } /* @@ -280,6 +556,13 @@ wxEvtHandler::wxEvtHandler() m_previousHandler = (wxEvtHandler *) NULL; m_enabled = TRUE; m_dynamicEvents = (wxList *) NULL; + m_isWindow = FALSE; + m_pendingEvents = (wxList *) NULL; +#if wxUSE_THREADS +# if !defined(__VISAGECPP__) + m_eventsLocker = new wxCriticalSection; +# endif +#endif } wxEvtHandler::~wxEvtHandler() @@ -303,6 +586,107 @@ wxEvtHandler::~wxEvtHandler() } delete m_dynamicEvents; }; + + delete m_pendingEvents; + +#if wxUSE_THREADS +# if !defined(__VISAGECPP__) + delete m_eventsLocker; +# endif +#endif +} + +#if wxUSE_THREADS + +bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) +{ + // check that we are really in a child thread + wxASSERT_MSG( !wxThread::IsMain(), + wxT("use ProcessEvent() in main thread") ); + + AddPendingEvent(event); + + return TRUE; +} + +#endif // wxUSE_THREADS + +void wxEvtHandler::AddPendingEvent(wxEvent& event) +{ + // 1) Add event to list of pending events of this event handler + +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); +#endif + + if ( !m_pendingEvents ) + m_pendingEvents = new wxList; + + wxEvent *event2 = (wxEvent *)event.Clone(); + + m_pendingEvents->Append(event2); + +#if defined(__VISAGECPP__) + wxLEAVE_CRIT_SECT( m_eventsLocker); +#else + wxLEAVE_CRIT_SECT( *m_eventsLocker); +#endif + + // 2) Add this event handler to list of event handlers that + // have pending events. + + wxENTER_CRIT_SECT(*wxPendingEventsLocker); + + if ( !wxPendingEvents ) + 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(); +} + +void wxEvtHandler::ProcessPendingEvents() +{ +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); +#endif + + wxNode *node = m_pendingEvents->First(); + while ( node ) + { + wxEvent *event = (wxEvent *)node->Data(); + delete 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 + ProcessEvent(*event); + delete event; +#if defined(__VISAGECPP__) + wxENTER_CRIT_SECT( m_eventsLocker); +#else + wxENTER_CRIT_SECT( *m_eventsLocker); +#endif + + node = m_pendingEvents->First(); + } + +#if defined(__VISAGECPP__) + wxLEAVE_CRIT_SECT( m_eventsLocker); +#else + wxLEAVE_CRIT_SECT( *m_eventsLocker); +#endif } /* @@ -311,20 +695,35 @@ wxEvtHandler::~wxEvtHandler() bool wxEvtHandler::ProcessEvent(wxEvent& event) { - bool isWindow = IsKindOf(CLASSINFO(wxWindow)); +#if wxUSE_GUI + // check that our flag corresponds to reality + wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) ); +#endif // wxUSE_GUI // An event handler can be enabled or disabled if ( GetEvtHandlerEnabled() ) { - // Handle per-instance dynamic event tables first + +#if 0 +/* + What is this? When using GUI threads, a non main + threads can send an event and process it itself. + This breaks GTK's GUI threads, so please explain. +*/ + + // Check whether we are in a child thread. + if ( !wxThread::IsMain() ) + return ProcessThreadEvent(event); +#endif - if (SearchDynamicEventTable( event )) + // Handle per-instance dynamic event tables first + if ( m_dynamicEvents && SearchDynamicEventTable(event) ) return TRUE; // Then static per-class event tables - const wxEventTable *table = GetEventTable(); +#if wxUSE_GUI && wxUSE_VALIDATORS // Try the associated validator first, if this is a window. // Problem: if the event handler of the window has been replaced, // this wxEvtHandler may no longer be a window. @@ -333,24 +732,27 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) // THIS CAN BE CURED if PushEventHandler is used instead of // SetEventHandler, and then processing will be passed down the // chain of event handlers. - if ( isWindow ) + if (m_isWindow) { wxWindow *win = (wxWindow *)this; // Can only use the validator of the window which // is receiving the event - if ( (win == event.GetEventObject()) && - win->GetValidator() && - win->GetValidator()->ProcessEvent(event)) + if ( win == event.GetEventObject() ) { - return TRUE; + wxValidator *validator = win->GetValidator(); + if ( validator && validator->ProcessEvent(event) ) + { + return TRUE; + } } } +#endif // Search upwards through the inheritance hierarchy while (table) { - if (SearchEventTable((wxEventTable&)*table, event)) + if ( SearchEventTable((wxEventTable&)*table, event) ) return TRUE; table = table->baseTable; } @@ -363,26 +765,30 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) return TRUE; } +#if wxUSE_GUI // Carry on up the parent-child hierarchy, // but only if event is a command event: it wouldn't // make sense for a parent to receive a child's size event, for example - if ( isWindow && event.IsKindOf(CLASSINFO(wxCommandEvent)) ) + if ( m_isWindow && event.IsCommandEvent() ) { wxWindow *win = (wxWindow *)this; wxWindow *parent = win->GetParent(); if (parent && !parent->IsBeingDeleted()) - return win->GetParent()->GetEventHandler()->ProcessEvent(event); + return parent->GetEventHandler()->ProcessEvent(event); } +#endif // wxUSE_GUI // Last try - application object. - // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always swallow - // it. wxEVT_IDLE is sent explicitly to wxApp so it will be processed - // appropriately via SearchEventTable. - if ( wxTheApp && (this != wxTheApp) && (event.GetEventType() != wxEVT_IDLE) - ) + if ( wxTheApp && (this != wxTheApp) ) { - if ( wxTheApp->ProcessEvent(event) ) - return TRUE; + // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always + // swallow it. wxEVT_IDLE is sent explicitly to wxApp so it will be + // processed appropriately via SearchEventTable. + if ( event.GetEventType() != wxEVT_IDLE ) + { + if ( wxTheApp->ProcessEvent(event) ) + return TRUE; + } } return FALSE; @@ -390,35 +796,45 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) { - int i = 0; - int commandId = event.GetId(); + wxEventType eventType = event.GetEventType(); + int eventId = event.GetId(); - // BC++ doesn't like while (table.entries[i].m_fn) - -#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; - (this->*((wxEventFunction) (table.entries[i].m_fn)))(event); + if ( (tableId1 == -1) || + (tableId2 == -1 && eventId == tableId1) || + (tableId2 != -1 && + (eventId >= tableId1 && eventId <= tableId2)) ) + { + event.Skip(FALSE); + event.m_callbackUserData = entry.m_callbackUserData; - if ( event.GetSkipped() ) - return FALSE; - else - return TRUE; + (this->*((wxEventFunction) (entry.m_fn)))(event); + + return !event.GetSkipped(); + } } - i++; } + return FALSE; } @@ -440,9 +856,37 @@ void wxEvtHandler::Connect( int id, int lastId, m_dynamicEvents->Append( (wxObject*) entry ); } +bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, + wxObjectEventFunction func, + wxObject *userData ) +{ + if (!m_dynamicEvents) + return FALSE; + + wxNode *node = m_dynamicEvents->First(); + while (node) + { + wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); + if ((entry->m_id == id) && + ((entry->m_lastId == lastId) || (lastId == -1)) && + ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) && + ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) && + ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL))) + { + if (entry->m_callbackUserData) delete entry->m_callbackUserData; + m_dynamicEvents->DeleteNode( node ); + delete entry; + return TRUE; + } + node = node->Next(); + } + return FALSE; +} + bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) { - if (!m_dynamicEvents) return FALSE; + wxCHECK_MSG( m_dynamicEvents, FALSE, + wxT("caller should check that we have dynamic events") ); int commandId = event.GetId(); @@ -476,6 +920,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) return FALSE; }; +#if WXWIN_COMPATIBILITY bool wxEvtHandler::OnClose() { if (GetNextHandler()) @@ -483,3 +928,31 @@ bool wxEvtHandler::OnClose() else return FALSE; } +#endif // WXWIN_COMPATIBILITY + +#if wxUSE_GUI + +// Find a window with the focus, that is also a descendant of the given window. +// This is used to determine the window to initially send commands to. +wxWindow* wxFindFocusDescendant(wxWindow* ancestor) +{ + // Process events starting with the window with the focus, if any. + wxWindow* focusWin = wxWindow::FindFocus(); + wxWindow* win = focusWin; + + // Check if this is a descendant of this frame. + // If not, win will be set to NULL. + while (win) + { + if (win == ancestor) + break; + else + win = win->GetParent(); + } + if (win == (wxWindow*) NULL) + focusWin = (wxWindow*) NULL; + + return focusWin; +} + +#endif // wxUSE_GUI