New event types for use in external libs (and from

now on actually everywhere).
  Adapted cshelp to new event types.
  Adapted wxGrid to new event types.
  Update for German translation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2001-01-25 18:30:30 +00:00
parent 4c075b7090
commit 77d4384e31
5 changed files with 480 additions and 283 deletions

View File

@ -51,254 +51,222 @@ class WXDLLEXPORT wxList;
typedef int wxEventType; typedef int wxEventType;
// generate a new unique event type
int wxNewEventType();
// the standard event types // the standard event types
enum extern const int wxEVT_NULL;
{ extern const int wxEVT_FIRST;
wxEVT_NULL = 0,
wxEVT_FIRST = 10000,
wxEVT_COMMAND_BUTTON_CLICKED = wxEVT_FIRST + 1, extern const int wxEVT_COMMAND_BUTTON_CLICKED;
wxEVT_COMMAND_CHECKBOX_CLICKED = wxEVT_FIRST + 2, extern const int wxEVT_COMMAND_CHECKBOX_CLICKED;
wxEVT_COMMAND_CHOICE_SELECTED = wxEVT_FIRST + 3, extern const int wxEVT_COMMAND_CHOICE_SELECTED;
wxEVT_COMMAND_LISTBOX_SELECTED = wxEVT_FIRST + 4, extern const int wxEVT_COMMAND_LISTBOX_SELECTED;
wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxEVT_FIRST + 5, extern const int wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxEVT_FIRST + 6, extern const int wxEVT_COMMAND_CHECKLISTBOX_TOGGLED;
wxEVT_COMMAND_TEXT_UPDATED = wxEVT_FIRST + 7, extern const int wxEVT_COMMAND_TEXT_UPDATED;
wxEVT_COMMAND_TEXT_ENTER = wxEVT_FIRST + 8, extern const int wxEVT_COMMAND_TEXT_ENTER;
wxEVT_COMMAND_MENU_SELECTED = wxEVT_FIRST + 9, extern const int wxEVT_COMMAND_MENU_SELECTED;
wxEVT_COMMAND_TOOL_CLICKED = wxEVT_COMMAND_MENU_SELECTED, extern const int wxEVT_COMMAND_TOOL_CLICKED;
wxEVT_COMMAND_SLIDER_UPDATED = wxEVT_FIRST + 10, extern const int wxEVT_COMMAND_SLIDER_UPDATED;
wxEVT_COMMAND_RADIOBOX_SELECTED = wxEVT_FIRST + 11, extern const int wxEVT_COMMAND_RADIOBOX_SELECTED;
wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxEVT_FIRST + 12, extern const int wxEVT_COMMAND_RADIOBUTTON_SELECTED;
//wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use wxEVT_SCROLL... events extern const int wxEVT_COMMAND_SCROLLBAR_UPDATED;
wxEVT_COMMAND_SCROLLBAR_UPDATED = wxEVT_FIRST + 13, extern const int wxEVT_COMMAND_VLBOX_SELECTED;
wxEVT_COMMAND_VLBOX_SELECTED = wxEVT_FIRST + 14, extern const int wxEVT_COMMAND_COMBOBOX_SELECTED;
wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_FIRST + 15, extern const int wxEVT_COMMAND_TOOL_RCLICKED;
wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16, extern const int wxEVT_COMMAND_TOOL_ENTER;
wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17, extern const int wxEVT_COMMAND_SPINCTRL_UPDATED;
wxEVT_COMMAND_SPINCTRL_UPDATED = wxEVT_FIRST + 18,
/* Sockets and timers send events, too */ // Sockets and timers send events, too
wxEVT_SOCKET = wxEVT_FIRST + 50, extern const int wxEVT_SOCKET;
wxEVT_TIMER = wxEVT_FIRST + 80, extern const int wxEVT_TIMER;
/* Mouse event types */ // Mouse event types
wxEVT_LEFT_DOWN = wxEVT_FIRST + 100, extern const int wxEVT_LEFT_DOWN;
wxEVT_LEFT_UP = wxEVT_FIRST + 101, extern const int wxEVT_LEFT_UP;
wxEVT_MIDDLE_DOWN = wxEVT_FIRST + 102, extern const int wxEVT_MIDDLE_DOWN;
wxEVT_MIDDLE_UP = wxEVT_FIRST + 103, extern const int wxEVT_MIDDLE_UP;
wxEVT_RIGHT_DOWN = wxEVT_FIRST + 104, extern const int wxEVT_RIGHT_DOWN;
wxEVT_RIGHT_UP = wxEVT_FIRST + 105, extern const int wxEVT_RIGHT_UP;
wxEVT_MOTION = wxEVT_FIRST + 106, extern const int wxEVT_MOTION;
wxEVT_ENTER_WINDOW = wxEVT_FIRST + 107, extern const int wxEVT_ENTER_WINDOW;
wxEVT_LEAVE_WINDOW = wxEVT_FIRST + 108, extern const int wxEVT_LEAVE_WINDOW;
wxEVT_LEFT_DCLICK = wxEVT_FIRST + 109, extern const int wxEVT_LEFT_DCLICK;
wxEVT_MIDDLE_DCLICK = wxEVT_FIRST + 110, extern const int wxEVT_MIDDLE_DCLICK;
wxEVT_RIGHT_DCLICK = wxEVT_FIRST + 111, extern const int wxEVT_RIGHT_DCLICK;
wxEVT_SET_FOCUS = wxEVT_FIRST + 112, extern const int wxEVT_SET_FOCUS;
wxEVT_KILL_FOCUS = wxEVT_FIRST + 113, extern const int wxEVT_KILL_FOCUS;
/* Non-client mouse events */ // Non-client mouse events
wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 200, extern const int wxEVT_NC_LEFT_DOWN;
wxEVT_NC_LEFT_UP = wxEVT_FIRST + 201, extern const int wxEVT_NC_LEFT_UP;
wxEVT_NC_MIDDLE_DOWN = wxEVT_FIRST + 202, extern const int wxEVT_NC_MIDDLE_DOWN;
wxEVT_NC_MIDDLE_UP = wxEVT_FIRST + 203, extern const int wxEVT_NC_MIDDLE_UP;
wxEVT_NC_RIGHT_DOWN = wxEVT_FIRST + 204, extern const int wxEVT_NC_RIGHT_DOWN;
wxEVT_NC_RIGHT_UP = wxEVT_FIRST + 205, extern const int wxEVT_NC_RIGHT_UP;
wxEVT_NC_MOTION = wxEVT_FIRST + 206, extern const int wxEVT_NC_MOTION;
wxEVT_NC_ENTER_WINDOW = wxEVT_FIRST + 207, extern const int wxEVT_NC_ENTER_WINDOW;
wxEVT_NC_LEAVE_WINDOW = wxEVT_FIRST + 208, extern const int wxEVT_NC_LEAVE_WINDOW;
wxEVT_NC_LEFT_DCLICK = wxEVT_FIRST + 209, extern const int wxEVT_NC_LEFT_DCLICK;
wxEVT_NC_MIDDLE_DCLICK = wxEVT_FIRST + 210, extern const int wxEVT_NC_MIDDLE_DCLICK;
wxEVT_NC_RIGHT_DCLICK = wxEVT_FIRST + 211, extern const int wxEVT_NC_RIGHT_DCLICK;
/* Character input event type */ // Character input event type
wxEVT_CHAR = wxEVT_FIRST + 212, extern const int wxEVT_CHAR;
wxEVT_CHAR_HOOK = wxEVT_FIRST + 213, extern const int wxEVT_CHAR_HOOK;
wxEVT_NAVIGATION_KEY = wxEVT_FIRST + 214, extern const int wxEVT_NAVIGATION_KEY;
wxEVT_KEY_DOWN = wxEVT_FIRST + 215, extern const int wxEVT_KEY_DOWN;
wxEVT_KEY_UP = wxEVT_FIRST + 216, extern const int wxEVT_KEY_UP;
/* Set cursor event */ // Set cursor event
wxEVT_SET_CURSOR = wxEVT_FIRST + 230, extern const int wxEVT_SET_CURSOR;
/* // wxScrollbar and wxSlider event identifiers
* wxScrollbar and wxSlider event identifiers extern const int wxEVT_SCROLL_TOP;
*/ extern const int wxEVT_SCROLL_BOTTOM;
wxEVT_SCROLL_TOP = wxEVT_FIRST + 300, extern const int wxEVT_SCROLL_LINEUP;
wxEVT_SCROLL_BOTTOM = wxEVT_FIRST + 301, extern const int wxEVT_SCROLL_LINEDOWN;
wxEVT_SCROLL_LINEUP = wxEVT_FIRST + 302, extern const int wxEVT_SCROLL_PAGEUP;
wxEVT_SCROLL_LINEDOWN = wxEVT_FIRST + 303, extern const int wxEVT_SCROLL_PAGEDOWN;
wxEVT_SCROLL_PAGEUP = wxEVT_FIRST + 304, extern const int wxEVT_SCROLL_THUMBTRACK;
wxEVT_SCROLL_PAGEDOWN = wxEVT_FIRST + 305, extern const int wxEVT_SCROLL_THUMBRELEASE;
wxEVT_SCROLL_THUMBTRACK = wxEVT_FIRST + 306,
wxEVT_SCROLL_THUMBRELEASE = wxEVT_FIRST + 307,
/* // Scroll events from wxWindow
* Scroll events from wxWindow extern const int wxEVT_SCROLLWIN_TOP;
*/ extern const int wxEVT_SCROLLWIN_BOTTOM;
wxEVT_SCROLLWIN_TOP = wxEVT_FIRST + 320, extern const int wxEVT_SCROLLWIN_LINEUP;
wxEVT_SCROLLWIN_BOTTOM = wxEVT_FIRST + 321, extern const int wxEVT_SCROLLWIN_LINEDOWN;
wxEVT_SCROLLWIN_LINEUP = wxEVT_FIRST + 322, extern const int wxEVT_SCROLLWIN_PAGEUP;
wxEVT_SCROLLWIN_LINEDOWN = wxEVT_FIRST + 323, extern const int wxEVT_SCROLLWIN_PAGEDOWN;
wxEVT_SCROLLWIN_PAGEUP = wxEVT_FIRST + 324, extern const int wxEVT_SCROLLWIN_THUMBTRACK;
wxEVT_SCROLLWIN_PAGEDOWN = wxEVT_FIRST + 325, extern const int wxEVT_SCROLLWIN_THUMBRELEASE;
wxEVT_SCROLLWIN_THUMBTRACK = wxEVT_FIRST + 326,
wxEVT_SCROLLWIN_THUMBRELEASE = wxEVT_FIRST + 327,
/* // System events
* System events extern const int wxEVT_SIZE;
*/ extern const int wxEVT_MOVE;
wxEVT_SIZE = wxEVT_FIRST + 400, extern const int wxEVT_CLOSE_WINDOW;
wxEVT_MOVE = wxEVT_FIRST + 401, extern const int wxEVT_END_SESSION;
wxEVT_CLOSE_WINDOW = wxEVT_FIRST + 402, extern const int wxEVT_QUERY_END_SESSION;
wxEVT_END_SESSION = wxEVT_FIRST + 403, extern const int wxEVT_ACTIVATE_APP;
wxEVT_QUERY_END_SESSION = wxEVT_FIRST + 404, extern const int wxEVT_POWER;
wxEVT_ACTIVATE_APP = wxEVT_FIRST + 405, extern const int wxEVT_ACTIVATE;
wxEVT_POWER = wxEVT_FIRST + 406, extern const int wxEVT_CREATE;
wxEVT_ACTIVATE = wxEVT_FIRST + 409, extern const int wxEVT_DESTROY;
wxEVT_CREATE = wxEVT_FIRST + 410, extern const int wxEVT_SHOW;
wxEVT_DESTROY = wxEVT_FIRST + 411, extern const int wxEVT_ICONIZE;
wxEVT_SHOW = wxEVT_FIRST + 412, extern const int wxEVT_MAXIMIZE;
wxEVT_ICONIZE = wxEVT_FIRST + 413, extern const int wxEVT_MOUSE_CAPTURE_CHANGED;
wxEVT_MAXIMIZE = wxEVT_FIRST + 414, extern const int wxEVT_PAINT;
wxEVT_MOUSE_CAPTURE_CHANGED = wxEVT_FIRST + 415, extern const int wxEVT_ERASE_BACKGROUND;
wxEVT_PAINT = wxEVT_FIRST + 416, extern const int wxEVT_NC_PAINT;
wxEVT_ERASE_BACKGROUND = wxEVT_FIRST + 417, extern const int wxEVT_PAINT_ICON;
wxEVT_NC_PAINT = wxEVT_FIRST + 418, extern const int wxEVT_MENU_CHAR;
wxEVT_PAINT_ICON = wxEVT_FIRST + 419, extern const int wxEVT_MENU_INIT;
wxEVT_MENU_CHAR = wxEVT_FIRST + 420, extern const int wxEVT_MENU_HIGHLIGHT;
wxEVT_MENU_INIT = wxEVT_FIRST + 421, extern const int wxEVT_POPUP_MENU_INIT;
wxEVT_MENU_HIGHLIGHT = wxEVT_FIRST + 422, extern const int wxEVT_CONTEXT_MENU;
wxEVT_POPUP_MENU_INIT = wxEVT_FIRST + 423, extern const int wxEVT_SYS_COLOUR_CHANGED;
wxEVT_CONTEXT_MENU = wxEVT_FIRST + 424, extern const int wxEVT_SETTING_CHANGED;
wxEVT_SYS_COLOUR_CHANGED = wxEVT_FIRST + 425, extern const int wxEVT_QUERY_NEW_PALETTE;
wxEVT_SETTING_CHANGED = wxEVT_FIRST + 426, extern const int wxEVT_PALETTE_CHANGED;
wxEVT_QUERY_NEW_PALETTE = wxEVT_FIRST + 427, extern const int wxEVT_JOY_BUTTON_DOWN;
wxEVT_PALETTE_CHANGED = wxEVT_FIRST + 428, extern const int wxEVT_JOY_BUTTON_UP;
wxEVT_JOY_BUTTON_DOWN = wxEVT_FIRST + 429, extern const int wxEVT_JOY_MOVE;
wxEVT_JOY_BUTTON_UP = wxEVT_FIRST + 430, extern const int wxEVT_JOY_ZMOVE;
wxEVT_JOY_MOVE = wxEVT_FIRST + 431, extern const int wxEVT_DROP_FILES;
wxEVT_JOY_ZMOVE = wxEVT_FIRST + 432, extern const int wxEVT_DRAW_ITEM;
wxEVT_DROP_FILES = wxEVT_FIRST + 433, extern const int wxEVT_MEASURE_ITEM;
wxEVT_DRAW_ITEM = wxEVT_FIRST + 434, extern const int wxEVT_COMPARE_ITEM;
wxEVT_MEASURE_ITEM = wxEVT_FIRST + 435, extern const int wxEVT_INIT_DIALOG;
wxEVT_COMPARE_ITEM = wxEVT_FIRST + 436, extern const int wxEVT_IDLE;
wxEVT_INIT_DIALOG = wxEVT_FIRST + 437, extern const int wxEVT_UPDATE_UI;
wxEVT_IDLE = wxEVT_FIRST + 438,
wxEVT_UPDATE_UI = wxEVT_FIRST + 439,
/* System misc. */ // System misc.
wxEVT_END_PROCESS = wxEVT_FIRST + 440, extern const int wxEVT_END_PROCESS;
/* Dial up events */ // Dial up events
wxEVT_DIALUP_CONNECTED = wxEVT_FIRST + 450, extern const int wxEVT_DIALUP_CONNECTED;
wxEVT_DIALUP_DISCONNECTED = wxEVT_FIRST + 451, extern const int wxEVT_DIALUP_DISCONNECTED;
/* Generic command events */ // Generic command events
/* Note: a click is a higher-level event than button down/up */ // Note: a click is a higher-level event than button down/up
wxEVT_COMMAND_LEFT_CLICK = wxEVT_FIRST + 500, extern const int wxEVT_COMMAND_LEFT_CLICK;
wxEVT_COMMAND_LEFT_DCLICK = wxEVT_FIRST + 501, extern const int wxEVT_COMMAND_LEFT_DCLICK;
wxEVT_COMMAND_RIGHT_CLICK = wxEVT_FIRST + 502, extern const int wxEVT_COMMAND_RIGHT_CLICK;
wxEVT_COMMAND_RIGHT_DCLICK = wxEVT_FIRST + 503, extern const int wxEVT_COMMAND_RIGHT_DCLICK;
wxEVT_COMMAND_SET_FOCUS = wxEVT_FIRST + 504, extern const int wxEVT_COMMAND_SET_FOCUS;
wxEVT_COMMAND_KILL_FOCUS = wxEVT_FIRST + 505, extern const int wxEVT_COMMAND_KILL_FOCUS;
wxEVT_COMMAND_ENTER = wxEVT_FIRST + 506, extern const int wxEVT_COMMAND_ENTER;
/* Tree control event types */ // Tree control event types
wxEVT_COMMAND_TREE_BEGIN_DRAG = wxEVT_FIRST + 600, extern const int wxEVT_COMMAND_TREE_BEGIN_DRAG;
wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxEVT_FIRST + 601, extern const int wxEVT_COMMAND_TREE_BEGIN_RDRAG;
wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxEVT_FIRST + 602, extern const int wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxEVT_FIRST + 603, extern const int wxEVT_COMMAND_TREE_END_LABEL_EDIT;
wxEVT_COMMAND_TREE_DELETE_ITEM = wxEVT_FIRST + 604, extern const int wxEVT_COMMAND_TREE_DELETE_ITEM;
wxEVT_COMMAND_TREE_GET_INFO = wxEVT_FIRST + 605, extern const int wxEVT_COMMAND_TREE_GET_INFO;
wxEVT_COMMAND_TREE_SET_INFO = wxEVT_FIRST + 606, extern const int wxEVT_COMMAND_TREE_SET_INFO;
wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxEVT_FIRST + 607, extern const int wxEVT_COMMAND_TREE_ITEM_EXPANDED;
wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxEVT_FIRST + 608, extern const int wxEVT_COMMAND_TREE_ITEM_EXPANDING;
wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxEVT_FIRST + 609, extern const int wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxEVT_FIRST + 610, extern const int wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
wxEVT_COMMAND_TREE_SEL_CHANGED = wxEVT_FIRST + 611, extern const int wxEVT_COMMAND_TREE_SEL_CHANGED;
wxEVT_COMMAND_TREE_SEL_CHANGING = wxEVT_FIRST + 612, extern const int wxEVT_COMMAND_TREE_SEL_CHANGING;
wxEVT_COMMAND_TREE_KEY_DOWN = wxEVT_FIRST + 613, extern const int wxEVT_COMMAND_TREE_KEY_DOWN;
wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxEVT_FIRST + 614, extern const int wxEVT_COMMAND_TREE_ITEM_ACTIVATED;
wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxEVT_FIRST + 615, extern const int wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 616, extern const int wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK;
wxEVT_COMMAND_TREE_END_DRAG = wxEVT_FIRST + 617, extern const int wxEVT_COMMAND_TREE_END_DRAG;
/* List control event types */ // List control event types
wxEVT_COMMAND_LIST_BEGIN_DRAG = wxEVT_FIRST + 700, extern const int wxEVT_COMMAND_LIST_BEGIN_DRAG;
wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxEVT_FIRST + 701, extern const int wxEVT_COMMAND_LIST_BEGIN_RDRAG;
wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxEVT_FIRST + 702, extern const int wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxEVT_FIRST + 703, extern const int wxEVT_COMMAND_LIST_END_LABEL_EDIT;
wxEVT_COMMAND_LIST_DELETE_ITEM = wxEVT_FIRST + 704, extern const int wxEVT_COMMAND_LIST_DELETE_ITEM;
wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxEVT_FIRST + 705, extern const int wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
wxEVT_COMMAND_LIST_GET_INFO = wxEVT_FIRST + 706, extern const int wxEVT_COMMAND_LIST_GET_INFO;
wxEVT_COMMAND_LIST_SET_INFO = wxEVT_FIRST + 707, extern const int wxEVT_COMMAND_LIST_SET_INFO;
wxEVT_COMMAND_LIST_ITEM_SELECTED = wxEVT_FIRST + 708, extern const int wxEVT_COMMAND_LIST_ITEM_SELECTED;
wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxEVT_FIRST + 709, extern const int wxEVT_COMMAND_LIST_ITEM_DESELECTED;
wxEVT_COMMAND_LIST_KEY_DOWN = wxEVT_FIRST + 710, extern const int wxEVT_COMMAND_LIST_KEY_DOWN;
wxEVT_COMMAND_LIST_INSERT_ITEM = wxEVT_FIRST + 711, extern const int wxEVT_COMMAND_LIST_INSERT_ITEM;
wxEVT_COMMAND_LIST_COL_CLICK = wxEVT_FIRST + 712, extern const int wxEVT_COMMAND_LIST_COL_CLICK;
wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxEVT_FIRST + 713, extern const int wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxEVT_FIRST + 714, extern const int wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK;
wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxEVT_FIRST + 715, extern const int wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
/* Tab and notebook control event types */ // Tab and notebook control event types
wxEVT_COMMAND_TAB_SEL_CHANGED = wxEVT_FIRST + 800, extern const int wxEVT_COMMAND_TAB_SEL_CHANGED;
wxEVT_COMMAND_TAB_SEL_CHANGING = wxEVT_FIRST + 801, extern const int wxEVT_COMMAND_TAB_SEL_CHANGING;
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxEVT_FIRST + 802, extern const int wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED;
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxEVT_FIRST + 803, extern const int wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING;
/* Splitter events */ // Splitter events
wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxEVT_FIRST + 850, extern const int wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED;
wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxEVT_FIRST + 851, extern const int wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING;
wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxEVT_FIRST + 852, extern const int wxEVT_COMMAND_SPLITTER_DOUBLECLICKED;
wxEVT_COMMAND_SPLITTER_UNSPLIT = wxEVT_FIRST + 853, extern const int wxEVT_COMMAND_SPLITTER_UNSPLIT;
/* Wizard events */ // Wizard events
wxEVT_WIZARD_PAGE_CHANGED = wxEVT_FIRST + 900, extern const int wxEVT_WIZARD_PAGE_CHANGED;
wxEVT_WIZARD_PAGE_CHANGING = wxEVT_FIRST + 901, extern const int wxEVT_WIZARD_PAGE_CHANGING;
wxEVT_WIZARD_CANCEL = wxEVT_FIRST + 902, extern const int wxEVT_WIZARD_CANCEL;
/* Calendar events */ // Calendar events
wxEVT_CALENDAR_SEL_CHANGED = wxEVT_FIRST + 950, extern const int wxEVT_CALENDAR_SEL_CHANGED;
wxEVT_CALENDAR_DAY_CHANGED = wxEVT_FIRST + 951, extern const int wxEVT_CALENDAR_DAY_CHANGED;
wxEVT_CALENDAR_MONTH_CHANGED = wxEVT_FIRST + 952, extern const int wxEVT_CALENDAR_MONTH_CHANGED;
wxEVT_CALENDAR_YEAR_CHANGED = wxEVT_FIRST + 953, extern const int wxEVT_CALENDAR_YEAR_CHANGED;
wxEVT_CALENDAR_DOUBLECLICKED = wxEVT_FIRST + 954, extern const int wxEVT_CALENDAR_DOUBLECLICKED;
wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955, extern const int wxEVT_CALENDAR_WEEKDAY_CLICKED;
/* Plot events */ // Help events
wxEVT_PLOT_SEL_CHANGING = wxEVT_FIRST + 1000, extern const int wxEVT_HELP;
wxEVT_PLOT_SEL_CHANGED = wxEVT_FIRST + 1001, extern const int wxEVT_DETAILED_HELP;
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,
/* Help events */ // Compatibility
wxEVT_HELP = wxEVT_FIRST + 1050,
wxEVT_DETAILED_HELP,
wxEVT_USER_FIRST = wxEVT_FIRST + 2000
};
/* Compatibility */
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
@ -1485,6 +1453,18 @@ protected:
typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
struct WXDLLEXPORT wxEventTableEntry struct WXDLLEXPORT wxEventTableEntry
{
// For some reason, this can't be wxEventType, or VC++ complains.
const int &m_eventType; // main event type
int m_id; // control/menu/toolbar id
int m_lastId; // used for ranges of ids
wxObjectEventFunction m_fn; // function to call: not wxEventFunction,
// because of dependency problems
wxObject* m_callbackUserData;
};
struct WXDLLEXPORT wxDynamicEventTableEntry
{ {
// For some reason, this can't be wxEventType, or VC++ complains. // For some reason, this can't be wxEventType, or VC++ complains.
int m_eventType; // main event type int m_eventType; // main event type
@ -1534,12 +1514,12 @@ public:
// Dynamic association of a member function handler with the event handler, // Dynamic association of a member function handler with the event handler,
// id and event type // id and event type
void Connect( int id, int lastId, wxEventType eventType, void Connect( int id, int lastId, int eventType,
wxObjectEventFunction func, wxObjectEventFunction func,
wxObject *userData = (wxObject *) NULL ); wxObject *userData = (wxObject *) NULL );
// Convenience function: take just one id // Convenience function: take just one id
void Connect( int id, wxEventType eventType, void Connect( int id, int eventType,
wxObjectEventFunction func, wxObjectEventFunction func,
wxObject *userData = (wxObject *) NULL ) wxObject *userData = (wxObject *) NULL )
{ Connect(id, -1, eventType, func, userData); } { Connect(id, -1, eventType, func, userData); }

View File

@ -1876,21 +1876,21 @@ protected:
}; };
// TODO move to wx/event.h // TODO move to wx/event.h
const wxEventType wxEVT_GRID_CELL_LEFT_CLICK = wxEVT_FIRST + 1580; extern const int wxEVT_GRID_CELL_LEFT_CLICK;
const wxEventType wxEVT_GRID_CELL_RIGHT_CLICK = wxEVT_FIRST + 1581; extern const int wxEVT_GRID_CELL_RIGHT_CLICK;
const wxEventType wxEVT_GRID_CELL_LEFT_DCLICK = wxEVT_FIRST + 1582; extern const int wxEVT_GRID_CELL_LEFT_DCLICK;
const wxEventType wxEVT_GRID_CELL_RIGHT_DCLICK = wxEVT_FIRST + 1583; extern const int wxEVT_GRID_CELL_RIGHT_DCLICK;
const wxEventType wxEVT_GRID_LABEL_LEFT_CLICK = wxEVT_FIRST + 1584; extern const int wxEVT_GRID_LABEL_LEFT_CLICK;
const wxEventType wxEVT_GRID_LABEL_RIGHT_CLICK = wxEVT_FIRST + 1585; extern const int wxEVT_GRID_LABEL_RIGHT_CLICK;
const wxEventType wxEVT_GRID_LABEL_LEFT_DCLICK = wxEVT_FIRST + 1586; extern const int wxEVT_GRID_LABEL_LEFT_DCLICK;
const wxEventType wxEVT_GRID_LABEL_RIGHT_DCLICK = wxEVT_FIRST + 1587; extern const int wxEVT_GRID_LABEL_RIGHT_DCLICK;
const wxEventType wxEVT_GRID_ROW_SIZE = wxEVT_FIRST + 1588; extern const int wxEVT_GRID_ROW_SIZE;
const wxEventType wxEVT_GRID_COL_SIZE = wxEVT_FIRST + 1589; extern const int wxEVT_GRID_COL_SIZE;
const wxEventType wxEVT_GRID_RANGE_SELECT = wxEVT_FIRST + 1590; extern const int wxEVT_GRID_RANGE_SELECT;
const wxEventType wxEVT_GRID_CELL_CHANGE = wxEVT_FIRST + 1591; extern const int wxEVT_GRID_CELL_CHANGE;
const wxEventType wxEVT_GRID_SELECT_CELL = wxEVT_FIRST + 1592; extern const int wxEVT_GRID_SELECT_CELL;
const wxEventType wxEVT_GRID_EDITOR_SHOWN = wxEVT_FIRST + 1593; extern const int wxEVT_GRID_EDITOR_SHOWN;
const wxEventType wxEVT_GRID_EDITOR_HIDDEN = wxEVT_FIRST + 1594; extern const int wxEVT_GRID_EDITOR_HIDDEN;
typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&); typedef void (wxEvtHandler::*wxGridEventFunction)(wxGridEvent&);
@ -1916,9 +1916,9 @@ typedef void (wxEvtHandler::*wxGridRangeSelectEventFunction)(wxGridRangeSelectEv
#if 0 // TODO: implement these ? others ? #if 0 // TODO: implement these ? others ?
const wxEventType wxEVT_GRID_CREATE_CELL = wxEVT_FIRST + 1576; extern const int wxEVT_GRID_CREATE_CELL;
const wxEventType wxEVT_GRID_CHANGE_LABELS = wxEVT_FIRST + 1577; extern const int wxEVT_GRID_CHANGE_LABELS;
const wxEventType wxEVT_GRID_CHANGE_SEL_LABEL = wxEVT_FIRST + 1578; extern const int wxEVT_GRID_CHANGE_SEL_LABEL;
#define EVT_GRID_CREATE_CELL(fn) { wxEVT_GRID_CREATE_CELL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL }, #define EVT_GRID_CREATE_CELL(fn) { wxEVT_GRID_CREATE_CELL, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },
#define EVT_GRID_CHANGE_LABELS(fn) { wxEVT_GRID_CHANGE_LABELS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL }, #define EVT_GRID_CHANGE_LABELS(fn) { wxEVT_GRID_CHANGE_LABELS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxGridEventFunction) &fn, NULL },

View File

@ -918,7 +918,7 @@ msgstr "Neues Verzeichnis anlegen"
#: ../src/generic/filedlgg.cpp:890 #: ../src/generic/filedlgg.cpp:890
msgid "Current directory:" msgid "Current directory:"
msgstr "Aktuelle Verzeichnis" msgstr "Aktuelles Verzeichnis:"
#: ../src/common/fontmap.cpp:101 #: ../src/common/fontmap.cpp:101
msgid "Cyrillic (Latin 5)" msgid "Cyrillic (Latin 5)"
@ -985,11 +985,11 @@ msgstr "M
#: ../src/html/htmlwin.cpp:230 #: ../src/html/htmlwin.cpp:230
msgid "Done" msgid "Done"
msgstr ":-) Ich habe fertig" msgstr "Ich habe fertig :-)"
#: ../src/generic/progdlgg.cpp:316 #: ../src/generic/progdlgg.cpp:316
msgid "Done." msgid "Done."
msgstr "Fertig" msgstr "Fertig."
#: ../src/common/paper.cpp:107 #: ../src/common/paper.cpp:107
msgid "E sheet, 34 x 44 in" msgid "E sheet, 34 x 44 in"
@ -3045,7 +3045,7 @@ msgstr "wxWindows konnte 'open display' nicht ausf
#: ../src/common/filefn.cpp:1232 #: ../src/common/filefn.cpp:1232
msgid "wxWindows: error finding temporary file name.\n" msgid "wxWindows: error finding temporary file name.\n"
msgstr "wxWindows: Fehler beim Auffinden des temporären Dateinamen.\n" msgstr "wxWindows: Fehler beim Suchen des temporären Dateinamen.\n"
#: ../src/common/datetime.cpp:3023 #: ../src/common/datetime.cpp:3023
msgid "yesterday" msgid "yesterday"

View File

@ -161,33 +161,28 @@ bool wxContextHelp::EventLoop()
bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event) bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
{ {
switch (event.GetEventType()) if (event.GetEventType() == wxEVT_LEFT_DOWN)
{ {
case wxEVT_LEFT_DOWN:
{
//wxMouseEvent& mouseEvent = (wxMouseEvent&) event;
m_contextHelp->SetStatus(TRUE); m_contextHelp->SetStatus(TRUE);
m_contextHelp->EndContextHelp(); m_contextHelp->EndContextHelp();
return TRUE; return TRUE;
break;
} }
case wxEVT_CHAR:
case wxEVT_KEY_DOWN: if ((event.GetEventType() == wxEVT_CHAR) ||
case wxEVT_ACTIVATE: (event.GetEventType() == wxEVT_KEY_DOWN) ||
case wxEVT_MOUSE_CAPTURE_CHANGED: (event.GetEventType() == wxEVT_ACTIVATE) ||
(event.GetEventType() == wxEVT_MOUSE_CAPTURE_CHANGED))
{ {
m_contextHelp->SetStatus(FALSE); m_contextHelp->SetStatus(FALSE);
m_contextHelp->EndContextHelp(); m_contextHelp->EndContextHelp();
return TRUE; return TRUE;
break;
} }
case wxEVT_PAINT:
case wxEVT_ERASE_BACKGROUND: if ((event.GetEventType() == wxEVT_PAINT) ||
(event.GetEventType() == wxEVT_ERASE_BACKGROUND))
{ {
event.Skip(); event.Skip();
return FALSE; return FALSE;
break;
}
} }
return TRUE; return TRUE;

View File

@ -46,6 +46,228 @@
#include "wx/validate.h" #include "wx/validate.h"
#endif // wxUSE_GUI #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 // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -579,7 +801,7 @@ wxEvtHandler::~wxEvtHandler()
wxNode *node = m_dynamicEvents->First(); wxNode *node = m_dynamicEvents->First();
while (node) while (node)
{ {
wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
if (entry->m_callbackUserData) delete entry->m_callbackUserData; if (entry->m_callbackUserData) delete entry->m_callbackUserData;
delete entry; delete entry;
node = node->Next(); node = node->Next();
@ -839,11 +1061,11 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
} }
void wxEvtHandler::Connect( int id, int lastId, void wxEvtHandler::Connect( int id, int lastId,
wxEventType eventType, int eventType,
wxObjectEventFunction func, wxObjectEventFunction func,
wxObject *userData ) wxObject *userData )
{ {
wxEventTableEntry *entry = new wxEventTableEntry; wxDynamicEventTableEntry *entry = new wxDynamicEventTableEntry;
entry->m_id = id; entry->m_id = id;
entry->m_lastId = lastId; entry->m_lastId = lastId;
entry->m_eventType = eventType; entry->m_eventType = eventType;
@ -866,7 +1088,7 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
wxNode *node = m_dynamicEvents->First(); wxNode *node = m_dynamicEvents->First();
while (node) while (node)
{ {
wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
if ((entry->m_id == id) && if ((entry->m_id == id) &&
((entry->m_lastId == lastId) || (lastId == -1)) && ((entry->m_lastId == lastId) || (lastId == -1)) &&
((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) && ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
@ -893,7 +1115,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
wxNode *node = m_dynamicEvents->First(); wxNode *node = m_dynamicEvents->First();
while (node) while (node)
{ {
wxEventTableEntry *entry = (wxEventTableEntry*)node->Data(); wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
if (entry->m_fn) if (entry->m_fn)
{ {