X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77d4384e31b10791b3b074b9874c73f5df004556..6c28fd3379ca2de91953a43f609cf3d726107bec:/src/common/event.cpp?ds=sidebyside diff --git a/src/common/event.cpp b/src/common/event.cpp index 1a974ab063..73d7d79ba6 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -46,228 +46,6 @@ #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 // ---------------------------------------------------------------------------- @@ -305,6 +83,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent) #endif // wxUSE_GUI const wxEventTable *wxEvtHandler::GetEventTable() const @@ -314,8 +93,7 @@ const wxEventTable wxEvtHandler::sm_eventTable = { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] }; const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = - { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } }; - + { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) }; // ---------------------------------------------------------------------------- // global variables @@ -329,10 +107,178 @@ 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 + +DEFINE_EVENT_TYPE(wxEVT_NULL) +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_TEXT_UPDATED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER) +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) + +// Sockets and timers send events, too +DEFINE_EVENT_TYPE(wxEVT_SOCKET) +DEFINE_EVENT_TYPE(wxEVT_TIMER) + +// 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_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) + +// 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) + +// 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_MOVE) +DEFINE_EVENT_TYPE(wxEVT_CLOSE_WINDOW) +DEFINE_EVENT_TYPE(wxEVT_END_SESSION) +DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION) +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_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_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_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_IDLE) +DEFINE_EVENT_TYPE(wxEVT_UPDATE_UI) + +// 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 + // ============================================================================ // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// event initialization +// ---------------------------------------------------------------------------- + +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++; +} + // ---------------------------------------------------------------------------- // wxEvent // ---------------------------------------------------------------------------- @@ -470,6 +416,9 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType) m_middleDown = FALSE; m_x = 0; m_y = 0; + m_wheelRotation = 0; + m_wheelDelta = 0; + m_linesPerAction = 0; } void wxMouseEvent::CopyObject(wxObject& obj_d) const @@ -620,7 +569,7 @@ void wxKeyEvent::CopyObject(wxObject& obj_d) const 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; @@ -801,8 +750,14 @@ wxEvtHandler::~wxEvtHandler() wxNode *node = m_dynamicEvents->First(); while (node) { +#if WXWIN_COMPATIBILITY_EVENT_TYPES + wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); +#else // !WXWIN_COMPATIBILITY_EVENT_TYPES wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); - if (entry->m_callbackUserData) delete entry->m_callbackUserData; +#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES + + if (entry->m_callbackUserData) + delete entry->m_callbackUserData; delete entry; node = node->Next(); } @@ -866,7 +821,7 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) wxPendingEvents->Append(this); wxLEAVE_CRIT_SECT(*wxPendingEventsLocker); - + // 3) Inform the system that new pending events are somwehere, // and that these should be processed in idle time. wxWakeUpIdle(); @@ -887,7 +842,7 @@ void wxEvtHandler::ProcessPendingEvents() delete node; // In ProcessEvent, new events might get added and - // we can safely leave the crtical section here. + // we can safely leave the crtical section here. #if defined(__VISAGECPP__) wxLEAVE_CRIT_SECT( m_eventsLocker); #else @@ -925,7 +880,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) // An event handler can be enabled or disabled if ( GetEvtHandlerEnabled() ) { - + #if 0 /* What is this? When using GUI threads, a non main @@ -988,15 +943,21 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) } #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 + // 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); + + // also, don't propagate events beyond the first top level window: it + // doesn't make sense to process dialogs events in the parent frame + if ( !win->IsTopLevel() ) + { + wxWindow *parent = win->GetParent(); + if (parent && !parent->IsBeingDeleted()) + return parent->GetEventHandler()->ProcessEvent(event); + } } #endif // wxUSE_GUI @@ -1065,12 +1026,17 @@ void wxEvtHandler::Connect( int id, int lastId, wxObjectEventFunction func, wxObject *userData ) { - 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); +#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES if (!m_dynamicEvents) m_dynamicEvents = new wxList; @@ -1088,14 +1054,20 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, wxNode *node = m_dynamicEvents->First(); while (node) { - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); +#if WXWIN_COMPATIBILITY_EVENT_TYPES + wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); +#else // !WXWIN_COMPATIBILITY_EVENT_TYPES + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); +#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES + if ((entry->m_id == id) && ((entry->m_lastId == lastId) || (lastId == -1)) && ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) && ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) && ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL))) { - if (entry->m_callbackUserData) delete entry->m_callbackUserData; + if (entry->m_callbackUserData) + delete entry->m_callbackUserData; m_dynamicEvents->DeleteNode( node ); delete entry; return TRUE; @@ -1115,7 +1087,11 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) wxNode *node = m_dynamicEvents->First(); while (node) { - wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); +#if WXWIN_COMPATIBILITY_EVENT_TYPES + wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); +#else // !WXWIN_COMPATIBILITY_EVENT_TYPES + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); +#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES if (entry->m_fn) {