X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66b6b04535cf261b7bae7da77332835b242abd04..0b5eceb638d6fc9cfa5326cd00b10028fc823187:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 0278a68a42..89a55d9a7e 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -46,275 +46,60 @@ #include "wx/validate.h" #endif // wxUSE_GUI -#if wxUSE_GUI - #if defined(__VISAGECPP__) && __IBMCPP__ >= 400 - // define these here to keep from getting multiply defines externals -const wxEventType wxEVT_NULL = 0; -const wxEventType wxEVT_FIRST = 10000; - -const wxEventType wxEVT_COMMAND_BUTTON_CLICKED = wxEVT_FIRST + 1; -const wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED = wxEVT_FIRST + 2; -const wxEventType wxEVT_COMMAND_CHOICE_SELECTED = wxEVT_FIRST + 3; -const wxEventType wxEVT_COMMAND_LISTBOX_SELECTED = wxEVT_FIRST + 4; -const wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxEVT_FIRST + 5; -const wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxEVT_FIRST + 6; -const wxEventType wxEVT_COMMAND_TEXT_UPDATED = wxEVT_FIRST + 7; -const wxEventType wxEVT_COMMAND_TEXT_ENTER = wxEVT_FIRST + 8; -const wxEventType wxEVT_COMMAND_MENU_SELECTED = wxEVT_FIRST + 9; -const wxEventType wxEVT_COMMAND_TOOL_CLICKED = wxEVT_COMMAND_MENU_SELECTED; -const wxEventType wxEVT_COMMAND_SLIDER_UPDATED = wxEVT_FIRST + 10; -const wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED = wxEVT_FIRST + 11; -const wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxEVT_FIRST + 12; -//const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use wxEVT_SCROLL... events -const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED = wxEVT_FIRST + 13; -const wxEventType wxEVT_COMMAND_VLBOX_SELECTED = wxEVT_FIRST + 14; -const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_FIRST + 15; -const wxEventType wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16; -const wxEventType wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17; -const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED = wxEVT_FIRST + 18; - -/* Sockets send events, too */ -const wxEventType wxEVT_SOCKET = wxEVT_FIRST + 50; - -/* Mouse event types */ -const wxEventType wxEVT_LEFT_DOWN = wxEVT_FIRST + 100; -const wxEventType wxEVT_LEFT_UP = wxEVT_FIRST + 101; -const wxEventType wxEVT_MIDDLE_DOWN = wxEVT_FIRST + 102; -const wxEventType wxEVT_MIDDLE_UP = wxEVT_FIRST + 103; -const wxEventType wxEVT_RIGHT_DOWN = wxEVT_FIRST + 104; -const wxEventType wxEVT_RIGHT_UP = wxEVT_FIRST + 105; -const wxEventType wxEVT_MOTION = wxEVT_FIRST + 106; -const wxEventType wxEVT_ENTER_WINDOW = wxEVT_FIRST + 107; -const wxEventType wxEVT_LEAVE_WINDOW = wxEVT_FIRST + 108; -const wxEventType wxEVT_LEFT_DCLICK = wxEVT_FIRST + 109; -const wxEventType wxEVT_MIDDLE_DCLICK = wxEVT_FIRST + 110; -const wxEventType wxEVT_RIGHT_DCLICK = wxEVT_FIRST + 111; -const wxEventType wxEVT_SET_FOCUS = wxEVT_FIRST + 112; -const wxEventType wxEVT_KILL_FOCUS = wxEVT_FIRST + 113; - - /* Non-client mouse events */ -const wxEventType wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 200; -const wxEventType wxEVT_NC_LEFT_UP = wxEVT_FIRST + 201; -const wxEventType wxEVT_NC_MIDDLE_DOWN = wxEVT_FIRST + 202; -const wxEventType wxEVT_NC_MIDDLE_UP = wxEVT_FIRST + 203; -const wxEventType wxEVT_NC_RIGHT_DOWN = wxEVT_FIRST + 204; -const wxEventType wxEVT_NC_RIGHT_UP = wxEVT_FIRST + 205; -const wxEventType wxEVT_NC_MOTION = wxEVT_FIRST + 206; -const wxEventType wxEVT_NC_ENTER_WINDOW = wxEVT_FIRST + 207; -const wxEventType wxEVT_NC_LEAVE_WINDOW = wxEVT_FIRST + 208; -const wxEventType wxEVT_NC_LEFT_DCLICK = wxEVT_FIRST + 209; -const wxEventType wxEVT_NC_MIDDLE_DCLICK = wxEVT_FIRST + 210; -const wxEventType wxEVT_NC_RIGHT_DCLICK = wxEVT_FIRST + 211; - -/* Character input event type */ -const wxEventType wxEVT_CHAR = wxEVT_FIRST + 212; -const wxEventType wxEVT_CHAR_HOOK = wxEVT_FIRST + 213; -const wxEventType wxEVT_NAVIGATION_KEY = wxEVT_FIRST + 214; -const wxEventType wxEVT_KEY_DOWN = wxEVT_FIRST + 215; -const wxEventType wxEVT_KEY_UP = wxEVT_FIRST + 216; - - /* - * wxScrollbar and wxSlider event identifiers - */ -const wxEventType wxEVT_SCROLL_TOP = wxEVT_FIRST + 300; -const wxEventType wxEVT_SCROLL_BOTTOM = wxEVT_FIRST + 301; -const wxEventType wxEVT_SCROLL_LINEUP = wxEVT_FIRST + 302; -const wxEventType wxEVT_SCROLL_LINEDOWN = wxEVT_FIRST + 303; -const wxEventType wxEVT_SCROLL_PAGEUP = wxEVT_FIRST + 304; -const wxEventType wxEVT_SCROLL_PAGEDOWN = wxEVT_FIRST + 305; -const wxEventType wxEVT_SCROLL_THUMBTRACK = wxEVT_FIRST + 306; - - /* - * Scroll events from wxWindow - */ -const wxEventType wxEVT_SCROLLWIN_TOP = wxEVT_FIRST + 320; -const wxEventType wxEVT_SCROLLWIN_BOTTOM = wxEVT_FIRST + 321; -const wxEventType wxEVT_SCROLLWIN_LINEUP = wxEVT_FIRST + 322; -const wxEventType wxEVT_SCROLLWIN_LINEDOWN = wxEVT_FIRST + 323; -const wxEventType wxEVT_SCROLLWIN_PAGEUP = wxEVT_FIRST + 324; -const wxEventType wxEVT_SCROLLWIN_PAGEDOWN = wxEVT_FIRST + 325; -const wxEventType wxEVT_SCROLLWIN_THUMBTRACK = wxEVT_FIRST + 326; - - /* - * System events - */ -const wxEventType wxEVT_SIZE = wxEVT_FIRST + 400; -const wxEventType wxEVT_MOVE = wxEVT_FIRST + 401; -const wxEventType wxEVT_CLOSE_WINDOW = wxEVT_FIRST + 402; -const wxEventType wxEVT_END_SESSION = wxEVT_FIRST + 403; -const wxEventType wxEVT_QUERY_END_SESSION = wxEVT_FIRST + 404; -const wxEventType wxEVT_ACTIVATE_APP = wxEVT_FIRST + 405; -const wxEventType wxEVT_POWER = wxEVT_FIRST + 406; -const wxEventType wxEVT_ACTIVATE = wxEVT_FIRST + 409; -const wxEventType wxEVT_CREATE = wxEVT_FIRST + 410; -const wxEventType wxEVT_DESTROY = wxEVT_FIRST + 411; -const wxEventType wxEVT_SHOW = wxEVT_FIRST + 412; -const wxEventType wxEVT_ICONIZE = wxEVT_FIRST + 413; -const wxEventType wxEVT_MAXIMIZE = wxEVT_FIRST + 414; -const wxEventType wxEVT_MOUSE_CAPTURE_CHANGED = wxEVT_FIRST + 415; -const wxEventType wxEVT_PAINT = wxEVT_FIRST + 416; -const wxEventType wxEVT_ERASE_BACKGROUND = wxEVT_FIRST + 417; -const wxEventType wxEVT_NC_PAINT = wxEVT_FIRST + 418; -const wxEventType wxEVT_PAINT_ICON = wxEVT_FIRST + 419; -const wxEventType wxEVT_MENU_CHAR = wxEVT_FIRST + 420; -const wxEventType wxEVT_MENU_INIT = wxEVT_FIRST + 421; -const wxEventType wxEVT_MENU_HIGHLIGHT = wxEVT_FIRST + 422; -const wxEventType wxEVT_POPUP_MENU_INIT = wxEVT_FIRST + 423; -const wxEventType wxEVT_CONTEXT_MENU = wxEVT_FIRST + 424; -const wxEventType wxEVT_SYS_COLOUR_CHANGED = wxEVT_FIRST + 425; -const wxEventType wxEVT_SETTING_CHANGED = wxEVT_FIRST + 426; -const wxEventType wxEVT_QUERY_NEW_PALETTE = wxEVT_FIRST + 427; -const wxEventType wxEVT_PALETTE_CHANGED = wxEVT_FIRST + 428; -const wxEventType wxEVT_JOY_BUTTON_DOWN = wxEVT_FIRST + 429; -const wxEventType wxEVT_JOY_BUTTON_UP = wxEVT_FIRST + 430; -const wxEventType wxEVT_JOY_MOVE = wxEVT_FIRST + 431; -const wxEventType wxEVT_JOY_ZMOVE = wxEVT_FIRST + 432; -const wxEventType wxEVT_DROP_FILES = wxEVT_FIRST + 433; -const wxEventType wxEVT_DRAW_ITEM = wxEVT_FIRST + 434; -const wxEventType wxEVT_MEASURE_ITEM = wxEVT_FIRST + 435; -const wxEventType wxEVT_COMPARE_ITEM = wxEVT_FIRST + 436; -const wxEventType wxEVT_INIT_DIALOG = wxEVT_FIRST + 437; -const wxEventType wxEVT_IDLE = wxEVT_FIRST + 438; -const wxEventType wxEVT_UPDATE_UI = wxEVT_FIRST + 439; - - /* System misc. */ -const wxEventType wxEVT_END_PROCESS = wxEVT_FIRST + 440; - - /* Dial up events */ -const wxEventType wxEVT_DIALUP_CONNECTED = wxEVT_FIRST + 450; -const wxEventType wxEVT_DIALUP_DISCONNECTED = wxEVT_FIRST + 451; - - /* Generic command events */ - /* Note: a click is a higher-level event than button down/up */ -const wxEventType wxEVT_COMMAND_LEFT_CLICK = wxEVT_FIRST + 500; -const wxEventType wxEVT_COMMAND_LEFT_DCLICK = wxEVT_FIRST + 501; -const wxEventType wxEVT_COMMAND_RIGHT_CLICK = wxEVT_FIRST + 502; -const wxEventType wxEVT_COMMAND_RIGHT_DCLICK = wxEVT_FIRST + 503; -const wxEventType wxEVT_COMMAND_SET_FOCUS = wxEVT_FIRST + 504; -const wxEventType wxEVT_COMMAND_KILL_FOCUS = wxEVT_FIRST + 505; -const wxEventType wxEVT_COMMAND_ENTER = wxEVT_FIRST + 506; - - /* Tree control event types */ -const wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG = wxEVT_FIRST + 600; -const wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxEVT_FIRST + 601; -const wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxEVT_FIRST + 602; -const wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxEVT_FIRST + 603; -const wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM = wxEVT_FIRST + 604; -const wxEventType wxEVT_COMMAND_TREE_GET_INFO = wxEVT_FIRST + 605; -const wxEventType wxEVT_COMMAND_TREE_SET_INFO = wxEVT_FIRST + 606; -const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxEVT_FIRST + 607; -const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxEVT_FIRST + 608; -const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxEVT_FIRST + 609; -const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxEVT_FIRST + 610; -const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED = wxEVT_FIRST + 611; -const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING = wxEVT_FIRST + 612; -const wxEventType wxEVT_COMMAND_TREE_KEY_DOWN = wxEVT_FIRST + 613; -const wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxEVT_FIRST + 614; -const wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxEVT_FIRST + 615; -const wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 616; - - /* List control event types */ -const wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG = wxEVT_FIRST + 700; -const wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxEVT_FIRST + 701; -const wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxEVT_FIRST + 702; -const wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxEVT_FIRST + 703; -const wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM = wxEVT_FIRST + 704; -const wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxEVT_FIRST + 705; -const wxEventType wxEVT_COMMAND_LIST_GET_INFO = wxEVT_FIRST + 706; -const wxEventType wxEVT_COMMAND_LIST_SET_INFO = wxEVT_FIRST + 707; -const wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED = wxEVT_FIRST + 708; -const wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxEVT_FIRST + 709; -const wxEventType wxEVT_COMMAND_LIST_KEY_DOWN = wxEVT_FIRST + 710; -const wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM = wxEVT_FIRST + 711; -const wxEventType wxEVT_COMMAND_LIST_COL_CLICK = wxEVT_FIRST + 712; -const wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxEVT_FIRST + 713; -const wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 714; -const wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxEVT_FIRST + 715; - - /* Tab and notebook control event types */ -const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED = wxEVT_FIRST + 800; -const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING = wxEVT_FIRST + 801; - -#if defined(__BORLANDC__) && defined(__WIN16__) -/* For 16-bit BC++, these 2 are identical (truncated) */ -const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGED = wxEVT_FIRST + 802; -const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGING = wxEVT_FIRST + 803; -#else -const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxEVT_FIRST + 802; -const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxEVT_FIRST + 803; -#endif - -/* Splitter events */ -const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxEVT_FIRST + 850; -const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxEVT_FIRST + 851; -const wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxEVT_FIRST + 852; -const wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT = wxEVT_FIRST + 853; - -/* Wizard events */ -const wxEventType wxEVT_WIZARD_PAGE_CHANGED = wxEVT_FIRST + 900; -const wxEventType wxEVT_WIZARD_PAGE_CHANGING = wxEVT_FIRST + 901; -const wxEventType wxEVT_WIZARD_CANCEL = wxEVT_FIRST + 902; - -/* Calendar events */ -const wxEventType wxEVT_CALENDAR_SEL_CHANGED = wxEVT_FIRST + 950; -const wxEventType wxEVT_CALENDAR_DAY_CHANGED = wxEVT_FIRST + 951; -const wxEventType wxEVT_CALENDAR_MONTH_CHANGED = wxEVT_FIRST + 952; -const wxEventType wxEVT_CALENDAR_YEAR_CHANGED = wxEVT_FIRST + 953; -const wxEventType wxEVT_CALENDAR_DOUBLECLICKED = wxEVT_FIRST + 954; -const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955; - -const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000; +// ---------------------------------------------------------------------------- +// events +// ---------------------------------------------------------------------------- - #endif // VisualAge C++ V4.0 -#endif // wxUSE_GUI +wxEventType wxEVT_NULL = 0; +wxEventType wxEVT_FIRST = 10000; // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- - IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) - IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) - IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) +IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent) - #if wxUSE_GUI - IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent) - IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent) - IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent) - #endif // wxUSE_GUI - - const wxEventTable *wxEvtHandler::GetEventTable() const - { return &wxEvtHandler::sm_eventTable; } +#if wxUSE_GUI + IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent) + IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent) + IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent) +#endif // wxUSE_GUI - const wxEventTable wxEvtHandler::sm_eventTable = - { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] }; +const wxEventTable *wxEvtHandler::GetEventTable() const + { return &wxEvtHandler::sm_eventTable; } - const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = - { { 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL } }; +const wxEventTable wxEvtHandler::sm_eventTable = + { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] }; +const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = + { wxEventTableEntry(0, 0, 0, (wxObjectEventFunction)NULL, NULL) }; // ---------------------------------------------------------------------------- // global variables @@ -328,10 +113,474 @@ wxList *wxPendingEvents = (wxList *)NULL; wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL; #endif +wxEventType wxEVT_COMMAND_BUTTON_CLICKED; +wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED; +wxEventType wxEVT_COMMAND_CHOICE_SELECTED; +wxEventType wxEVT_COMMAND_LISTBOX_SELECTED; +wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; +wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED; +wxEventType wxEVT_COMMAND_TEXT_UPDATED; +wxEventType wxEVT_COMMAND_TEXT_ENTER; +wxEventType wxEVT_COMMAND_MENU_SELECTED; +wxEventType wxEVT_COMMAND_TOOL_CLICKED; +wxEventType wxEVT_COMMAND_SLIDER_UPDATED; +wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED; +wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED; +wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED; +wxEventType wxEVT_COMMAND_VLBOX_SELECTED; +wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED; +wxEventType wxEVT_COMMAND_TOOL_RCLICKED; +wxEventType wxEVT_COMMAND_TOOL_ENTER; +wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED; + +// Sockets and timers send events, too +wxEventType wxEVT_SOCKET; +wxEventType wxEVT_TIMER; + +// Mouse event types +wxEventType wxEVT_LEFT_DOWN; +wxEventType wxEVT_LEFT_UP; +wxEventType wxEVT_MIDDLE_DOWN; +wxEventType wxEVT_MIDDLE_UP; +wxEventType wxEVT_RIGHT_DOWN; +wxEventType wxEVT_RIGHT_UP; +wxEventType wxEVT_MOTION; +wxEventType wxEVT_ENTER_WINDOW; +wxEventType wxEVT_LEAVE_WINDOW; +wxEventType wxEVT_LEFT_DCLICK; +wxEventType wxEVT_MIDDLE_DCLICK; +wxEventType wxEVT_RIGHT_DCLICK; +wxEventType wxEVT_SET_FOCUS; +wxEventType wxEVT_KILL_FOCUS; + +// Non-client mouse events +wxEventType wxEVT_NC_LEFT_DOWN; +wxEventType wxEVT_NC_LEFT_UP; +wxEventType wxEVT_NC_MIDDLE_DOWN; +wxEventType wxEVT_NC_MIDDLE_UP; +wxEventType wxEVT_NC_RIGHT_DOWN; +wxEventType wxEVT_NC_RIGHT_UP; +wxEventType wxEVT_NC_MOTION; +wxEventType wxEVT_NC_ENTER_WINDOW; +wxEventType wxEVT_NC_LEAVE_WINDOW; +wxEventType wxEVT_NC_LEFT_DCLICK; +wxEventType wxEVT_NC_MIDDLE_DCLICK; +wxEventType wxEVT_NC_RIGHT_DCLICK; + +// Character input event type +wxEventType wxEVT_CHAR; +wxEventType wxEVT_CHAR_HOOK; +wxEventType wxEVT_NAVIGATION_KEY; +wxEventType wxEVT_KEY_DOWN; +wxEventType wxEVT_KEY_UP; + +// Set cursor event +wxEventType wxEVT_SET_CURSOR; + +// wxScrollbar and wxSlider event identifiers +wxEventType wxEVT_SCROLL_TOP; +wxEventType wxEVT_SCROLL_BOTTOM; +wxEventType wxEVT_SCROLL_LINEUP; +wxEventType wxEVT_SCROLL_LINEDOWN; +wxEventType wxEVT_SCROLL_PAGEUP; +wxEventType wxEVT_SCROLL_PAGEDOWN; +wxEventType wxEVT_SCROLL_THUMBTRACK; +wxEventType wxEVT_SCROLL_THUMBRELEASE; + +// Scroll events from wxWindow +wxEventType wxEVT_SCROLLWIN_TOP; +wxEventType wxEVT_SCROLLWIN_BOTTOM; +wxEventType wxEVT_SCROLLWIN_LINEUP; +wxEventType wxEVT_SCROLLWIN_LINEDOWN; +wxEventType wxEVT_SCROLLWIN_PAGEUP; +wxEventType wxEVT_SCROLLWIN_PAGEDOWN; +wxEventType wxEVT_SCROLLWIN_THUMBTRACK; +wxEventType wxEVT_SCROLLWIN_THUMBRELEASE; + +// System events +wxEventType wxEVT_SIZE; +wxEventType wxEVT_MOVE; +wxEventType wxEVT_CLOSE_WINDOW; +wxEventType wxEVT_END_SESSION; +wxEventType wxEVT_QUERY_END_SESSION; +wxEventType wxEVT_ACTIVATE_APP; +wxEventType wxEVT_POWER; +wxEventType wxEVT_ACTIVATE; +wxEventType wxEVT_CREATE; +wxEventType wxEVT_DESTROY; +wxEventType wxEVT_SHOW; +wxEventType wxEVT_ICONIZE; +wxEventType wxEVT_MAXIMIZE; +wxEventType wxEVT_MOUSE_CAPTURE_CHANGED; +wxEventType wxEVT_PAINT; +wxEventType wxEVT_ERASE_BACKGROUND; +wxEventType wxEVT_NC_PAINT; +wxEventType wxEVT_PAINT_ICON; +wxEventType wxEVT_MENU_CHAR; +wxEventType wxEVT_MENU_INIT; +wxEventType wxEVT_MENU_HIGHLIGHT; +wxEventType wxEVT_POPUP_MENU_INIT; +wxEventType wxEVT_CONTEXT_MENU; +wxEventType wxEVT_SYS_COLOUR_CHANGED; +wxEventType wxEVT_SETTING_CHANGED; +wxEventType wxEVT_QUERY_NEW_PALETTE; +wxEventType wxEVT_PALETTE_CHANGED; +wxEventType wxEVT_JOY_BUTTON_DOWN; +wxEventType wxEVT_JOY_BUTTON_UP; +wxEventType wxEVT_JOY_MOVE; +wxEventType wxEVT_JOY_ZMOVE; +wxEventType wxEVT_DROP_FILES; +wxEventType wxEVT_DRAW_ITEM; +wxEventType wxEVT_MEASURE_ITEM; +wxEventType wxEVT_COMPARE_ITEM; +wxEventType wxEVT_INIT_DIALOG; +wxEventType wxEVT_IDLE; +wxEventType wxEVT_UPDATE_UI; + +// System misc. +wxEventType wxEVT_END_PROCESS; + +// Dial up events +wxEventType wxEVT_DIALUP_CONNECTED; +wxEventType wxEVT_DIALUP_DISCONNECTED; + +// Generic command events +// Note: a click is a higher-level event than button down/up +wxEventType wxEVT_COMMAND_LEFT_CLICK; +wxEventType wxEVT_COMMAND_LEFT_DCLICK; +wxEventType wxEVT_COMMAND_RIGHT_CLICK; +wxEventType wxEVT_COMMAND_RIGHT_DCLICK; +wxEventType wxEVT_COMMAND_SET_FOCUS; +wxEventType wxEVT_COMMAND_KILL_FOCUS; +wxEventType wxEVT_COMMAND_ENTER; + +// Tree control event types +wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG; +wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG; +wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT; +wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT; +wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM; +wxEventType wxEVT_COMMAND_TREE_GET_INFO; +wxEventType wxEVT_COMMAND_TREE_SET_INFO; +wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED; +wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING; +wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED; +wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING; +wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED; +wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING; +wxEventType wxEVT_COMMAND_TREE_KEY_DOWN; +wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED; +wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK; +wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK; +wxEventType wxEVT_COMMAND_TREE_END_DRAG; + +// List control event types +wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG; +wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG; +wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT; +wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT; +wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM; +wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS; +wxEventType wxEVT_COMMAND_LIST_GET_INFO; +wxEventType wxEVT_COMMAND_LIST_SET_INFO; +wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED; +wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED; +wxEventType wxEVT_COMMAND_LIST_KEY_DOWN; +wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM; +wxEventType wxEVT_COMMAND_LIST_COL_CLICK; +wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK; +wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK; +wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED; + +// Tab and notebook control event types +wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED; +wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING; +wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED; +wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING; + +// Splitter events +wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED; +wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING; +wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED; +wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT; + +// Wizard events +wxEventType wxEVT_WIZARD_PAGE_CHANGED; +wxEventType wxEVT_WIZARD_PAGE_CHANGING; +wxEventType wxEVT_WIZARD_CANCEL; + +// Calendar events +wxEventType wxEVT_CALENDAR_SEL_CHANGED; +wxEventType wxEVT_CALENDAR_DAY_CHANGED; +wxEventType wxEVT_CALENDAR_MONTH_CHANGED; +wxEventType wxEVT_CALENDAR_YEAR_CHANGED; +wxEventType wxEVT_CALENDAR_DOUBLECLICKED; +wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED; + +// Help events +wxEventType wxEVT_HELP; +wxEventType wxEVT_DETAILED_HELP; + // ============================================================================ // implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// event initialization +// ---------------------------------------------------------------------------- + +int wxNewEventType() +{ + // MT-FIXME + static int s_lastUsedEventType = wxEVT_FIRST; + + return s_lastUsedEventType++; +} + +static void InitEvents() +{ +#ifdef __WXDEBUG__ + // this function is supposed to be called only once, as normally this + // should be always true we only do this check in debug mode + static bool s_inInitEvents = FALSE; + wxCHECK_RET( !s_inInitEvents, _T("InitEvents() reentrancy!") ); + + // note that we don't reset it to FALSE any more as we shouldn't be called + // again + s_inInitEvents = TRUE; +#endif // __WXDEBUG__ + + wxEVT_COMMAND_BUTTON_CLICKED = wxNewEventType(); + wxEVT_COMMAND_CHECKBOX_CLICKED = wxNewEventType(); + wxEVT_COMMAND_CHOICE_SELECTED = wxNewEventType(); + wxEVT_COMMAND_LISTBOX_SELECTED = wxNewEventType(); + wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxNewEventType(); + wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxNewEventType(); + wxEVT_COMMAND_TEXT_UPDATED = wxNewEventType(); + wxEVT_COMMAND_TEXT_ENTER = wxNewEventType(); + wxEVT_COMMAND_MENU_SELECTED = wxNewEventType(); + wxEVT_COMMAND_TOOL_CLICKED = wxNewEventType(); + wxEVT_COMMAND_SLIDER_UPDATED = wxNewEventType(); + wxEVT_COMMAND_RADIOBOX_SELECTED = wxNewEventType(); + wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxNewEventType(); + wxEVT_COMMAND_SCROLLBAR_UPDATED = wxNewEventType(); + wxEVT_COMMAND_VLBOX_SELECTED = wxNewEventType(); + wxEVT_COMMAND_COMBOBOX_SELECTED = wxNewEventType(); + wxEVT_COMMAND_TOOL_RCLICKED = wxNewEventType(); + wxEVT_COMMAND_TOOL_ENTER = wxNewEventType(); + wxEVT_COMMAND_SPINCTRL_UPDATED = wxNewEventType(); + + // Sockets and timers send events, too + wxEVT_SOCKET = wxNewEventType(); + wxEVT_TIMER = wxNewEventType(); + + // Mouse event types + wxEVT_LEFT_DOWN = wxNewEventType(); + wxEVT_LEFT_UP = wxNewEventType(); + wxEVT_MIDDLE_DOWN = wxNewEventType(); + wxEVT_MIDDLE_UP = wxNewEventType(); + wxEVT_RIGHT_DOWN = wxNewEventType(); + wxEVT_RIGHT_UP = wxNewEventType(); + wxEVT_MOTION = wxNewEventType(); + wxEVT_ENTER_WINDOW = wxNewEventType(); + wxEVT_LEAVE_WINDOW = wxNewEventType(); + wxEVT_LEFT_DCLICK = wxNewEventType(); + wxEVT_MIDDLE_DCLICK = wxNewEventType(); + wxEVT_RIGHT_DCLICK = wxNewEventType(); + wxEVT_SET_FOCUS = wxNewEventType(); + wxEVT_KILL_FOCUS = wxNewEventType(); + + // Non-client mouse events + wxEVT_NC_LEFT_DOWN = wxNewEventType(); + wxEVT_NC_LEFT_UP = wxNewEventType(); + wxEVT_NC_MIDDLE_DOWN = wxNewEventType(); + wxEVT_NC_MIDDLE_UP = wxNewEventType(); + wxEVT_NC_RIGHT_DOWN = wxNewEventType(); + wxEVT_NC_RIGHT_UP = wxNewEventType(); + wxEVT_NC_MOTION = wxNewEventType(); + wxEVT_NC_ENTER_WINDOW = wxNewEventType(); + wxEVT_NC_LEAVE_WINDOW = wxNewEventType(); + wxEVT_NC_LEFT_DCLICK = wxNewEventType(); + wxEVT_NC_MIDDLE_DCLICK = wxNewEventType(); + wxEVT_NC_RIGHT_DCLICK = wxNewEventType(); + + // Character input event type + wxEVT_CHAR = wxNewEventType(); + wxEVT_CHAR_HOOK = wxNewEventType(); + wxEVT_NAVIGATION_KEY = wxNewEventType(); + wxEVT_KEY_DOWN = wxNewEventType(); + wxEVT_KEY_UP = wxNewEventType(); + + // Set cursor event + wxEVT_SET_CURSOR = wxNewEventType(); + + // wxScrollbar and wxSlider event identifiers + wxEVT_SCROLL_TOP = wxNewEventType(); + wxEVT_SCROLL_BOTTOM = wxNewEventType(); + wxEVT_SCROLL_LINEUP = wxNewEventType(); + wxEVT_SCROLL_LINEDOWN = wxNewEventType(); + wxEVT_SCROLL_PAGEUP = wxNewEventType(); + wxEVT_SCROLL_PAGEDOWN = wxNewEventType(); + wxEVT_SCROLL_THUMBTRACK = wxNewEventType(); + wxEVT_SCROLL_THUMBRELEASE = wxNewEventType(); + + // Scroll events from wxWindow + wxEVT_SCROLLWIN_TOP = wxNewEventType(); + wxEVT_SCROLLWIN_BOTTOM = wxNewEventType(); + wxEVT_SCROLLWIN_LINEUP = wxNewEventType(); + wxEVT_SCROLLWIN_LINEDOWN = wxNewEventType(); + wxEVT_SCROLLWIN_PAGEUP = wxNewEventType(); + wxEVT_SCROLLWIN_PAGEDOWN = wxNewEventType(); + wxEVT_SCROLLWIN_THUMBTRACK = wxNewEventType(); + wxEVT_SCROLLWIN_THUMBRELEASE = wxNewEventType(); + + // System events + wxEVT_SIZE = wxNewEventType(); + wxEVT_MOVE = wxNewEventType(); + wxEVT_CLOSE_WINDOW = wxNewEventType(); + wxEVT_END_SESSION = wxNewEventType(); + wxEVT_QUERY_END_SESSION = wxNewEventType(); + wxEVT_ACTIVATE_APP = wxNewEventType(); + wxEVT_POWER = wxNewEventType(); + wxEVT_ACTIVATE = wxNewEventType(); + wxEVT_CREATE = wxNewEventType(); + wxEVT_DESTROY = wxNewEventType(); + wxEVT_SHOW = wxNewEventType(); + wxEVT_ICONIZE = wxNewEventType(); + wxEVT_MAXIMIZE = wxNewEventType(); + wxEVT_MOUSE_CAPTURE_CHANGED = wxNewEventType(); + wxEVT_PAINT = wxNewEventType(); + wxEVT_ERASE_BACKGROUND = wxNewEventType(); + wxEVT_NC_PAINT = wxNewEventType(); + wxEVT_PAINT_ICON = wxNewEventType(); + wxEVT_MENU_CHAR = wxNewEventType(); + wxEVT_MENU_INIT = wxNewEventType(); + wxEVT_MENU_HIGHLIGHT = wxNewEventType(); + wxEVT_POPUP_MENU_INIT = wxNewEventType(); + wxEVT_CONTEXT_MENU = wxNewEventType(); + wxEVT_SYS_COLOUR_CHANGED = wxNewEventType(); + wxEVT_SETTING_CHANGED = wxNewEventType(); + wxEVT_QUERY_NEW_PALETTE = wxNewEventType(); + wxEVT_PALETTE_CHANGED = wxNewEventType(); + wxEVT_JOY_BUTTON_DOWN = wxNewEventType(); + wxEVT_JOY_BUTTON_UP = wxNewEventType(); + wxEVT_JOY_MOVE = wxNewEventType(); + wxEVT_JOY_ZMOVE = wxNewEventType(); + wxEVT_DROP_FILES = wxNewEventType(); + wxEVT_DRAW_ITEM = wxNewEventType(); + wxEVT_MEASURE_ITEM = wxNewEventType(); + wxEVT_COMPARE_ITEM = wxNewEventType(); + wxEVT_INIT_DIALOG = wxNewEventType(); + wxEVT_IDLE = wxNewEventType(); + wxEVT_UPDATE_UI = wxNewEventType(); + + // System misc. + wxEVT_END_PROCESS = wxNewEventType(); + + // Dial up events + wxEVT_DIALUP_CONNECTED = wxNewEventType(); + wxEVT_DIALUP_DISCONNECTED = wxNewEventType(); + + // Generic command events + // Note: a click is a higher-level event than button down/up + wxEVT_COMMAND_LEFT_CLICK = wxNewEventType(); + wxEVT_COMMAND_LEFT_DCLICK = wxNewEventType(); + wxEVT_COMMAND_RIGHT_CLICK = wxNewEventType(); + wxEVT_COMMAND_RIGHT_DCLICK = wxNewEventType(); + wxEVT_COMMAND_SET_FOCUS = wxNewEventType(); + wxEVT_COMMAND_KILL_FOCUS = wxNewEventType(); + wxEVT_COMMAND_ENTER = wxNewEventType(); + + // Tree control event types + wxEVT_COMMAND_TREE_BEGIN_DRAG = wxNewEventType(); + wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxNewEventType(); + wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxNewEventType(); + wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxNewEventType(); + wxEVT_COMMAND_TREE_DELETE_ITEM = wxNewEventType(); + wxEVT_COMMAND_TREE_GET_INFO = wxNewEventType(); + wxEVT_COMMAND_TREE_SET_INFO = wxNewEventType(); + wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxNewEventType(); + wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxNewEventType(); + wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxNewEventType(); + wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxNewEventType(); + wxEVT_COMMAND_TREE_SEL_CHANGED = wxNewEventType(); + wxEVT_COMMAND_TREE_SEL_CHANGING = wxNewEventType(); + wxEVT_COMMAND_TREE_KEY_DOWN = wxNewEventType(); + wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxNewEventType(); + wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxNewEventType(); + wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxNewEventType(); + wxEVT_COMMAND_TREE_END_DRAG = wxNewEventType(); + + // List control event types + wxEVT_COMMAND_LIST_BEGIN_DRAG = wxNewEventType(); + wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxNewEventType(); + wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxNewEventType(); + wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxNewEventType(); + wxEVT_COMMAND_LIST_DELETE_ITEM = wxNewEventType(); + wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxNewEventType(); + wxEVT_COMMAND_LIST_GET_INFO = wxNewEventType(); + wxEVT_COMMAND_LIST_SET_INFO = wxNewEventType(); + wxEVT_COMMAND_LIST_ITEM_SELECTED = wxNewEventType(); + wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxNewEventType(); + wxEVT_COMMAND_LIST_KEY_DOWN = wxNewEventType(); + wxEVT_COMMAND_LIST_INSERT_ITEM = wxNewEventType(); + wxEVT_COMMAND_LIST_COL_CLICK = wxNewEventType(); + wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxNewEventType(); + wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxNewEventType(); + wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxNewEventType(); + + // Tab and notebook control event types + wxEVT_COMMAND_TAB_SEL_CHANGED = wxNewEventType(); + wxEVT_COMMAND_TAB_SEL_CHANGING = wxNewEventType(); + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxNewEventType(); + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxNewEventType(); + + // Splitter events + wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxNewEventType(); + wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxNewEventType(); + wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxNewEventType(); + wxEVT_COMMAND_SPLITTER_UNSPLIT = wxNewEventType(); + + // Wizard events + wxEVT_WIZARD_PAGE_CHANGED = wxNewEventType(); + wxEVT_WIZARD_PAGE_CHANGING = wxNewEventType(); + wxEVT_WIZARD_CANCEL = wxNewEventType(); + + // Calendar events + wxEVT_CALENDAR_SEL_CHANGED = wxNewEventType(); + wxEVT_CALENDAR_DAY_CHANGED = wxNewEventType(); + wxEVT_CALENDAR_MONTH_CHANGED = wxNewEventType(); + wxEVT_CALENDAR_YEAR_CHANGED = wxNewEventType(); + wxEVT_CALENDAR_DOUBLECLICKED = wxNewEventType(); + wxEVT_CALENDAR_WEEKDAY_CLICKED = wxNewEventType(); + + // Help events + wxEVT_HELP = wxNewEventType(); + wxEVT_DETAILED_HELP = wxNewEventType(); +} + +// ---------------------------------------------------------------------------- +// wxEventTableEntry +// ---------------------------------------------------------------------------- + +wxEventTableEntry::wxEventTableEntry(int evType, int id, int idLast, + wxObjectEventFunction fn, wxObject *data) +{ + static bool s_initEventsDone = FALSE; + if ( !s_initEventsDone ) + { + InitEvents(); + + s_initEventsDone = TRUE; + } + + m_eventType = evType; + m_id = id; + m_lastId = idLast; + m_fn = fn; + m_callbackUserData = data; +} + // ---------------------------------------------------------------------------- // wxEvent // ---------------------------------------------------------------------------- @@ -427,16 +676,6 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType, { m_extraLong = orient; m_commandInt = pos; - m_isScrolling = TRUE; -} - -void wxScrollEvent::CopyObject(wxObject& obj_d) const -{ - wxScrollEvent *obj = (wxScrollEvent*)&obj_d; - - wxCommandEvent::CopyObject(obj_d); - - obj->m_isScrolling = m_isScrolling; } /* @@ -450,7 +689,6 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType, m_eventType = commandType; m_extraLong = orient; m_commandInt = pos; - m_isScrolling = TRUE; } void wxScrollWinEvent::CopyObject(wxObject& obj_d) const @@ -461,7 +699,6 @@ void wxScrollWinEvent::CopyObject(wxObject& obj_d) const obj->m_extraLong = m_extraLong; obj->m_commandInt = m_commandInt; - obj->m_isScrolling = m_isScrolling; } /* @@ -758,14 +995,12 @@ void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const } wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win) - : wxEvent() { SetEventType(wxEVT_CREATE); SetEventObject(win); } wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win) - : wxEvent() { SetEventType(wxEVT_DESTROY); SetEventObject(win); @@ -814,7 +1049,7 @@ wxEvtHandler::~wxEvtHandler() wxNode *node = m_dynamicEvents->First(); while (node) { - wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); if (entry->m_callbackUserData) delete entry->m_callbackUserData; delete entry; node = node->Next(); @@ -1031,49 +1266,55 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event) bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event) { - int i = 0; - int commandId = event.GetId(); + wxEventType eventType = event.GetEventType(); + int eventId = event.GetId(); - // BC++ doesn't like while (table.entries[i].m_fn) - -#ifdef __SC__ - while (table.entries[i].m_fn != 0) + // BC++ doesn't like testing for m_fn without != 0 + for ( int i = 0; table.entries[i].m_fn != 0; i++ ) + { + // the line using reference exposes a bug in gcc: although it _seems_ + // to work, it leads to weird crashes later on during program + // execution +#ifdef __GNUG__ + wxEventTableEntry entry = table.entries[i]; #else - while (table.entries[i].m_fn != 0L) + const wxEventTableEntry& entry = table.entries[i]; #endif - { - if ((event.GetEventType() == table.entries[i].m_eventType) && - (table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1) - (table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) || - (table.entries[i].m_lastId != -1 && - (commandId >= table.entries[i].m_id && commandId <= table.entries[i].m_lastId)))) + + // match only if the event type is the same and the id is either -1 in + // the event table (meaning "any") or the event id matches the id + // specified in the event table either exactly or by falling into + // range between first and last + if ( eventType == entry.m_eventType ) { - event.Skip(FALSE); - event.m_callbackUserData = table.entries[i].m_callbackUserData; + int tableId1 = entry.m_id, + tableId2 = entry.m_lastId; - (this->*((wxEventFunction) (table.entries[i].m_fn)))(event); + if ( (tableId1 == -1) || + (tableId2 == -1 && eventId == tableId1) || + (tableId2 != -1 && + (eventId >= tableId1 && eventId <= tableId2)) ) + { + event.Skip(FALSE); + event.m_callbackUserData = entry.m_callbackUserData; - if ( event.GetSkipped() ) - return FALSE; - else - return TRUE; + (this->*((wxEventFunction) (entry.m_fn)))(event); + + return !event.GetSkipped(); + } } - i++; } + return FALSE; } void wxEvtHandler::Connect( int id, int lastId, - wxEventType eventType, + int eventType, wxObjectEventFunction func, wxObject *userData ) { - wxEventTableEntry *entry = new wxEventTableEntry; - entry->m_id = id; - entry->m_lastId = lastId; - entry->m_eventType = eventType; - entry->m_fn = func; - entry->m_callbackUserData = userData; + wxDynamicEventTableEntry *entry = + new wxDynamicEventTableEntry(eventType, id, lastId, func, userData); if (!m_dynamicEvents) m_dynamicEvents = new wxList; @@ -1091,7 +1332,7 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType, wxNode *node = m_dynamicEvents->First(); while (node) { - wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); if ((entry->m_id == id) && ((entry->m_lastId == lastId) || (lastId == -1)) && ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) && @@ -1118,7 +1359,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) wxNode *node = m_dynamicEvents->First(); while (node) { - wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); + wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data(); if (entry->m_fn) {