X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1dd989e1bf4c3667d27b3c27a9cf64a66484ee90..d11bb14faace68d2c69e9e94b2ba6824f43a2d59:/include/wx/event.h diff --git a/include/wx/event.h b/include/wx/event.h index 1e9f2df629..aaa172a39c 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -21,6 +21,7 @@ #if wxUSE_GUI #include "wx/gdicmn.h" + #include "wx/cursor.h" #endif #include "wx/thread.h" @@ -42,214 +43,256 @@ class WXDLLEXPORT wxList; // Event types // ---------------------------------------------------------------------------- -typedef int wxEventType; - -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; - -/* 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; + // For 16-bit BC++, these 2 would be identical otherwise (truncated) + #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_NB_PAGE_CHANGED + #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_NB_PAGE_CHANGING #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; +typedef int wxEventType; + +// the standard event types +enum +{ + wxEVT_NULL = 0, + wxEVT_FIRST = 10000, + + wxEVT_COMMAND_BUTTON_CLICKED = wxEVT_FIRST + 1, + wxEVT_COMMAND_CHECKBOX_CLICKED = wxEVT_FIRST + 2, + wxEVT_COMMAND_CHOICE_SELECTED = wxEVT_FIRST + 3, + wxEVT_COMMAND_LISTBOX_SELECTED = wxEVT_FIRST + 4, + wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxEVT_FIRST + 5, + wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxEVT_FIRST + 6, + wxEVT_COMMAND_TEXT_UPDATED = wxEVT_FIRST + 7, + wxEVT_COMMAND_TEXT_ENTER = wxEVT_FIRST + 8, + wxEVT_COMMAND_MENU_SELECTED = wxEVT_FIRST + 9, + wxEVT_COMMAND_TOOL_CLICKED = wxEVT_COMMAND_MENU_SELECTED, + wxEVT_COMMAND_SLIDER_UPDATED = wxEVT_FIRST + 10, + wxEVT_COMMAND_RADIOBOX_SELECTED = wxEVT_FIRST + 11, + wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxEVT_FIRST + 12, + //wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use wxEVT_SCROLL... events + wxEVT_COMMAND_SCROLLBAR_UPDATED = wxEVT_FIRST + 13, + wxEVT_COMMAND_VLBOX_SELECTED = wxEVT_FIRST + 14, + wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_FIRST + 15, + wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16, + wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17, + wxEVT_COMMAND_SPINCTRL_UPDATED = wxEVT_FIRST + 18, + + /* Sockets and timers send events, too */ + wxEVT_SOCKET = wxEVT_FIRST + 50, + wxEVT_TIMER = wxEVT_FIRST + 80, + + /* Mouse event types */ + wxEVT_LEFT_DOWN = wxEVT_FIRST + 100, + wxEVT_LEFT_UP = wxEVT_FIRST + 101, + wxEVT_MIDDLE_DOWN = wxEVT_FIRST + 102, + wxEVT_MIDDLE_UP = wxEVT_FIRST + 103, + wxEVT_RIGHT_DOWN = wxEVT_FIRST + 104, + wxEVT_RIGHT_UP = wxEVT_FIRST + 105, + wxEVT_MOTION = wxEVT_FIRST + 106, + wxEVT_ENTER_WINDOW = wxEVT_FIRST + 107, + wxEVT_LEAVE_WINDOW = wxEVT_FIRST + 108, + wxEVT_LEFT_DCLICK = wxEVT_FIRST + 109, + wxEVT_MIDDLE_DCLICK = wxEVT_FIRST + 110, + wxEVT_RIGHT_DCLICK = wxEVT_FIRST + 111, + wxEVT_SET_FOCUS = wxEVT_FIRST + 112, + wxEVT_KILL_FOCUS = wxEVT_FIRST + 113, + + /* Non-client mouse events */ + wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 200, + wxEVT_NC_LEFT_UP = wxEVT_FIRST + 201, + wxEVT_NC_MIDDLE_DOWN = wxEVT_FIRST + 202, + wxEVT_NC_MIDDLE_UP = wxEVT_FIRST + 203, + wxEVT_NC_RIGHT_DOWN = wxEVT_FIRST + 204, + wxEVT_NC_RIGHT_UP = wxEVT_FIRST + 205, + wxEVT_NC_MOTION = wxEVT_FIRST + 206, + wxEVT_NC_ENTER_WINDOW = wxEVT_FIRST + 207, + wxEVT_NC_LEAVE_WINDOW = wxEVT_FIRST + 208, + wxEVT_NC_LEFT_DCLICK = wxEVT_FIRST + 209, + wxEVT_NC_MIDDLE_DCLICK = wxEVT_FIRST + 210, + wxEVT_NC_RIGHT_DCLICK = wxEVT_FIRST + 211, + + /* Character input event type */ + wxEVT_CHAR = wxEVT_FIRST + 212, + wxEVT_CHAR_HOOK = wxEVT_FIRST + 213, + wxEVT_NAVIGATION_KEY = wxEVT_FIRST + 214, + wxEVT_KEY_DOWN = wxEVT_FIRST + 215, + wxEVT_KEY_UP = wxEVT_FIRST + 216, + + /* Set cursor event */ + wxEVT_SET_CURSOR = wxEVT_FIRST + 230, -/* 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; + /* + * wxScrollbar and wxSlider event identifiers + */ + wxEVT_SCROLL_TOP = wxEVT_FIRST + 300, + wxEVT_SCROLL_BOTTOM = wxEVT_FIRST + 301, + wxEVT_SCROLL_LINEUP = wxEVT_FIRST + 302, + wxEVT_SCROLL_LINEDOWN = wxEVT_FIRST + 303, + wxEVT_SCROLL_PAGEUP = wxEVT_FIRST + 304, + wxEVT_SCROLL_PAGEDOWN = wxEVT_FIRST + 305, + wxEVT_SCROLL_THUMBTRACK = wxEVT_FIRST + 306, + wxEVT_SCROLL_THUMBRELEASE = wxEVT_FIRST + 307, -const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000; + /* + * Scroll events from wxWindow + */ + wxEVT_SCROLLWIN_TOP = wxEVT_FIRST + 320, + wxEVT_SCROLLWIN_BOTTOM = wxEVT_FIRST + 321, + wxEVT_SCROLLWIN_LINEUP = wxEVT_FIRST + 322, + wxEVT_SCROLLWIN_LINEDOWN = wxEVT_FIRST + 323, + wxEVT_SCROLLWIN_PAGEUP = wxEVT_FIRST + 324, + wxEVT_SCROLLWIN_PAGEDOWN = wxEVT_FIRST + 325, + wxEVT_SCROLLWIN_THUMBTRACK = wxEVT_FIRST + 326, + wxEVT_SCROLLWIN_THUMBRELEASE = wxEVT_FIRST + 327, + + /* + * System events + */ + wxEVT_SIZE = wxEVT_FIRST + 400, + wxEVT_MOVE = wxEVT_FIRST + 401, + wxEVT_CLOSE_WINDOW = wxEVT_FIRST + 402, + wxEVT_END_SESSION = wxEVT_FIRST + 403, + wxEVT_QUERY_END_SESSION = wxEVT_FIRST + 404, + wxEVT_ACTIVATE_APP = wxEVT_FIRST + 405, + wxEVT_POWER = wxEVT_FIRST + 406, + wxEVT_ACTIVATE = wxEVT_FIRST + 409, + wxEVT_CREATE = wxEVT_FIRST + 410, + wxEVT_DESTROY = wxEVT_FIRST + 411, + wxEVT_SHOW = wxEVT_FIRST + 412, + wxEVT_ICONIZE = wxEVT_FIRST + 413, + wxEVT_MAXIMIZE = wxEVT_FIRST + 414, + wxEVT_MOUSE_CAPTURE_CHANGED = wxEVT_FIRST + 415, + wxEVT_PAINT = wxEVT_FIRST + 416, + wxEVT_ERASE_BACKGROUND = wxEVT_FIRST + 417, + wxEVT_NC_PAINT = wxEVT_FIRST + 418, + wxEVT_PAINT_ICON = wxEVT_FIRST + 419, + wxEVT_MENU_CHAR = wxEVT_FIRST + 420, + wxEVT_MENU_INIT = wxEVT_FIRST + 421, + wxEVT_MENU_HIGHLIGHT = wxEVT_FIRST + 422, + wxEVT_POPUP_MENU_INIT = wxEVT_FIRST + 423, + wxEVT_CONTEXT_MENU = wxEVT_FIRST + 424, + wxEVT_SYS_COLOUR_CHANGED = wxEVT_FIRST + 425, + wxEVT_SETTING_CHANGED = wxEVT_FIRST + 426, + wxEVT_QUERY_NEW_PALETTE = wxEVT_FIRST + 427, + wxEVT_PALETTE_CHANGED = wxEVT_FIRST + 428, + wxEVT_JOY_BUTTON_DOWN = wxEVT_FIRST + 429, + wxEVT_JOY_BUTTON_UP = wxEVT_FIRST + 430, + wxEVT_JOY_MOVE = wxEVT_FIRST + 431, + wxEVT_JOY_ZMOVE = wxEVT_FIRST + 432, + wxEVT_DROP_FILES = wxEVT_FIRST + 433, + wxEVT_DRAW_ITEM = wxEVT_FIRST + 434, + wxEVT_MEASURE_ITEM = wxEVT_FIRST + 435, + wxEVT_COMPARE_ITEM = wxEVT_FIRST + 436, + wxEVT_INIT_DIALOG = wxEVT_FIRST + 437, + wxEVT_IDLE = wxEVT_FIRST + 438, + wxEVT_UPDATE_UI = wxEVT_FIRST + 439, + + /* System misc. */ + wxEVT_END_PROCESS = wxEVT_FIRST + 440, + + /* Dial up events */ + wxEVT_DIALUP_CONNECTED = wxEVT_FIRST + 450, + wxEVT_DIALUP_DISCONNECTED = wxEVT_FIRST + 451, + + /* Generic command events */ + /* Note: a click is a higher-level event than button down/up */ + wxEVT_COMMAND_LEFT_CLICK = wxEVT_FIRST + 500, + wxEVT_COMMAND_LEFT_DCLICK = wxEVT_FIRST + 501, + wxEVT_COMMAND_RIGHT_CLICK = wxEVT_FIRST + 502, + wxEVT_COMMAND_RIGHT_DCLICK = wxEVT_FIRST + 503, + wxEVT_COMMAND_SET_FOCUS = wxEVT_FIRST + 504, + wxEVT_COMMAND_KILL_FOCUS = wxEVT_FIRST + 505, + wxEVT_COMMAND_ENTER = wxEVT_FIRST + 506, + + /* Tree control event types */ + wxEVT_COMMAND_TREE_BEGIN_DRAG = wxEVT_FIRST + 600, + wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxEVT_FIRST + 601, + wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxEVT_FIRST + 602, + wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxEVT_FIRST + 603, + wxEVT_COMMAND_TREE_DELETE_ITEM = wxEVT_FIRST + 604, + wxEVT_COMMAND_TREE_GET_INFO = wxEVT_FIRST + 605, + wxEVT_COMMAND_TREE_SET_INFO = wxEVT_FIRST + 606, + wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxEVT_FIRST + 607, + wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxEVT_FIRST + 608, + wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxEVT_FIRST + 609, + wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxEVT_FIRST + 610, + wxEVT_COMMAND_TREE_SEL_CHANGED = wxEVT_FIRST + 611, + wxEVT_COMMAND_TREE_SEL_CHANGING = wxEVT_FIRST + 612, + wxEVT_COMMAND_TREE_KEY_DOWN = wxEVT_FIRST + 613, + wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxEVT_FIRST + 614, + wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxEVT_FIRST + 615, + wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 616, + wxEVT_COMMAND_TREE_END_DRAG = wxEVT_FIRST + 617, + + /* List control event types */ + wxEVT_COMMAND_LIST_BEGIN_DRAG = wxEVT_FIRST + 700, + wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxEVT_FIRST + 701, + wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxEVT_FIRST + 702, + wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxEVT_FIRST + 703, + wxEVT_COMMAND_LIST_DELETE_ITEM = wxEVT_FIRST + 704, + wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxEVT_FIRST + 705, + wxEVT_COMMAND_LIST_GET_INFO = wxEVT_FIRST + 706, + wxEVT_COMMAND_LIST_SET_INFO = wxEVT_FIRST + 707, + wxEVT_COMMAND_LIST_ITEM_SELECTED = wxEVT_FIRST + 708, + wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxEVT_FIRST + 709, + wxEVT_COMMAND_LIST_KEY_DOWN = wxEVT_FIRST + 710, + wxEVT_COMMAND_LIST_INSERT_ITEM = wxEVT_FIRST + 711, + wxEVT_COMMAND_LIST_COL_CLICK = wxEVT_FIRST + 712, + wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxEVT_FIRST + 713, + wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 714, + wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxEVT_FIRST + 715, + + /* Tab and notebook control event types */ + wxEVT_COMMAND_TAB_SEL_CHANGED = wxEVT_FIRST + 800, + wxEVT_COMMAND_TAB_SEL_CHANGING = wxEVT_FIRST + 801, + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxEVT_FIRST + 802, + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxEVT_FIRST + 803, + + /* Splitter events */ + wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxEVT_FIRST + 850, + wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxEVT_FIRST + 851, + wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxEVT_FIRST + 852, + wxEVT_COMMAND_SPLITTER_UNSPLIT = wxEVT_FIRST + 853, + + /* Wizard events */ + wxEVT_WIZARD_PAGE_CHANGED = wxEVT_FIRST + 900, + wxEVT_WIZARD_PAGE_CHANGING = wxEVT_FIRST + 901, + wxEVT_WIZARD_CANCEL = wxEVT_FIRST + 902, + + /* Calendar events */ + wxEVT_CALENDAR_SEL_CHANGED = wxEVT_FIRST + 950, + wxEVT_CALENDAR_DAY_CHANGED = wxEVT_FIRST + 951, + wxEVT_CALENDAR_MONTH_CHANGED = wxEVT_FIRST + 952, + wxEVT_CALENDAR_YEAR_CHANGED = wxEVT_FIRST + 953, + wxEVT_CALENDAR_DOUBLECLICKED = wxEVT_FIRST + 954, + wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955, + + /* Plot events */ + wxEVT_PLOT_SEL_CHANGING = wxEVT_FIRST + 1000, + wxEVT_PLOT_SEL_CHANGED = wxEVT_FIRST + 1001, + wxEVT_PLOT_CLICKED = wxEVT_FIRST + 1002, + wxEVT_PLOT_DOUBLECLICKED = wxEVT_FIRST + 1003, + wxEVT_PLOT_ZOOM_IN = wxEVT_FIRST + 1004, + wxEVT_PLOT_ZOOM_OUT = wxEVT_FIRST + 1005, + wxEVT_PLOT_VALUE_SEL_CREATING = wxEVT_FIRST + 1010, + wxEVT_PLOT_VALUE_SEL_CREATED = wxEVT_FIRST + 1011, + wxEVT_PLOT_VALUE_SEL_CHANGING = wxEVT_FIRST + 1012, + wxEVT_PLOT_VALUE_SEL_CHANGED = wxEVT_FIRST + 1013, + wxEVT_PLOT_AREA_SEL_CREATING = wxEVT_FIRST + 1014, + wxEVT_PLOT_AREA_SEL_CREATED = wxEVT_FIRST + 1015, + wxEVT_PLOT_AREA_SEL_CHANGING = wxEVT_FIRST + 1016, + wxEVT_PLOT_AREA_SEL_CHANGED = wxEVT_FIRST + 1017, + wxEVT_PLOT_BEGIN_X_LABEL_EDIT = wxEVT_FIRST + 1020, + wxEVT_PLOT_END_X_LABEL_EDIT = wxEVT_FIRST + 1021, + wxEVT_PLOT_BEGIN_Y_LABEL_EDIT = wxEVT_FIRST + 1022, + wxEVT_PLOT_END_Y_LABEL_EDIT = wxEVT_FIRST + 1023, + wxEVT_PLOT_BEGIN_TITLE_EDIT = wxEVT_FIRST + 1024, + wxEVT_PLOT_END_TITLE_EDIT = wxEVT_FIRST + 1025, + wxEVT_PLOT_AREA_CREATE = wxEVT_FIRST + 1026, + + wxEVT_USER_FIRST = wxEVT_FIRST + 2000 +}; /* Compatibility */ @@ -400,7 +443,7 @@ public: wxString GetString() const { return m_commandString; } // Get checkbox value - bool Checked() const { return (m_commandInt != 0); } + bool IsChecked() const { return m_commandInt != 0; } // TRUE if the listbox event was a selection. bool IsSelection() const { return (m_extraLong != 0); } @@ -413,6 +456,10 @@ public: void CopyObject(wxObject& obj) const; +#ifdef WXWIN_COMPATIBILITY_2 + bool Checked() const { return IsChecked(); } +#endif // WXWIN_COMPATIBILITY_2 + public: wxString m_commandString; // String event argument int m_commandInt; @@ -429,12 +476,19 @@ public: wxNotifyEvent(wxEventType commandType = wxEVT_NULL, int id = 0) : wxCommandEvent(commandType, id) { m_bAllow = TRUE; } - // veto the operation (by default it's allowed) + // veto the operation (usually it's allowed by default) void Veto() { m_bAllow = FALSE; } + // allow the operation if it was disabled by default + void Allow() { m_bAllow = TRUE; } + // for implementation code only: is the operation allowed? bool IsAllowed() const { return m_bAllow; } + // probably useless: CopyObject() is used for deferred event + // handling but wxNotifyEvent must be processed immediately + void CopyObject(wxObject& obj) const; + private: bool m_bAllow; @@ -451,6 +505,7 @@ private: wxEVT_SCROLL_PAGEUP wxEVT_SCROLL_PAGEDOWN wxEVT_SCROLL_THUMBTRACK + wxEVT_SCROLL_THUMBRELEASE */ class WXDLLEXPORT wxScrollEvent : public wxCommandEvent @@ -483,6 +538,7 @@ public: wxEVT_SCROLLWIN_PAGEUP wxEVT_SCROLLWIN_PAGEDOWN wxEVT_SCROLLWIN_THUMBTRACK + wxEVT_SCROLLWIN_THUMBRELEASE */ class WXDLLEXPORT wxScrollWinEvent : public wxEvent @@ -506,7 +562,7 @@ public: void CopyObject(wxObject& object_dest) const; public: int m_commandInt; // Additional information - long m_extraLong; + long m_extraLong; }; // Mouse event class @@ -605,15 +661,23 @@ public: bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); } // Find the position of the event - void GetPosition(long *xpos, long *ypos) const - { if (xpos) *xpos = m_x; - if (ypos) *ypos = m_y; } - void GetPosition(int *xpos, int *ypos) const - { if (xpos) *xpos = m_x; - if (ypos) *ypos = m_y; } - void Position(long *xpos, long *ypos) const - { if (xpos) *xpos = m_x; - if (ypos) *ypos = m_y; } + void GetPosition(wxCoord *xpos, wxCoord *ypos) const + { + if (xpos) + *xpos = m_x; + if (ypos) + *ypos = m_y; + } + +#ifndef __WIN16__ + void GetPosition(long *xpos, long *ypos) const + { + if (xpos) + *xpos = (long)m_x; + if (ypos) + *ypos = (long)m_y; + } +#endif // Find the position of the event wxPoint GetPosition() const { return wxPoint(m_x, m_y); } @@ -623,6 +687,14 @@ public: // Compatibility #if WXWIN_COMPATIBILITY + void Position(long *xpos, long *ypos) const + { + if (xpos) + *xpos = (long)m_x; + if (ypos) + *ypos = (long)m_y; + } + void Position(float *xpos, float *ypos) const { *xpos = (float) m_x; *ypos = (float) m_y; @@ -630,16 +702,16 @@ public: #endif // WXWIN_COMPATIBILITY // Get X position - long GetX() const { return m_x; } + wxCoord GetX() const { return m_x; } // Get Y position - long GetY() const { return m_y; } + wxCoord GetY() const { return m_y; } void CopyObject(wxObject& obj) const; public: - long m_x; - long m_y; + wxCoord m_x, m_y; + bool m_leftDown; bool m_middleDown; bool m_rightDown; @@ -650,6 +722,35 @@ public: bool m_metaDown; }; +// Cursor set event + +/* + wxEVT_SET_CURSOR + */ + +class WXDLLEXPORT wxSetCursorEvent : public wxEvent +{ +public: + wxSetCursorEvent(wxCoord x, wxCoord y) + { + m_eventType = wxEVT_SET_CURSOR; + + m_x = x; + m_y = y; + } + + wxCoord GetX() const { return m_x; } + wxCoord GetY() const { return m_y; } + + void SetCursor(const wxCursor& cursor) { m_cursor = cursor; } + const wxCursor& GetCursor() const { return m_cursor; } + bool HasCursor() const { return m_cursor.Ok(); } + +private: + wxCoord m_x, m_y; + wxCursor m_cursor; +}; + // Keyboard input event class /* @@ -671,31 +772,46 @@ public: bool MetaDown() const { return m_metaDown; } bool AltDown() const { return m_altDown; } bool ShiftDown() const { return m_shiftDown; } - long KeyCode() const { return m_keyCode; } + + bool HasModifiers() const { return ControlDown() || AltDown() || MetaDown(); } + + // get the key code: an ASCII7 char or an element of wxKeyCode enum + int GetKeyCode() const { return (int)m_keyCode; } // Find the position of the event + void GetPosition(wxCoord *xpos, wxCoord *ypos) const + { + if (xpos) *xpos = m_x; + if (ypos) *ypos = m_y; + } + +#ifndef __WIN16__ void GetPosition(long *xpos, long *ypos) const - { if (xpos) *xpos = m_x; - if (ypos) *ypos = m_y; } - void GetPosition(int *xpos, int *ypos) const - { if (xpos) *xpos = m_x; - if (ypos) *ypos = m_y; } + { + if (xpos) *xpos = (long)m_x; + if (ypos) *ypos = (long)m_y; + } +#endif wxPoint GetPosition() const { return wxPoint(m_x, m_y); } // Get X position - long GetX() const { return m_x; } + wxCoord GetX() const { return m_x; } // Get Y position - long GetY() const { return m_y; } + wxCoord GetY() const { return m_y; } void CopyObject(wxObject& obj) const; + // deprecated + long KeyCode() const { return m_keyCode; } + public: - long m_x; - long m_y; + wxCoord m_x, m_y; + long m_keyCode; + bool m_controlDown; bool m_shiftDown; bool m_altDown; @@ -1202,27 +1318,56 @@ protected: Event generated by dialog navigation keys wxEVT_NAVIGATION_KEY */ -// must derive from command event to be propagated to the parent -class WXDLLEXPORT wxNavigationKeyEvent : public wxCommandEvent +// NB: don't derive from command event to avoid being propagated to the parent +class WXDLLEXPORT wxNavigationKeyEvent : public wxEvent { - DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent) - public: - wxNavigationKeyEvent() : wxCommandEvent(wxEVT_NAVIGATION_KEY) { } + wxNavigationKeyEvent() + { + SetEventType(wxEVT_NAVIGATION_KEY); + + m_flags = IsForward | Propagate; // defaults are for TAB + m_focus = (wxWindow *)NULL; + } // direction: forward (true) or backward (false) - bool GetDirection() const { return m_commandInt == 1; } - void SetDirection(bool bForward) { m_commandInt = bForward; } + bool GetDirection() const + { return (m_flags & IsForward) != 0; } + void SetDirection(bool bForward) + { if ( bForward ) m_flags |= IsForward; else m_flags &= ~IsForward; } // it may be a window change event (MDI, notebook pages...) or a control // change event - bool IsWindowChange() const { return m_extraLong == 1; } - void SetWindowChange(bool bIs) { m_extraLong = bIs; } + bool IsWindowChange() const + { return (m_flags & WinChange) != 0; } + void SetWindowChange(bool bIs) + { if ( bIs ) m_flags |= WinChange; else m_flags &= ~WinChange; } + + // some navigation events are meant to be propagated upwards (Windows + // convention is to do this for TAB events) while others should always + // cycle inside the panel/radiobox/whatever we're current inside + bool ShouldPropagate() const + { return (m_flags & Propagate) != 0; } + void SetPropagate(bool bDoIt) + { if ( bDoIt ) m_flags |= Propagate; else m_flags &= ~Propagate; } // the child which has the focus currently (may be NULL - use // wxWindow::FindFocus then) - wxWindow* GetCurrentFocus() const { return (wxWindow *)m_clientData; } - void SetCurrentFocus(wxWindow *win) { m_clientData = (void *)win; } + wxWindow* GetCurrentFocus() const { return m_focus; } + void SetCurrentFocus(wxWindow *win) { m_focus = win; } + +private: + enum + { + IsForward = 0x0001, + WinChange = 0x0002, + Propagate = 0x0004 + }; + + long m_flags; + wxWindow *m_focus; + + DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent) }; // Window creation/destruction events: the first is sent as soon as window is @@ -1235,7 +1380,7 @@ public: wxEVT_DESTROY */ -class WXDLLEXPORT wxWindowCreateEvent : public wxEvent +class WXDLLEXPORT wxWindowCreateEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS(wxWindowCreateEvent) @@ -1245,7 +1390,7 @@ public: wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } }; -class WXDLLEXPORT wxWindowDestroyEvent : public wxEvent +class WXDLLEXPORT wxWindowDestroyEvent : public wxCommandEvent { DECLARE_DYNAMIC_CLASS(wxWindowDestroyEvent) @@ -1339,7 +1484,7 @@ public: // process all pending events void ProcessPendingEvents(); - // add a + // add a #if wxUSE_THREADS bool ProcessThreadEvent(wxEvent& event); #endif @@ -1356,12 +1501,28 @@ public: wxObject *userData = (wxObject *) NULL ) { Connect(id, -1, eventType, func, userData); } + bool Disconnect( int id, int lastId = -1, wxEventType eventType = wxEVT_NULL, + wxObjectEventFunction func = NULL, + wxObject *userData = (wxObject *) NULL ); + + // Convenience function: take just one id + bool Disconnect( int id, wxEventType eventType = wxEVT_NULL, + wxObjectEventFunction func = NULL, + wxObject *userData = (wxObject *) NULL ) + { return Disconnect(id, -1, eventType, func, userData); } + // implementation from now on virtual bool SearchEventTable(wxEventTable& table, wxEvent& event); bool SearchDynamicEventTable( wxEvent& event ); #if wxUSE_THREADS - void ClearEventLocker() { delete m_eventsLocker; m_eventsLocker = NULL; }; + void ClearEventLocker() + { +# if !defined(__VISAGECPP__) + delete m_eventsLocker; + m_eventsLocker = NULL; +#endif + }; #endif // old stuff @@ -1396,7 +1557,11 @@ protected: wxList* m_dynamicEvents; wxList* m_pendingEvents; #if wxUSE_THREADS +#if defined (__VISAGECPP__) + wxCriticalSection m_eventsLocker; +# else wxCriticalSection* m_eventsLocker; +# endif #endif // optimization: instead of using costly IsKindOf() to decide whether we're @@ -1434,6 +1599,10 @@ typedef void (wxEvtHandler::*wxMaximizeEventFunction)(wxShowEvent&); typedef void (wxEvtHandler::*wxNavigationKeyEventFunction)(wxNavigationKeyEvent&); typedef void (wxEvtHandler::*wxPaletteChangedEventFunction)(wxPaletteChangedEvent&); typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEvent&); +typedef void (wxEvtHandler::*wxWindowCreateEventFunction)(wxWindowCreateEvent&); +typedef void (wxEvtHandler::*wxWindowDestroyEventFunction)(wxWindowDestroyEvent&); +typedef void (wxEvtHandler::*wxSetCursorEventFunction)(wxSetCursorEvent&); +typedef void (wxEvtHandler::*wxNotifyEventFunction)(wxNotifyEvent&); #endif // wxUSE_GUI // N.B. In GNU-WIN32, you *have* to take the address of a member function @@ -1492,8 +1661,9 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ #define EVT_NAVIGATION_KEY(func) { wxEVT_NAVIGATION_KEY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNavigationKeyEventFunction) & func, (wxObject *) NULL }, #define EVT_PALETTE_CHANGED(func) { wxEVT_PALETTE_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaletteChangedEventFunction) & func, (wxObject *) NULL }, #define EVT_QUERY_NEW_PALETTE(func) { wxEVT_QUERY_NEW_PALETTE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL }, -#define EVT_WINDOW_CREATE(func) { wxEVT_CREATE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL }, -#define EVT_WINDOW_DESTROY(func) { wxEVT_DESTROY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL }, +#define EVT_WINDOW_CREATE(func) { wxEVT_CREATE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxWindowCreateEventFunction) & func, (wxObject *) NULL }, +#define EVT_WINDOW_DESTROY(func) { wxEVT_DESTROY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxWindowDestroyEventFunction) & func, (wxObject *) NULL }, +#define EVT_SET_CURSOR(func) { wxEVT_SET_CURSOR, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSetCursorEventFunction) & func, (wxObject *) NULL }, // Mouse events #define EVT_LEFT_DOWN(func) { wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL }, @@ -1536,7 +1706,8 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ { wxEVT_SCROLLWIN_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\ { wxEVT_SCROLLWIN_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\ { wxEVT_SCROLLWIN_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\ - { wxEVT_SCROLLWIN_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL }, + { wxEVT_SCROLLWIN_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL },\ + { wxEVT_SCROLLWIN_THUMBRELEASE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL }, #define EVT_SCROLLWIN_TOP(func) { wxEVT_SCROLLWIN_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL }, #define EVT_SCROLLWIN_BOTTOM(func) { wxEVT_SCROLLWIN_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL }, @@ -1545,6 +1716,7 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ #define EVT_SCROLLWIN_PAGEUP(func) { wxEVT_SCROLLWIN_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL }, #define EVT_SCROLLWIN_PAGEDOWN(func) { wxEVT_SCROLLWIN_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL }, #define EVT_SCROLLWIN_THUMBTRACK(func) { wxEVT_SCROLLWIN_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL }, +#define EVT_SCROLLWIN_THUMBRELEASE(func) { wxEVT_SCROLLWIN_THUMBRELEASE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL }, // Scrolling from wxSlider and wxScrollBar #define EVT_SCROLL(func) \ @@ -1554,7 +1726,8 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ { wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\ { wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\ { wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\ - { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, + { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\ + { wxEVT_SCROLL_THUMBRELEASE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, #define EVT_SCROLL_TOP(func) { wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, #define EVT_SCROLL_BOTTOM(func) { wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, @@ -1563,6 +1736,7 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ #define EVT_SCROLL_PAGEUP(func) { wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, #define EVT_SCROLL_PAGEDOWN(func) { wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, #define EVT_SCROLL_THUMBTRACK(func) { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, +#define EVT_SCROLL_THUMBRELEASE(func) { wxEVT_SCROLL_THUMBRELEASE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, // Scrolling from wxSlider and wxScrollBar, with an id #define EVT_COMMAND_SCROLL(id, func) \ @@ -1572,7 +1746,8 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\ { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\ { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\ - { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, + { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\ + { wxEVT_SCROLL_THUMBRELEASE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, #define EVT_COMMAND_SCROLL_TOP(id, func) { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, #define EVT_COMMAND_SCROLL_BOTTOM(id, func) { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, @@ -1581,6 +1756,7 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ #define EVT_COMMAND_SCROLL_PAGEUP(id, func) { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, #define EVT_COMMAND_SCROLL_PAGEDOWN(id, func) { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, #define EVT_COMMAND_SCROLL_THUMBTRACK(id, func) { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, +#define EVT_COMMAND_SCROLL_THUMBRELEASE(id, func) { wxEVT_SCROLL_THUMBRELEASE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL }, // Convenience macros for commonly-used commands #define EVT_BUTTON(id, fn) { wxEVT_COMMAND_BUTTON_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, @@ -1630,15 +1806,17 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ { wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\ { wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\ { wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\ - { wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\ + { wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL }, // Idle event #define EVT_IDLE(func) \ - { wxEVT_IDLE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) & func, (wxObject *) NULL },\ + { wxEVT_IDLE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) & func, (wxObject *) NULL }, // Update UI event #define EVT_UPDATE_UI(id, func) \ - { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },\ + { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL }, +#define EVT_UPDATE_UI_RANGE(id1, id2, func) \ + { wxEVT_UPDATE_UI, id1, id2, (wxObjectEventFunction)(wxEventFunction)(wxUpdateUIEventFunction)&func, (wxObject *) NULL }, // ---------------------------------------------------------------------------- // Global data