X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd0705221ed63f30e7d7be460ad743ea32da7c8e..52cd14b1c8c74a8d52d5a4ae9a31cfa1d123297a:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 3856f91736..ee22ca1062 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -44,17 +44,22 @@ #if wxUSE_GUI #include "wx/validate.h" +#if wxUSE_STOPWATCH + #include "wx/stopwatch.h" +#endif #endif // wxUSE_GUI // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) -IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) -IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) +#if wxUSE_BASE + IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) + IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) +#endif // wxUSE_BASE #if wxUSE_GUI + IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) @@ -77,7 +82,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxSetCursorEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent) @@ -86,8 +93,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent) #endif // wxUSE_GUI +#if wxUSE_BASE + const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; } @@ -113,8 +123,22 @@ wxList *wxPendingEvents = (wxList *)NULL; // 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) @@ -133,7 +157,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER) 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 @@ -174,6 +197,9 @@ DEFINE_EVENT_TYPE(wxEVT_CHAR_HOOK) 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) @@ -187,6 +213,7 @@ DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP) DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN) DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK) DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE) +DEFINE_EVENT_TYPE(wxEVT_SCROLL_ENDSCROLL) // Scroll events from wxWindow DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP) @@ -200,7 +227,9 @@ DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE) // System events DEFINE_EVENT_TYPE(wxEVT_SIZE) +DEFINE_EVENT_TYPE(wxEVT_SIZING) DEFINE_EVENT_TYPE(wxEVT_MOVE) +DEFINE_EVENT_TYPE(wxEVT_MOVING) DEFINE_EVENT_TYPE(wxEVT_CLOSE_WINDOW) DEFINE_EVENT_TYPE(wxEVT_END_SESSION) DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION) @@ -217,12 +246,12 @@ DEFINE_EVENT_TYPE(wxEVT_PAINT) DEFINE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND) DEFINE_EVENT_TYPE(wxEVT_NC_PAINT) DEFINE_EVENT_TYPE(wxEVT_PAINT_ICON) -DEFINE_EVENT_TYPE(wxEVT_MENU_CHAR) -DEFINE_EVENT_TYPE(wxEVT_MENU_INIT) +DEFINE_EVENT_TYPE(wxEVT_MENU_OPEN) +DEFINE_EVENT_TYPE(wxEVT_MENU_CLOSE) DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT) -DEFINE_EVENT_TYPE(wxEVT_POPUP_MENU_INIT) DEFINE_EVENT_TYPE(wxEVT_CONTEXT_MENU) DEFINE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_DISPLAY_CHANGED) DEFINE_EVENT_TYPE(wxEVT_SETTING_CHANGED) DEFINE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE) DEFINE_EVENT_TYPE(wxEVT_PALETTE_CHANGED) @@ -235,7 +264,6 @@ DEFINE_EVENT_TYPE(wxEVT_DRAW_ITEM) 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 @@ -254,6 +282,10 @@ DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP) #endif // !WXWIN_COMPATIBILITY_EVENT_TYPES +#endif // wxUSE_GUI + +#if wxUSE_BASE + // ============================================================================ // implementation // ============================================================================ @@ -293,9 +325,9 @@ int wxNewEventType() * */ -wxEvent::wxEvent(int theId) +wxEvent::wxEvent(int theId, wxEventType commandType ) { - m_eventType = wxEVT_NULL; + m_eventType = commandType; m_eventObject = (wxObject *) NULL; m_timeStamp = 0; m_id = theId; @@ -304,20 +336,20 @@ wxEvent::wxEvent(int theId) m_isCommandEvent = FALSE; } -void wxEvent::CopyObject(wxObject& object_dest) const +wxEvent::wxEvent(const wxEvent &src) + : wxObject() + , m_eventObject(src.m_eventObject) + , m_eventType(src.m_eventType) + , m_timeStamp(src.m_timeStamp) + , m_id(src.m_id) + , m_callbackUserData(src.m_callbackUserData) + , m_skipped(src.m_skipped) + , m_isCommandEvent(src.m_isCommandEvent) { - 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; } +#endif // wxUSE_BASE + #if wxUSE_GUI /* @@ -326,41 +358,92 @@ void wxEvent::CopyObject(wxObject& object_dest) const */ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) + : wxEvent(theId, commandType) { - m_eventType = commandType; m_clientData = (char *) NULL; m_clientObject = (wxClientData *) NULL; m_extraLong = 0; m_commandInt = 0; - m_id = theId; m_commandString = wxEmptyString; m_isCommandEvent = TRUE; } -void wxCommandEvent::CopyObject(wxObject& obj_d) const -{ - wxCommandEvent *obj = (wxCommandEvent *)&obj_d; +/* + * UI update events + */ - wxEvent::CopyObject(obj_d); +#if wxUSE_LONGLONG +wxLongLong wxUpdateUIEvent::sm_lastUpdate = 0; +#endif + +long wxUpdateUIEvent::sm_updateInterval = 0; - 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; +wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL; + +// Can we update? +bool wxUpdateUIEvent::CanUpdate(wxWindow* 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; + else if (sm_updateInterval == 0) + return TRUE; + else + { +#if wxUSE_STOPWATCH && wxUSE_LONGLONG + wxLongLong now = wxGetLocalTimeMillis(); + if (now > (sm_lastUpdate + sm_updateInterval)) + { + return TRUE; + } +#else + // 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 +// 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 } /* - * Notify events + * Idle events */ + +wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL; -void wxNotifyEvent::CopyObject(wxObject& obj_d) const +// Can we send an idle event? +bool wxIdleEvent::CanSend(wxWindow* win) { - wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d; - - wxEvent::CopyObject(obj_d); - - if (!m_bAllow) obj->Veto(); + // 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; } /* @@ -371,7 +454,7 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType, int id, int pos, int orient) - : wxCommandEvent(commandType, id) + : wxCommandEvent(commandType, id) { m_extraLong = orient; m_commandInt = pos; @@ -390,16 +473,6 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, 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 * @@ -422,21 +495,25 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType) m_linesPerAction = 0; } -void wxMouseEvent::CopyObject(wxObject& obj_d) const +void wxMouseEvent::Assign(const wxMouseEvent& event) { - 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; + m_eventType = event.m_eventType; + + m_x = event.m_x; + m_y = event.m_y; + + m_leftDown = event.m_leftDown; + m_middleDown = event.m_middleDown; + m_rightDown = event.m_rightDown; + + m_controlDown = event.m_controlDown; + m_shiftDown = event.m_shiftDown; + m_altDown = event.m_altDown; + m_metaDown = event.m_metaDown; + + m_wheelRotation = event.m_wheelRotation; + m_wheelDelta = event.m_wheelDelta; + m_linesPerAction = event.m_linesPerAction; } // True if was a button dclick event (1 = left, 2 = middle, 3 = right) @@ -563,7 +640,7 @@ wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const /* - * Keyboard events + * Keyboard event * */ @@ -576,140 +653,35 @@ wxKeyEvent::wxKeyEvent(wxEventType type) 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; +#if wxUSE_UNICODE + m_uniChar = 0; #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 +wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt) + : wxEvent(evt) { - wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + m_x = evt.m_x; + m_y = evt.m_y; - 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. -} + m_keyCode = evt.m_keyCode; -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; -} + m_controlDown = evt.m_controlDown; + m_shiftDown = evt.m_shiftDown; + m_altDown = evt.m_altDown; + m_metaDown = evt.m_metaDown; + m_scanCode = evt.m_scanCode; + m_rawCode = evt.m_rawCode; + m_rawFlags = evt.m_rawFlags; -void wxPaletteChangedEvent::CopyObject(wxObject &obj_d) const -{ - wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_changedWindow = m_changedWindow; +#if wxUSE_UNICODE + m_uniChar = evt.m_uniChar; +#endif } -void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const +long wxKeyEvent::KeyCode() const { - wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_paletteRealized = m_paletteRealized; + return m_keyCode; } wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) @@ -724,14 +696,6 @@ wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) SetEventObject(win); } -void wxIdleEvent::CopyObject(wxObject& obj_d) const -{ - wxIdleEvent *obj = (wxIdleEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_requestMore = m_requestMore; -} - wxChildFocusEvent::wxChildFocusEvent(wxWindow *win) : wxCommandEvent(wxEVT_CHILD_FOCUS) { @@ -744,6 +708,8 @@ wxChildFocusEvent::wxChildFocusEvent(wxWindow *win) // wxEvtHandler // ---------------------------------------------------------------------------- +#if wxUSE_BASE + /* * Event handler */ @@ -754,13 +720,15 @@ 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 + // no client data (yet) + m_clientData = NULL; + m_clientDataType = wxClientData_None; } wxEvtHandler::~wxEvtHandler() @@ -774,19 +742,19 @@ wxEvtHandler::~wxEvtHandler() if (m_dynamicEvents) { - wxNode *node = m_dynamicEvents->First(); - 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->Data(); + wxEventTableEntry *entry = (wxEventTableEntry*)*it; #else // !WXWIN_COMPATIBILITY_EVENT_TYPES - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); + 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->Next(); } delete m_dynamicEvents; }; @@ -797,7 +765,20 @@ wxEvtHandler::~wxEvtHandler() # if !defined(__VISAGECPP__) delete m_eventsLocker; # endif + + // Remove us from wxPendingEvents if necessary. + if(wxPendingEventsLocker) + wxENTER_CRIT_SECT(*wxPendingEventsLocker); + if ( wxPendingEvents ) { + wxPendingEvents->DeleteObject(this); + } + if(wxPendingEventsLocker) + wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); #endif + + // we only delete object data, not untyped + if ( m_clientDataType == wxClientData_Object ) + delete m_clientObject; } #if wxUSE_THREADS @@ -819,6 +800,13 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) { // 1) Add event to list of pending events of this event handler + wxEvent *eventCopy = event.Clone(); + + // we must be able to copy the events here so the event class must + // implement Clone() properly instead of just providing a NULL stab for it + wxCHECK_RET( eventCopy, + _T("events of this type aren't supposed to be posted") ); + #if defined(__VISAGECPP__) wxENTER_CRIT_SECT( m_eventsLocker); #else @@ -828,9 +816,7 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) if ( !m_pendingEvents ) m_pendingEvents = new wxList; - wxEvent *event2 = (wxEvent *)event.Clone(); - - m_pendingEvents->Append(event2); + m_pendingEvents->Append(eventCopy); #if defined(__VISAGECPP__) wxLEAVE_CRIT_SECT( m_eventsLocker); @@ -862,11 +848,11 @@ void wxEvtHandler::ProcessPendingEvents() wxENTER_CRIT_SECT( *m_eventsLocker); #endif - wxNode *node = m_pendingEvents->First(); + wxList::compatibility_iterator node = m_pendingEvents->GetFirst(); while ( node ) { - wxEvent *event = (wxEvent *)node->Data(); - delete node; + 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. @@ -883,7 +869,7 @@ void wxEvtHandler::ProcessPendingEvents() wxENTER_CRIT_SECT( *m_eventsLocker); #endif - node = m_pendingEvents->First(); + node = m_pendingEvents->GetFirst(); } #if defined(__VISAGECPP__) @@ -897,92 +883,61 @@ void wxEvtHandler::ProcessPendingEvents() * Event table stuff */ -bool wxEvtHandler::ProcessEvent(wxEvent& event) +bool wxEvtHandler::TryParent(wxEvent& event) { -#if wxUSE_GUI + if ( wxTheApp && (this != wxTheApp) ) + { + // 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; + } + } - // We have to use the actual window or processing events from wxWindowNative - // destructor won't work (we don't see the wxWindow class) -#ifdef __WXDEBUG__ - // check that our flag corresponds to reality - wxClassInfo* info = NULL; -#ifdef __WXUNIVERSAL__ -# if defined(__WXMSW__) - info = CLASSINFO(wxWindowMSW); -# elif defined(__WXGTK__) - info = CLASSINFO(wxWindowGTK); -# elif defined(__WXMGL__) - info = CLASSINFO(wxWindowMGL); -# elif defined(__WXMAC__) - info = CLASSINFO(wxWindowMac); -# elif defined(__WXMOTIF__) - info = CLASSINFO(wxWindowMotif); -# endif -#else - info = CLASSINFO(wxWindow); -#endif + return FALSE; +} - wxASSERT_MSG( m_isWindow == IsKindOf(info), - _T("this should [not] be a window but it is [not]") ); -#endif +bool wxEvtHandler::ProcessEvent(wxEvent& event) +{ + // allow the application to hook into event processing + if ( wxTheApp ) + { + int rc = wxTheApp->FilterEvent(event); + if ( rc != -1 ) + { + wxASSERT_MSG( rc == 1 || rc == 0, + _T("unexpected wxApp::FilterEvent return value") ); -#endif // wxUSE_GUI + return rc != 0; + } + //else: proceed normally + } // An event handler can be enabled or disabled if ( GetEvtHandlerEnabled() ) { - -#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 we have a validator, it has higher priority than our own event + // table +#if wxUSE_VALIDATORS + if ( TryValidator(event) ) + return TRUE; +#endif // wxUSE_VALIDATORS // 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. - // Therefore validators won't be processed if the handler - // has been replaced with SetEventHandler. - // THIS CAN BE CURED if PushEventHandler is used instead of - // SetEventHandler, and then processing will be passed down the - // chain of event handlers. - if (m_isWindow) - { - wxWindow *win = (wxWindow *)this; - - // Can only use the validator of the window which - // is receiving the event - if ( win == event.GetEventObject() ) - { - wxValidator *validator = win->GetValidator(); - if ( validator && validator->ProcessEvent(event) ) - { - return TRUE; - } - } - } -#endif - - // Search upwards through the inheritance hierarchy - while (table) + // 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; - table = table->baseTable; } } @@ -993,39 +948,9 @@ 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 ( m_isWindow && event.IsCommandEvent() ) - { - wxWindow *win = (wxWindow *)this; - - // also, don't propagate events beyond the first top level window: it - // doesn't make sense to process dialogs events in the parent frame - if ( !win->IsTopLevel() ) - { - wxWindow *parent = win->GetParent(); - if (parent && !parent->IsBeingDeleted()) - return parent->GetEventHandler()->ProcessEvent(event); - } - } -#endif // wxUSE_GUI - - // Last try - application object. - if ( wxTheApp && (this != wxTheApp) ) - { - // 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; + // Finally propagate the event upwards the window chain and/or to the + // application object as necessary + return TryParent(event); } bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) @@ -1075,7 +1000,8 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) 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; @@ -1086,44 +1012,47 @@ void wxEvtHandler::Connect( int id, int lastId, 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) m_dynamicEvents = new wxList; - m_dynamicEvents->Append( (wxObject*) entry ); + // Insert at the front of the list so most recent additions are found first + m_dynamicEvents->Insert( (wxObject*) entry ); } bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, wxObjectEventFunction func, - wxObject *userData ) + wxObject *userData, + wxEvtHandler* eventSink ) { if (!m_dynamicEvents) return FALSE; - wxNode *node = m_dynamicEvents->First(); + wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(); while (node) { #if WXWIN_COMPATIBILITY_EVENT_TYPES - wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); + wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData(); #else // !WXWIN_COMPATIBILITY_EVENT_TYPES - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData(); #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES 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_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; } - node = node->Next(); + node = node->GetNext(); } return FALSE; } @@ -1135,13 +1064,13 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) int commandId = event.GetId(); - wxNode *node = m_dynamicEvents->First(); + wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(); while (node) { #if WXWIN_COMPATIBILITY_EVENT_TYPES - wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); + wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData(); #else // !WXWIN_COMPATIBILITY_EVENT_TYPES - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData(); #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES if (entry->m_fn) @@ -1156,19 +1085,64 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) event.Skip(FALSE); event.m_callbackUserData = entry->m_callbackUserData; - (this->*((wxEventFunction) (entry->m_fn)))(event); - - if (event.GetSkipped()) - return FALSE; +#if !WXWIN_COMPATIBILITY_EVENT_TYPES + if (entry->m_eventSink) + ((entry->m_eventSink)->*((wxEventFunction) (entry->m_fn)))(event); else +#endif + (this->*((wxEventFunction) (entry->m_fn)))(event); + + if ( ! event.GetSkipped() ) return TRUE; } } - node = node->Next(); + node = node->GetNext(); } return FALSE; }; +void wxEvtHandler::DoSetClientObject( wxClientData *data ) +{ + wxASSERT_MSG( m_clientDataType != wxClientData_Void, + wxT("can't have both object and void client data") ); + + if ( m_clientObject ) + delete m_clientObject; + + m_clientObject = data; + m_clientDataType = wxClientData_Object; +} + +wxClientData *wxEvtHandler::DoGetClientObject() const +{ + // it's not an error to call GetClientObject() on a window which doesn't + // have client data at all - NULL will be returned + wxASSERT_MSG( m_clientDataType != wxClientData_Void, + wxT("this window doesn't have object client data") ); + + return m_clientObject; +} + +void wxEvtHandler::DoSetClientData( void *data ) +{ + wxASSERT_MSG( m_clientDataType != wxClientData_Object, + wxT("can't have both object and void client data") ); + + m_clientData = data; + m_clientDataType = wxClientData_Void; +} + +void *wxEvtHandler::DoGetClientData() const +{ + // it's not an error to call GetClientData() on a window which doesn't have + // client data at all - NULL will be returned + wxASSERT_MSG( m_clientDataType != wxClientData_Object, + wxT("this window doesn't have void client data") ); + + return m_clientData; +} + + #if WXWIN_COMPATIBILITY bool wxEvtHandler::OnClose() { @@ -1179,6 +1153,8 @@ bool wxEvtHandler::OnClose() } #endif // WXWIN_COMPATIBILITY +#endif // wxUSE_BASE + #if wxUSE_GUI // Find a window with the focus, that is also a descendant of the given window.