X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82a5f02c861e8d57ba8255a9553b941118ad4520..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 297e223555..d0c22a72d1 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,253 +24,32 @@ #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" + #include "wx/stopwatch.h" + #include "wx/module.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" - -#if wxUSE_GUI - #include "wx/validate.h" -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// events -// ---------------------------------------------------------------------------- - -int wxNewEventType() -{ - static int wxCurrentEventType = 10000; - - return wxCurrentEventType++; -} - -const int wxEVT_NULL = 0; -const int wxEVT_FIRST = 10000; - -const int wxEVT_COMMAND_BUTTON_CLICKED = wxNewEventType(); -const int wxEVT_COMMAND_CHECKBOX_CLICKED = wxNewEventType(); -const int wxEVT_COMMAND_CHOICE_SELECTED = wxNewEventType(); -const int wxEVT_COMMAND_LISTBOX_SELECTED = wxNewEventType(); -const int wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxNewEventType(); -const int wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxNewEventType(); -const int wxEVT_COMMAND_TEXT_UPDATED = wxNewEventType(); -const int wxEVT_COMMAND_TEXT_ENTER = wxNewEventType(); -const int wxEVT_COMMAND_MENU_SELECTED = wxNewEventType(); -const int wxEVT_COMMAND_TOOL_CLICKED = wxNewEventType(); -const int wxEVT_COMMAND_SLIDER_UPDATED = wxNewEventType(); -const int wxEVT_COMMAND_RADIOBOX_SELECTED = wxNewEventType(); -const int wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxNewEventType(); -const int wxEVT_COMMAND_SCROLLBAR_UPDATED = wxNewEventType(); -const int wxEVT_COMMAND_VLBOX_SELECTED = wxNewEventType(); -const int wxEVT_COMMAND_COMBOBOX_SELECTED = wxNewEventType(); -const int wxEVT_COMMAND_TOOL_RCLICKED = wxNewEventType(); -const int wxEVT_COMMAND_TOOL_ENTER = wxNewEventType(); -const int wxEVT_COMMAND_SPINCTRL_UPDATED = wxNewEventType(); - -// Sockets and timers send events, too -const int wxEVT_SOCKET = wxNewEventType(); -const int wxEVT_TIMER = wxNewEventType(); - -// Mouse event types -const int wxEVT_LEFT_DOWN = wxNewEventType(); -const int wxEVT_LEFT_UP = wxNewEventType(); -const int wxEVT_MIDDLE_DOWN = wxNewEventType(); -const int wxEVT_MIDDLE_UP = wxNewEventType(); -const int wxEVT_RIGHT_DOWN = wxNewEventType(); -const int wxEVT_RIGHT_UP = wxNewEventType(); -const int wxEVT_MOTION = wxNewEventType(); -const int wxEVT_ENTER_WINDOW = wxNewEventType(); -const int wxEVT_LEAVE_WINDOW = wxNewEventType(); -const int wxEVT_LEFT_DCLICK = wxNewEventType(); -const int wxEVT_MIDDLE_DCLICK = wxNewEventType(); -const int wxEVT_RIGHT_DCLICK = wxNewEventType(); -const int wxEVT_SET_FOCUS = wxNewEventType(); -const int wxEVT_KILL_FOCUS = wxNewEventType(); - -// Non-client mouse events -const int wxEVT_NC_LEFT_DOWN = wxNewEventType(); -const int wxEVT_NC_LEFT_UP = wxNewEventType(); -const int wxEVT_NC_MIDDLE_DOWN = wxNewEventType(); -const int wxEVT_NC_MIDDLE_UP = wxNewEventType(); -const int wxEVT_NC_RIGHT_DOWN = wxNewEventType(); -const int wxEVT_NC_RIGHT_UP = wxNewEventType(); -const int wxEVT_NC_MOTION = wxNewEventType(); -const int wxEVT_NC_ENTER_WINDOW = wxNewEventType(); -const int wxEVT_NC_LEAVE_WINDOW = wxNewEventType(); -const int wxEVT_NC_LEFT_DCLICK = wxNewEventType(); -const int wxEVT_NC_MIDDLE_DCLICK = wxNewEventType(); -const int wxEVT_NC_RIGHT_DCLICK = wxNewEventType(); - -// Character input event type -const int wxEVT_CHAR = wxNewEventType(); -const int wxEVT_CHAR_HOOK = wxNewEventType(); -const int wxEVT_NAVIGATION_KEY = wxNewEventType(); -const int wxEVT_KEY_DOWN = wxNewEventType(); -const int wxEVT_KEY_UP = wxNewEventType(); - -// Set cursor event -const int wxEVT_SET_CURSOR = wxNewEventType(); - -// wxScrollbar and wxSlider event identifiers -const int wxEVT_SCROLL_TOP = wxNewEventType(); -const int wxEVT_SCROLL_BOTTOM = wxNewEventType(); -const int wxEVT_SCROLL_LINEUP = wxNewEventType(); -const int wxEVT_SCROLL_LINEDOWN = wxNewEventType(); -const int wxEVT_SCROLL_PAGEUP = wxNewEventType(); -const int wxEVT_SCROLL_PAGEDOWN = wxNewEventType(); -const int wxEVT_SCROLL_THUMBTRACK = wxNewEventType(); -const int wxEVT_SCROLL_THUMBRELEASE = wxNewEventType(); - -// Scroll events from wxWindow -const int wxEVT_SCROLLWIN_TOP = wxNewEventType(); -const int wxEVT_SCROLLWIN_BOTTOM = wxNewEventType(); -const int wxEVT_SCROLLWIN_LINEUP = wxNewEventType(); -const int wxEVT_SCROLLWIN_LINEDOWN = wxNewEventType(); -const int wxEVT_SCROLLWIN_PAGEUP = wxNewEventType(); -const int wxEVT_SCROLLWIN_PAGEDOWN = wxNewEventType(); -const int wxEVT_SCROLLWIN_THUMBTRACK = wxNewEventType(); -const int wxEVT_SCROLLWIN_THUMBRELEASE = wxNewEventType(); - -// System events -const int wxEVT_SIZE = wxNewEventType(); -const int wxEVT_MOVE = wxNewEventType(); -const int wxEVT_CLOSE_WINDOW = wxNewEventType(); -const int wxEVT_END_SESSION = wxNewEventType(); -const int wxEVT_QUERY_END_SESSION = wxNewEventType(); -const int wxEVT_ACTIVATE_APP = wxNewEventType(); -const int wxEVT_POWER = wxNewEventType(); -const int wxEVT_ACTIVATE = wxNewEventType(); -const int wxEVT_CREATE = wxNewEventType(); -const int wxEVT_DESTROY = wxNewEventType(); -const int wxEVT_SHOW = wxNewEventType(); -const int wxEVT_ICONIZE = wxNewEventType(); -const int wxEVT_MAXIMIZE = wxNewEventType(); -const int wxEVT_MOUSE_CAPTURE_CHANGED = wxNewEventType(); -const int wxEVT_PAINT = wxNewEventType(); -const int wxEVT_ERASE_BACKGROUND = wxNewEventType(); -const int wxEVT_NC_PAINT = wxNewEventType(); -const int wxEVT_PAINT_ICON = wxNewEventType(); -const int wxEVT_MENU_CHAR = wxNewEventType(); -const int wxEVT_MENU_INIT = wxNewEventType(); -const int wxEVT_MENU_HIGHLIGHT = wxNewEventType(); -const int wxEVT_POPUP_MENU_INIT = wxNewEventType(); -const int wxEVT_CONTEXT_MENU = wxNewEventType(); -const int wxEVT_SYS_COLOUR_CHANGED = wxNewEventType(); -const int wxEVT_SETTING_CHANGED = wxNewEventType(); -const int wxEVT_QUERY_NEW_PALETTE = wxNewEventType(); -const int wxEVT_PALETTE_CHANGED = wxNewEventType(); -const int wxEVT_JOY_BUTTON_DOWN = wxNewEventType(); -const int wxEVT_JOY_BUTTON_UP = wxNewEventType(); -const int wxEVT_JOY_MOVE = wxNewEventType(); -const int wxEVT_JOY_ZMOVE = wxNewEventType(); -const int wxEVT_DROP_FILES = wxNewEventType(); -const int wxEVT_DRAW_ITEM = wxNewEventType(); -const int wxEVT_MEASURE_ITEM = wxNewEventType(); -const int wxEVT_COMPARE_ITEM = wxNewEventType(); -const int wxEVT_INIT_DIALOG = wxNewEventType(); -const int wxEVT_IDLE = wxNewEventType(); -const int wxEVT_UPDATE_UI = wxNewEventType(); - -// System misc. -const int wxEVT_END_PROCESS = wxNewEventType(); - -// Dial up events -const int wxEVT_DIALUP_CONNECTED = wxNewEventType(); -const int wxEVT_DIALUP_DISCONNECTED = wxNewEventType(); - -// Generic command events -// Note: a click is a higher-level event than button down/up -const int wxEVT_COMMAND_LEFT_CLICK = wxNewEventType(); -const int wxEVT_COMMAND_LEFT_DCLICK = wxNewEventType(); -const int wxEVT_COMMAND_RIGHT_CLICK = wxNewEventType(); -const int wxEVT_COMMAND_RIGHT_DCLICK = wxNewEventType(); -const int wxEVT_COMMAND_SET_FOCUS = wxNewEventType(); -const int wxEVT_COMMAND_KILL_FOCUS = wxNewEventType(); -const int wxEVT_COMMAND_ENTER = wxNewEventType(); - -// Tree control event types -const int wxEVT_COMMAND_TREE_BEGIN_DRAG = wxNewEventType(); -const int wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxNewEventType(); -const int wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxNewEventType(); -const int wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxNewEventType(); -const int wxEVT_COMMAND_TREE_DELETE_ITEM = wxNewEventType(); -const int wxEVT_COMMAND_TREE_GET_INFO = wxNewEventType(); -const int wxEVT_COMMAND_TREE_SET_INFO = wxNewEventType(); -const int wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxNewEventType(); -const int wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxNewEventType(); -const int wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxNewEventType(); -const int wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxNewEventType(); -const int wxEVT_COMMAND_TREE_SEL_CHANGED = wxNewEventType(); -const int wxEVT_COMMAND_TREE_SEL_CHANGING = wxNewEventType(); -const int wxEVT_COMMAND_TREE_KEY_DOWN = wxNewEventType(); -const int wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxNewEventType(); -const int wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxNewEventType(); -const int wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxNewEventType(); -const int wxEVT_COMMAND_TREE_END_DRAG = wxNewEventType(); - -// List control event types -const int wxEVT_COMMAND_LIST_BEGIN_DRAG = wxNewEventType(); -const int wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxNewEventType(); -const int wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxNewEventType(); -const int wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxNewEventType(); -const int wxEVT_COMMAND_LIST_DELETE_ITEM = wxNewEventType(); -const int wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxNewEventType(); -const int wxEVT_COMMAND_LIST_GET_INFO = wxNewEventType(); -const int wxEVT_COMMAND_LIST_SET_INFO = wxNewEventType(); -const int wxEVT_COMMAND_LIST_ITEM_SELECTED = wxNewEventType(); -const int wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxNewEventType(); -const int wxEVT_COMMAND_LIST_KEY_DOWN = wxNewEventType(); -const int wxEVT_COMMAND_LIST_INSERT_ITEM = wxNewEventType(); -const int wxEVT_COMMAND_LIST_COL_CLICK = wxNewEventType(); -const int wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxNewEventType(); -const int wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxNewEventType(); -const int wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxNewEventType(); - -// Tab and notebook control event types -const int wxEVT_COMMAND_TAB_SEL_CHANGED = wxNewEventType(); -const int wxEVT_COMMAND_TAB_SEL_CHANGING = wxNewEventType(); -const int wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxNewEventType(); -const int wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxNewEventType(); - -// Splitter events -const int wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxNewEventType(); -const int wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxNewEventType(); -const int wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxNewEventType(); -const int wxEVT_COMMAND_SPLITTER_UNSPLIT = wxNewEventType(); - -// Wizard events -const int wxEVT_WIZARD_PAGE_CHANGED = wxNewEventType(); -const int wxEVT_WIZARD_PAGE_CHANGING = wxNewEventType(); -const int wxEVT_WIZARD_CANCEL = wxNewEventType(); - -// Calendar events -const int wxEVT_CALENDAR_SEL_CHANGED = wxNewEventType(); -const int wxEVT_CALENDAR_DAY_CHANGED = wxNewEventType(); -const int wxEVT_CALENDAR_MONTH_CHANGED = wxNewEventType(); -const int wxEVT_CALENDAR_YEAR_CHANGED = wxNewEventType(); -const int wxEVT_CALENDAR_DOUBLECLICKED = wxNewEventType(); -const int wxEVT_CALENDAR_WEEKDAY_CLICKED = wxNewEventType(); - -// Help events -const int wxEVT_HELP = wxNewEventType(); -const int wxEVT_DETAILED_HELP = wxNewEventType(); - // ---------------------------------------------------------------------------- // 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) + IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) +#endif // wxUSE_BASE #if wxUSE_GUI IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) @@ -285,9 +60,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxNcPaintEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxChildFocusEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent) @@ -297,25 +74,59 @@ 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(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(wxMouseCaptureLostEvent, 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[] = - { wxEventTableEntry( 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL ) }; + { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) }; + + +// wxUSE_MEMORY_TRACING considers memory freed from the static objects dtors +// leaked, so we need to manually clean up all event tables before checking for +// the memory leaks when using it, however this breaks re-initializing the +// library (i.e. repeated calls to wxInitialize/wxUninitialize) because the +// event tables won't be rebuilt the next time, so disable this by default +#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING + +class wxEventTableEntryModule: public wxModule +{ +public: + wxEventTableEntryModule() { } + virtual bool OnInit() { return true; } + virtual void OnExit() { wxEventHashTable::ClearAll(); } + + DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule) +}; +IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule) + +#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING // ---------------------------------------------------------------------------- // global variables @@ -329,16 +140,203 @@ wxList *wxPendingEvents = (wxList *)NULL; wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL; #endif +#if !WXWIN_COMPATIBILITY_EVENT_TYPES + +// 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) +DEFINE_EVENT_TYPE(wxEVT_TIMER) + +#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES + +#endif // wxUSE_BASE + +#if wxUSE_GUI + +#if !WXWIN_COMPATIBILITY_EVENT_TYPES + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_SELECTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_MENU_SELECTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBUTTON_SELECTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_SCROLLBAR_UPDATED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_VLBOX_SELECTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED) + +// Mouse event types +DEFINE_EVENT_TYPE(wxEVT_LEFT_DOWN) +DEFINE_EVENT_TYPE(wxEVT_LEFT_UP) +DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DOWN) +DEFINE_EVENT_TYPE(wxEVT_MIDDLE_UP) +DEFINE_EVENT_TYPE(wxEVT_RIGHT_DOWN) +DEFINE_EVENT_TYPE(wxEVT_RIGHT_UP) +DEFINE_EVENT_TYPE(wxEVT_MOTION) +DEFINE_EVENT_TYPE(wxEVT_ENTER_WINDOW) +DEFINE_EVENT_TYPE(wxEVT_LEAVE_WINDOW) +DEFINE_EVENT_TYPE(wxEVT_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_SET_FOCUS) +DEFINE_EVENT_TYPE(wxEVT_KILL_FOCUS) +DEFINE_EVENT_TYPE(wxEVT_CHILD_FOCUS) +DEFINE_EVENT_TYPE(wxEVT_MOUSEWHEEL) + +// Non-client mouse events +DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN) +DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_UP) +DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DOWN) +DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_UP) +DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DOWN) +DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_UP) +DEFINE_EVENT_TYPE(wxEVT_NC_MOTION) +DEFINE_EVENT_TYPE(wxEVT_NC_ENTER_WINDOW) +DEFINE_EVENT_TYPE(wxEVT_NC_LEAVE_WINDOW) +DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DCLICK) + +// Character input event type +DEFINE_EVENT_TYPE(wxEVT_CHAR) +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) + +// wxScrollbar and wxSlider event identifiers +DEFINE_EVENT_TYPE(wxEVT_SCROLL_TOP) +DEFINE_EVENT_TYPE(wxEVT_SCROLL_BOTTOM) +DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEUP) +DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEDOWN) +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) +DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM) +DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEUP) +DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEDOWN) +DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEUP) +DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEDOWN) +DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBTRACK) +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) +DEFINE_EVENT_TYPE(wxEVT_CREATE) +DEFINE_EVENT_TYPE(wxEVT_DESTROY) +DEFINE_EVENT_TYPE(wxEVT_SHOW) +DEFINE_EVENT_TYPE(wxEVT_ICONIZE) +DEFINE_EVENT_TYPE(wxEVT_MAXIMIZE) +DEFINE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_LOST) +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_OPEN) +DEFINE_EVENT_TYPE(wxEVT_MENU_CLOSE) +DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT) +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) +DEFINE_EVENT_TYPE(wxEVT_JOY_BUTTON_DOWN) +DEFINE_EVENT_TYPE(wxEVT_JOY_BUTTON_UP) +DEFINE_EVENT_TYPE(wxEVT_JOY_MOVE) +DEFINE_EVENT_TYPE(wxEVT_JOY_ZMOVE) +DEFINE_EVENT_TYPE(wxEVT_DROP_FILES) +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_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) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_CLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_SET_FOCUS) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_KILL_FOCUS) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_ENTER) + +// Help events +DEFINE_EVENT_TYPE(wxEVT_HELP) +DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP) + +#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES + +#endif // wxUSE_GUI + +#if wxUSE_BASE + +wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL; + // ============================================================================ // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// event initialization +// ---------------------------------------------------------------------------- + +int wxNewEventType() +{ + // MT-FIXME + static int s_lastUsedEventType = wxEVT_FIRST; + + return s_lastUsedEventType++; +} + // ---------------------------------------------------------------------------- // wxEvent // ---------------------------------------------------------------------------- /* - * General wxWindows events, covering + * General wxWidgets events, covering * all interesting things that might happen (button clicking, resizing, * setting text in widgets, etc.). * @@ -346,31 +344,33 @@ wxList *wxPendingEvents = (wxList *)NULL; * */ -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(src) + , 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 /* @@ -378,42 +378,101 @@ 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) { - 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 } /* @@ -424,7 +483,7 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType, int id, int pos, int orient) - : wxCommandEvent(commandType, id) + : wxCommandEvent(commandType, id) { m_extraLong = orient; m_commandInt = pos; @@ -443,16 +502,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 * @@ -461,131 +510,170 @@ 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; + m_wheelDelta = 0; + m_linesPerAction = 0; + m_wheelAxis = 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; + m_wheelAxis = event.m_wheelAxis; } -// 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: + switch (but) + { + 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()); + switch (but) + { default: wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button")); - } + // fall through + + case wxMOUSE_BTN_ANY: + return ButtonUp(wxMOUSE_BTN_ANY) || + ButtonDown(wxMOUSE_BTN_ANY) || + ButtonDClick(wxMOUSE_BTN_ANY); + + case wxMOUSE_BTN_LEFT: + return LeftDown() || LeftUp() || LeftDClick(); - return FALSE; + case wxMOUSE_BTN_MIDDLE: + return MiddleDown() || MiddleUp() || MiddleDClick(); + + case wxMOUSE_BTN_RIGHT: + return RightDown() || RightUp() || RightDClick(); + } } bool wxMouseEvent::ButtonIsDown(int but) const { - switch (but) { - case -1: - return (LeftIsDown() || MiddleIsDown() || RightIsDown()); - case 1: + switch (but) + { + 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 +{ + for ( int i = 1; i <= 3; i++ ) + { + if ( Button(i) ) + { + return i; + } + } + + return wxMOUSE_BTN_NONE; } // Find the logical position of the event given the DC @@ -597,177 +685,298 @@ 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); + m_x = evt.m_x; + m_y = evt.m_y; - 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_keyCode = evt.m_keyCode; + 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; -/* - * Misc events - */ +#if wxUSE_UNICODE + m_uniChar = evt.m_uniChar; +#endif +} -void wxSizeEvent::CopyObject(wxObject& obj_d) const +#if WXWIN_COMPATIBILITY_2_6 +long wxKeyEvent::KeyCode() const { - wxSizeEvent *obj = (wxSizeEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_size = m_size; + return m_keyCode; } +#endif // WXWIN_COMPATIBILITY_2_6 -void wxMoveEvent::CopyObject(wxObject& obj_d) const +wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) { - wxMoveEvent *obj = (wxMoveEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_pos = m_pos; + SetEventType(wxEVT_CREATE); + SetEventObject(win); } -void wxEraseEvent::CopyObject(wxObject& obj_d) const +wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) { - wxEraseEvent *obj = (wxEraseEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_dc = m_dc; + SetEventType(wxEVT_DESTROY); + SetEventObject(win); } -void wxActivateEvent::CopyObject(wxObject& obj_d) const +wxChildFocusEvent::wxChildFocusEvent(wxWindow *win) + : wxCommandEvent(wxEVT_CHILD_FOCUS) { - wxActivateEvent *obj = (wxActivateEvent *)&obj_d; - wxEvent::CopyObject(obj_d); - - obj->m_active = m_active; + SetEventObject(win); } -void wxMenuEvent::CopyObject(wxObject& obj_d) const +// ---------------------------------------------------------------------------- +// wxHelpEvent +// ---------------------------------------------------------------------------- + +/* static */ +wxHelpEvent::Origin wxHelpEvent::GuessOrigin(Origin origin) { - wxMenuEvent *obj = (wxMenuEvent *)&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_menuId = m_menuId; + return origin; } -void wxCloseEvent::CopyObject(wxObject& obj_d) const -{ - wxCloseEvent *obj = (wxCloseEvent *)&obj_d; - wxEvent::CopyObject(obj_d); +#endif // wxUSE_GUI - 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 +#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); + for ( size_t i = 0; i < m_size; i++ ) + { + EventTypeTablePointer eTTnode = m_eventTypeTable[i]; + delete eTTnode; + } + + delete[] m_eventTypeTable; + m_eventTypeTable = NULL; - 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_size = 0; } -void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const +#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING + +// 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 +#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING + +bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self) { - wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d; - wxEvent::CopyObject(obj_d); + if (m_rebuildHash) + { + InitHashTable(); + m_rebuildHash = false; + } + + if (!m_eventTypeTable) + return false; - obj->m_changedWindow = m_changedWindow; + // 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); - obj->m_paletteRealized = m_paletteRealized; + entry++; + } + + table = table->baseTable; + } + + // Lets free some memory. + size_t i; + for(i = 0; i < m_size; i++) + { + EventTypeTablePointer eTTnode = m_eventTypeTable[i]; + if (eTTnode) + { + eTTnode->eventEntryTable.Shrink(); + } + } } -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; } -#endif // wxUSE_GUI - -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; + + // TODO: Search the most optimal grow sequence + AllocEventTypeTable(/* GetNextPrime(oldSize) */oldSize*2+1); + + for ( size_t i = 0; i < oldSize; /* */ ) + { + EventTypeTablePointer eTToldNode = oldEventTypeTable[i]; + if (eTToldNode) + { + EventTypeTablePointer *peTTnode = &m_eventTypeTable[eTToldNode->eventType % m_size]; + EventTypeTablePointer eTTnode = *peTTnode; + + // Check for collision, we don't want any. + if (eTTnode) + { + GrowEventTypeTable(); + continue; // Don't increment the counter, + // as we still need to add this element. + } + else + { + // Get the old value and put it in the new table. + *peTTnode = oldEventTypeTable[i]; + } + } - obj->m_requestMore = m_requestMore; + i++; + } + + delete[] oldEventTypeTable; } + +// ---------------------------------------------------------------------------- +// wxEvtHandler +// ---------------------------------------------------------------------------- + /* * Event handler */ @@ -776,15 +985,18 @@ 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__) m_eventsLocker = new wxCriticalSection; # endif #endif + + // no client data (yet) + m_clientData = NULL; + m_clientDataType = wxClientData_None; } wxEvtHandler::~wxEvtHandler() @@ -798,29 +1010,53 @@ wxEvtHandler::~wxEvtHandler() if (m_dynamicEvents) { - wxNode *node = m_dynamicEvents->First(); - while (node) + for ( wxList::iterator it = m_dynamicEvents->begin(), + end = m_dynamicEvents->end(); + it != end; + ++it ) { - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); - if (entry->m_callbackUserData) delete entry->m_callbackUserData; +#if WXWIN_COMPATIBILITY_EVENT_TYPES + wxEventTableEntry *entry = (wxEventTableEntry*)*it; +#else // !WXWIN_COMPATIBILITY_EVENT_TYPES + 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 + if ( m_clientDataType == wxClientData_Object ) + delete m_clientObject; } #if wxUSE_THREADS -bool wxEvtHandler::ProcessThreadEvent(wxEvent& event) +bool wxEvtHandler::ProcessThreadEvent(const wxEvent& event) { // check that we are really in a child thread wxASSERT_MSG( !wxThread::IsMain(), @@ -828,33 +1064,38 @@ 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 -void wxEvtHandler::AddPendingEvent(wxEvent& event) +void wxEvtHandler::AddPendingEvent(const 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. @@ -866,141 +1107,100 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) wxPendingEvents->Append(this); 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 - // 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() ) + 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))) { - -#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; + event.Skip(false); + event.m_callbackUserData = entry.m_callbackUserData; - // 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; - 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 @@ -1009,148 +1209,216 @@ 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() ) + { + // notice that we shouldn't let the parent have the event even if the + // next handler does not process it because it will have already passed + // it to the parent in this case + return GetNextHandler()->ProcessEvent(event); + } - 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 ) { - wxDynamicEventTableEntry *entry = new wxDynamicEventTableEntry; +#if WXWIN_COMPATIBILITY_EVENT_TYPES + wxEventTableEntry *entry = new wxEventTableEntry; + entry->m_eventType = eventType; entry->m_id = id; entry->m_lastId = lastId; - entry->m_eventType = eventType; entry->m_fn = func; entry->m_callbackUserData = userData; +#else // !WXWIN_COMPATIBILITY_EVENT_TYPES + wxDynamicEventTableEntry *entry = + 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) { - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); +#if WXWIN_COMPATIBILITY_EVENT_TYPES + wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData(); +#else // !WXWIN_COMPATIBILITY_EVENT_TYPES + 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 ); + if (entry->m_callbackUserData) + delete entry->m_callbackUserData; + 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) { - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); +#if WXWIN_COMPATIBILITY_EVENT_TYPES + wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData(); +#else // !WXWIN_COMPATIBILITY_EVENT_TYPES + 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; -}; -#if WXWIN_COMPATIBILITY -bool wxEvtHandler::OnClose() + return false; +} + +void wxEvtHandler::DoSetClientObject( wxClientData *data ) { - if (GetNextHandler()) - return GetNextHandler()->OnClose(); - else - return FALSE; + 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; } -#endif // WXWIN_COMPATIBILITY + +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; +} + +#endif // wxUSE_BASE #if wxUSE_GUI @@ -1177,4 +1445,38 @@ wxWindow* wxFindFocusDescendant(wxWindow* ancestor) return focusWin; } +// ---------------------------------------------------------------------------- +// wxEventBlocker +// ---------------------------------------------------------------------------- + +wxEventBlocker::wxEventBlocker(wxWindow *win, wxEventType type) +{ + wxCHECK_RET(win, wxT("Null window given to wxEventBlocker")); + + m_window = win; + + Block(type); + m_window->PushEventHandler(this); +} + +wxEventBlocker::~wxEventBlocker() +{ + wxEvtHandler *popped = m_window->PopEventHandler(false); + wxCHECK_RET(popped == this, + wxT("Don't push other event handlers into a window managed by wxEventBlocker!")); +} + +bool wxEventBlocker::ProcessEvent(wxEvent& event) +{ + // should this event be blocked? + for ( size_t i = 0; i < m_eventsToBlock.size(); i++ ) + { + wxEventType t = (wxEventType)m_eventsToBlock[i]; + if ( t == wxEVT_ANY || t == event.GetEventType() ) + return true; // yes, it should: mark this event as processed + } + + return false; +} + #endif // wxUSE_GUI