X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19193a2c85987b595932957e73013e7ea100f0e8..48a1108eb87970373e1b1d5debeeaedd8d1916ea:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 221360d838..f33787b099 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: event.cpp +// Name: src/common/event.cpp // Purpose: Event classes // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "event.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,30 +24,35 @@ #pragma hdrstop #endif +#include "wx/event.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" - #include "wx/app.h" #include "wx/list.h" + #include "wx/app.h" + #include "wx/utils.h" #if wxUSE_GUI #include "wx/control.h" - #include "wx/utils.h" #include "wx/dc.h" + #include "wx/textctrl.h" + #include "wx/validate.h" #endif // wxUSE_GUI #endif -#include "wx/event.h" +#include "wx/module.h" -#if wxUSE_GUI - #include "wx/validate.h" -#endif // wxUSE_GUI +#if wxUSE_GUI && wxUSE_STOPWATCH + #include "wx/stopwatch.h" +#endif // wxUSE_GUI && wxUSE_STOPWATCH // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) -IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) +#if wxUSE_BASE + IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) + IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) +#endif // wxUSE_BASE #if wxUSE_GUI IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) @@ -77,26 +78,55 @@ IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) 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(wxNavigationKeyEvent, wxEvent) 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) IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxClipboardTextEvent, wxCommandEvent) #endif // wxUSE_GUI +#if wxUSE_BASE + const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; } 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 // ---------------------------------------------------------------------------- @@ -114,7 +144,21 @@ 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 +177,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 +217,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 +233,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_CHANGED) // Scroll events from wxWindow DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP) @@ -200,10 +247,13 @@ 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) +DEFINE_EVENT_TYPE(wxEVT_HIBERNATE) DEFINE_EVENT_TYPE(wxEVT_ACTIVATE_APP) DEFINE_EVENT_TYPE(wxEVT_POWER) DEFINE_EVENT_TYPE(wxEVT_ACTIVATE) @@ -217,12 +267,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,9 +285,13 @@ 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) +// Clipboard events +DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_COPY) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_CUT) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_PASTE) + // Generic command events // Note: a click is a higher-level event than button down/up DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_CLICK) @@ -254,6 +308,10 @@ DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP) #endif // !WXWIN_COMPATIBILITY_EVENT_TYPES +#endif // wxUSE_GUI + +#if wxUSE_BASE + // ============================================================================ // implementation // ============================================================================ @@ -267,16 +325,6 @@ int wxNewEventType() // 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++; } @@ -285,7 +333,7 @@ int wxNewEventType() // ---------------------------------------------------------------------------- /* - * General wxWindows events, covering + * General wxWidgets events, covering * all interesting things that might happen (button clicking, resizing, * setting text in widgets, etc.). * @@ -293,31 +341,33 @@ 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; - m_skipped = FALSE; + m_skipped = false; m_callbackUserData = (wxObject *) NULL; - m_isCommandEvent = FALSE; + m_isCommandEvent = false; + m_propagationLevel = wxEVENT_PROPAGATE_NONE; } -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_propagationLevel(src.m_propagationLevel) + , 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 /* @@ -325,42 +375,123 @@ void wxEvent::CopyObject(wxObject& object_dest) const * */ +#ifdef __VISUALC__ + // 'this' : used in base member initializer list (for m_commandString) + #pragma warning(disable:4355) +#endif + wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId) + : wxEvent(theId, commandType) +#if WXWIN_COMPATIBILITY_2_4 + , m_commandString(this) +#endif { - 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; -} + m_isCommandEvent = true; -void wxCommandEvent::CopyObject(wxObject& obj_d) const -{ - wxCommandEvent *obj = (wxCommandEvent *)&obj_d; + // the command events are propagated upwards by default + m_propagationLevel = wxEVENT_PROPAGATE_MAX; +} - wxEvent::CopyObject(obj_d); +#ifdef __VISUALC__ + #pragma warning(default:4355) +#endif - 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; +wxString wxCommandEvent::GetString() const +{ + if(m_eventType != wxEVT_COMMAND_TEXT_UPDATED || !m_eventObject) + return m_cmdString; + else + { +#if wxUSE_TEXTCTRL + wxTextCtrl *txt = wxDynamicCast(m_eventObject, wxTextCtrl); + if(txt) + return txt->GetValue(); + else +#endif // wxUSE_TEXTCTRL + return m_cmdString; + } } /* - * Notify events + * UI update events */ -void wxNotifyEvent::CopyObject(wxObject& obj_d) const +#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) { - wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d; + // 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; + } - wxEvent::CopyObject(obj_d); + 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 +} - if (!m_bAllow) obj->Veto(); +// 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; } /* @@ -371,7 +502,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 +521,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 * @@ -408,13 +529,13 @@ void wxScrollWinEvent::CopyObject(wxObject& obj_d) const 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; @@ -422,123 +543,141 @@ 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) -// 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); - return FALSE; + case wxMOUSE_BTN_LEFT: + return LeftDown() || LeftUp() || LeftDClick(); + + 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 @@ -551,7 +690,7 @@ int wxMouseEvent::GetButton() const } } - return -1; + return wxMOUSE_BTN_NONE; } // Find the logical position of the event given the DC @@ -563,182 +702,296 @@ wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const /* - * Keyboard events + * Keyboard event * */ 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 + m_uniChar = 0; +#endif } -void wxKeyEvent::CopyObject(wxObject& obj_d) const +wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt) + : wxEvent(evt) { - 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; -} - + m_x = evt.m_x; + m_y = evt.m_y; -/* - * Misc events - */ + m_keyCode = evt.m_keyCode; -void wxSizeEvent::CopyObject(wxObject& obj_d) const -{ - wxSizeEvent *obj = (wxSizeEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + 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; - obj->m_size = m_size; +#if wxUSE_UNICODE + m_uniChar = evt.m_uniChar; +#endif } -void wxMoveEvent::CopyObject(wxObject& obj_d) const +#if WXWIN_COMPATIBILITY_2_6 +long wxKeyEvent::KeyCode() const { - wxMoveEvent *obj = (wxMoveEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_pos = m_pos; + return m_keyCode; } +#endif // WXWIN_COMPATIBILITY_2_6 -void wxEraseEvent::CopyObject(wxObject& obj_d) const +wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) { - wxEraseEvent *obj = (wxEraseEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_dc = m_dc; + SetEventType(wxEVT_CREATE); + SetEventObject(win); } -void wxActivateEvent::CopyObject(wxObject& obj_d) const +wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) { - wxActivateEvent *obj = (wxActivateEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_active = m_active; + SetEventType(wxEVT_DESTROY); + SetEventObject(win); } -void wxMenuEvent::CopyObject(wxObject& obj_d) const +wxChildFocusEvent::wxChildFocusEvent(wxWindow *win) + : wxCommandEvent(wxEVT_CHILD_FOCUS) { - wxMenuEvent *obj = (wxMenuEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_menuId = m_menuId; + SetEventObject(win); } -void wxCloseEvent::CopyObject(wxObject& obj_d) const +// ---------------------------------------------------------------------------- +// wxHelpEvent +// ---------------------------------------------------------------------------- + +/* static */ +wxHelpEvent::Origin wxHelpEvent::GuessOrigin(Origin origin) { - wxCloseEvent *obj = (wxCloseEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + if ( origin == Origin_Unknown ) + { + // assume that the event comes from the help button if it's not from + // keyboard and that pressing F1 always results in the help event + origin = wxGetKeyState(WXK_F1) ? Origin_Keyboard : Origin_HelpButton; + } - obj->m_loggingOff = m_loggingOff; - obj->m_veto = m_veto; -#if WXWIN_COMPATIBILITY - obj->m_force = m_force; -#endif - obj->m_canVeto = m_canVeto; + return origin; } -void wxShowEvent::CopyObject(wxObject& obj_d) const +#endif // wxUSE_GUI + + +#if wxUSE_BASE + +// ---------------------------------------------------------------------------- +// wxEventHashTable +// ---------------------------------------------------------------------------- + +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) { - wxShowEvent *obj = (wxShowEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + AllocEventTypeTable(EVENT_TYPE_TABLE_INIT_SIZE); - obj->m_show = m_show; + m_next = sm_first; + if (m_next) + m_next->m_previous = this; + sm_first = this; } -void wxJoystickEvent::CopyObject(wxObject& obj_d) const +wxEventHashTable::~wxEventHashTable() { - 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; + 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 wxDropFilesEvent::CopyObject(wxObject& obj_d) const +void wxEventHashTable::Clear() { - wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + size_t i; + for(i = 0; i < m_size; i++) + { + EventTypeTablePointer eTTnode = m_eventTypeTable[i]; + if (eTTnode) + { + delete eTTnode; + } + } - 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. + // 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; } -void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const +// Clear all tables +void wxEventHashTable::ClearAll() { - 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; + wxEventHashTable* table = sm_first; + while (table) + { + table->Clear(); + table = table->m_next; + } } -void wxPaletteChangedEvent::CopyObject(wxObject &obj_d) const +bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self) { - wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + if (m_rebuildHash) + { + InitHashTable(); + m_rebuildHash = false; + } - obj->m_changedWindow = m_changedWindow; + 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 wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const +void wxEventHashTable::InitHashTable() { - wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + // 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; + } - obj->m_paletteRealized = m_paletteRealized; + // Lets free some memory. + size_t i; + for(i = 0; i < m_size; i++) + { + EventTypeTablePointer eTTnode = m_eventTypeTable[i]; + if (eTTnode) + { + eTTnode->eventEntryTable.Shrink(); + } + } } -wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) +void wxEventHashTable::AddEntry(const wxEventTableEntry &entry) { - SetEventType(wxEVT_CREATE); - SetEventObject(win); + // 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); } -wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) +void wxEventHashTable::AllocEventTypeTable(size_t size) { - SetEventType(wxEVT_DESTROY); - SetEventObject(win); + m_eventTypeTable = new EventTypeTablePointer[size]; + memset((void *)m_eventTypeTable, 0, sizeof(EventTypeTablePointer)*size); + m_size = size; } -void wxIdleEvent::CopyObject(wxObject& obj_d) const +void wxEventHashTable::GrowEventTypeTable() { - wxIdleEvent *obj = (wxIdleEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + size_t oldSize = m_size; + EventTypeTablePointer *oldEventTypeTable = m_eventTypeTable; - obj->m_requestMore = m_requestMore; -} + // TODO: Search the most optimal grow sequence + AllocEventTypeTable(/* GetNextPrime(oldSize) */oldSize*2+1); -wxChildFocusEvent::wxChildFocusEvent(wxWindow *win) - : wxCommandEvent(wxEVT_CHILD_FOCUS) -{ - SetEventObject(win); + 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; } -#endif // wxUSE_GUI // ---------------------------------------------------------------------------- // wxEvtHandler @@ -752,9 +1005,8 @@ wxEvtHandler::wxEvtHandler() { m_nextHandler = (wxEvtHandler *) NULL; m_previousHandler = (wxEvtHandler *) NULL; - m_enabled = TRUE; + m_enabled = true; m_dynamicEvents = (wxList *) NULL; - m_isWindow = FALSE; m_pendingEvents = (wxList *) NULL; #if wxUSE_THREADS # if !defined(__VISAGECPP__) @@ -777,29 +1029,42 @@ 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; }; + if (m_pendingEvents) + m_pendingEvents->DeleteContents(true); delete m_pendingEvents; #if wxUSE_THREADS # if !defined(__VISAGECPP__) delete m_eventsLocker; # endif + + // Remove us from wxPendingEvents if necessary. + if(wxPendingEventsLocker) + wxENTER_CRIT_SECT(*wxPendingEventsLocker); + if ( wxPendingEvents ) + { + // Delete all occurences of this from the list of pending events + while (wxPendingEvents->DeleteObject(this)) { } // Do nothing + } + if(wxPendingEventsLocker) + wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); #endif // we only delete object data, not untyped @@ -817,7 +1082,15 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) AddPendingEvent(event); - return TRUE; + return true; +} + +void wxEvtHandler::ClearEventLocker() +{ +#if !defined(__VISAGECPP__) + delete m_eventsLocker; + m_eventsLocker = NULL; +#endif } #endif // wxUSE_THREADS @@ -826,24 +1099,21 @@ 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 + 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") ); + + wxENTER_CRIT_SECT( Lock() ); if ( !m_pendingEvents ) m_pendingEvents = new wxList; - wxEvent *event2 = (wxEvent *)event.Clone(); + m_pendingEvents->Append(eventCopy); - m_pendingEvents->Append(event2); - -#if defined(__VISAGECPP__) - wxLEAVE_CRIT_SECT( m_eventsLocker); -#else - wxLEAVE_CRIT_SECT( *m_eventsLocker); -#endif + wxLEAVE_CRIT_SECT( Lock() ); // 2) Add this event handler to list of event handlers that // have pending events. @@ -856,174 +1126,97 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); - // 3) Inform the system that new pending events are somwehere, + // 3) Inform the system that new pending events are somewhere, // 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 ) + // this method is only called by wxApp if this handler does have pending + // events + wxCHECK_RET( m_pendingEvents, + wxT("Please call wxApp::ProcessPendingEvents() instead") ); + + wxENTER_CRIT_SECT( Lock() ); + + // we leave the loop once we have processed all events that were present at + // the start of ProcessPendingEvents because otherwise we could get into + // infinite loop if the pending event handler execution resulted in another + // event being posted + size_t n = m_pendingEvents->size(); + for ( wxList::compatibility_iterator node = m_pendingEvents->GetFirst(); + node; + node = m_pendingEvents->GetFirst() ) { - wxEvent *event = (wxEvent *)node->Data(); - delete node; + wxEvent *event = (wxEvent *)node->GetData(); + + // It's importan we remove event from list before processing it. + // Else a nested event loop, for example from a modal dialog, might + // process the same event again. + m_pendingEvents->Erase(node); + + wxLEAVE_CRIT_SECT( Lock() ); - // 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(); + wxENTER_CRIT_SECT( Lock() ); + + if ( --n == 0 ) + break; } -#if defined(__VISAGECPP__) - wxLEAVE_CRIT_SECT( m_eventsLocker); -#else - wxLEAVE_CRIT_SECT( *m_eventsLocker); -#endif + wxLEAVE_CRIT_SECT( Lock() ); } /* * Event table stuff */ - -bool wxEvtHandler::ProcessEvent(wxEvent& event) +/* static */ bool +wxEvtHandler::ProcessEventIfMatches(const wxEventTableEntryBase& entry, + wxEvtHandler *handler, + wxEvent& event) { -#if wxUSE_GUI - - // 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(__WXPM__) - info = CLASSINFO(wxWindowOS2); -# elif defined(__WXMAC__) - info = CLASSINFO(wxWindowMac); -# elif defined(__WXMOTIF__) - info = CLASSINFO(wxWindowMotif); -# endif -#else - info = CLASSINFO(wxWindow); -#endif - - wxASSERT_MSG( m_isWindow == IsKindOf(info), - _T("this should [not] be a window but it is [not]") ); -#endif - -#endif // wxUSE_GUI - - // An event handler can be enabled or disabled - if ( GetEvtHandlerEnabled() ) + 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 == wxID_ANY) || + (tableId2 == wxID_ANY && tableId1 == event.GetId()) || + (tableId2 != wxID_ANY && + (event.GetId() >= tableId1 && event.GetId() <= tableId2))) { + event.Skip(false); + event.m_callbackUserData = entry.m_callbackUserData; -#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 - - // 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) +#if wxUSE_EXCEPTIONS + if ( wxTheApp ) { - 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; - } - } + // 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); } -#endif - - // Search upwards through the inheritance hierarchy - while (table) + else +#endif // wxUSE_EXCEPTIONS { - if ( SearchEventTable((wxEventTable&)*table, event) ) - return TRUE; - table = table->baseTable; + // no need for an extra virtual function call + (handler->*((wxEventFunction) (entry.m_fn)))(event); } - } - // Try going down the event handler chain - if ( GetNextHandler() ) - { - if ( GetNextHandler()->ProcessEvent(event) ) - return TRUE; + if (!event.GetSkipped()) + 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; - - // honour the requests to stop propagation at this window: this is - // used by the dialogs, for example, to prevent processing the events - // from the dialog controls in the parent frame which rarely, if ever, - // makes sense - if ( !(win->GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) ) - { - wxWindow *parent = win->GetParent(); - if ( parent && !parent->IsBeingDeleted() ) - return parent->GetEventHandler()->ProcessEvent(event); - } - } -#endif // wxUSE_GUI + return false; +} - // Last try - application object. +bool wxEvtHandler::TryParent(wxEvent& event) +{ if ( wxTheApp && (this != wxTheApp) ) { // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always @@ -1032,61 +1225,80 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) if ( event.GetEventType() != wxEVT_IDLE ) { if ( wxTheApp->ProcessEvent(event) ) - return TRUE; + return true; } } - return FALSE; + return false; } -bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) +bool wxEvtHandler::ProcessEvent(wxEvent& event) { - wxEventType eventType = event.GetEventType(); - int eventId = event.GetId(); + // 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") ); - // BC++ doesn't like testing for m_fn without != 0 - for ( int i = 0; table.entries[i].m_fn != 0; i++ ) + return rc != 0; + } + //else: proceed normally + } + + // An event handler can be enabled or disabled + if ( GetEvtHandlerEnabled() ) { - // 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 + // if we have a validator, it has higher priority than our own event + // table + if ( TryValidator(event) ) + return true; - // 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; + // Handle per-instance dynamic event tables first + if ( m_dynamicEvents && SearchDynamicEventTable(event) ) + return true; - if ( (tableId1 == -1) || - (tableId2 == -1 && eventId == tableId1) || - (tableId2 != -1 && - (eventId >= tableId1 && eventId <= tableId2)) ) - { - event.Skip(FALSE); - event.m_callbackUserData = entry.m_callbackUserData; + // Then static per-class event tables + if ( GetEventHashTable().HandleEvent(event, this) ) + return true; + } - (this->*((wxEventFunction) (entry.m_fn)))(event); + // Try going down the event handler chain + if ( GetNextHandler() ) + { + if ( GetNextHandler()->ProcessEvent(event) ) + return true; + } - return !event.GetSkipped(); - } + // 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) +{ + const wxEventType eventType = event.GetEventType(); + for ( int i = 0; table.entries[i].m_fn != 0; i++ ) + { + const wxEventTableEntry& entry = table.entries[i]; + if ( eventType == entry.m_eventType ) + { + 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; @@ -1097,88 +1309,87 @@ 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; + 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_lastId == lastId) || (lastId == wxID_ANY)) && ((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->Next(); + 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->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) - { - // 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; + // get next node before (maybe) calling the event handler as it could + // call Disconnect() invalidating the current node + node = node->GetNext(); - (this->*((wxEventFunction) (entry->m_fn)))(event); + if ((event.GetEventType() == entry->m_eventType) && (entry->m_fn != 0)) + { + wxEvtHandler *handler = +#if !WXWIN_COMPATIBILITY_EVENT_TYPES + entry->m_eventSink ? entry->m_eventSink + : +#endif + this; - if (event.GetSkipped()) - return FALSE; - else - return TRUE; + if ( ProcessEventIfMatches(*entry, handler, event) ) + { + return true; } } - node = node->Next(); } - return FALSE; -}; + + return false; +} void wxEvtHandler::DoSetClientObject( wxClientData *data ) { @@ -1221,16 +1432,7 @@ void *wxEvtHandler::DoGetClientData() const 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