#include "wx/validate.h"
#endif // wxUSE_GUI
-// ----------------------------------------------------------------------------
-// event constants
-// ----------------------------------------------------------------------------
-
-wxEventType wxEVT_NULL = 0;
-wxEventType wxEVT_FIRST = 10000;
-
-#if WXWIN_COMPATIBILITY_2
-wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
-#endif // WXWIN_COMPATIBILITY_2
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxNcPaintEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)
#endif // wxUSE_GUI
const wxEventTable *wxEvtHandler::GetEventTable() const
{ (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
- { wxEventTableEntry(0, 0, 0, (wxObjectEventFunction)NULL, NULL) };
+ { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
// ----------------------------------------------------------------------------
// global variables
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;
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+// common event types are defined here, other event types are defined by the
+// components which use them
+
+DEFINE_EVENT_TYPE(wxEVT_NULL)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MENU_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBUTTON_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SCROLLBAR_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_VLBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED)
// Sockets and timers send events, too
-wxEventType wxEVT_SOCKET;
-wxEventType wxEVT_TIMER;
+DEFINE_EVENT_TYPE(wxEVT_SOCKET)
+DEFINE_EVENT_TYPE(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;
+DEFINE_EVENT_TYPE(wxEVT_LEFT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_LEFT_UP)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_UP)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_UP)
+DEFINE_EVENT_TYPE(wxEVT_MOTION)
+DEFINE_EVENT_TYPE(wxEVT_ENTER_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_LEAVE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_SET_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_KILL_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_MOUSEWHEEL)
// Non-client mouse events
-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;
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_MOTION)
+DEFINE_EVENT_TYPE(wxEVT_NC_ENTER_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEAVE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DCLICK)
// Character input event type
-wxEventType wxEVT_CHAR;
-wxEventType wxEVT_CHAR_HOOK;
-wxEventType wxEVT_NAVIGATION_KEY;
-wxEventType wxEVT_KEY_DOWN;
-wxEventType wxEVT_KEY_UP;
+DEFINE_EVENT_TYPE(wxEVT_CHAR)
+DEFINE_EVENT_TYPE(wxEVT_CHAR_HOOK)
+DEFINE_EVENT_TYPE(wxEVT_NAVIGATION_KEY)
+DEFINE_EVENT_TYPE(wxEVT_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_KEY_UP)
// Set cursor event
-wxEventType wxEVT_SET_CURSOR;
+DEFINE_EVENT_TYPE(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;
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_TOP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_BOTTOM)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)
// Scroll events from wxWindow
-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;
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBTRACK)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE)
// System events
-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;
+DEFINE_EVENT_TYPE(wxEVT_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_CLOSE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE_APP)
+DEFINE_EVENT_TYPE(wxEVT_POWER)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE)
+DEFINE_EVENT_TYPE(wxEVT_CREATE)
+DEFINE_EVENT_TYPE(wxEVT_DESTROY)
+DEFINE_EVENT_TYPE(wxEVT_SHOW)
+DEFINE_EVENT_TYPE(wxEVT_ICONIZE)
+DEFINE_EVENT_TYPE(wxEVT_MAXIMIZE)
+DEFINE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_PAINT)
+DEFINE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND)
+DEFINE_EVENT_TYPE(wxEVT_NC_PAINT)
+DEFINE_EVENT_TYPE(wxEVT_PAINT_ICON)
+DEFINE_EVENT_TYPE(wxEVT_MENU_CHAR)
+DEFINE_EVENT_TYPE(wxEVT_MENU_INIT)
+DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT)
+DEFINE_EVENT_TYPE(wxEVT_POPUP_MENU_INIT)
+DEFINE_EVENT_TYPE(wxEVT_CONTEXT_MENU)
+DEFINE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_SETTING_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE)
+DEFINE_EVENT_TYPE(wxEVT_PALETTE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_JOY_BUTTON_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_JOY_BUTTON_UP)
+DEFINE_EVENT_TYPE(wxEVT_JOY_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_JOY_ZMOVE)
+DEFINE_EVENT_TYPE(wxEVT_DROP_FILES)
+DEFINE_EVENT_TYPE(wxEVT_DRAW_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_MEASURE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMPARE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_INIT_DIALOG)
+DEFINE_EVENT_TYPE(wxEVT_IDLE)
+DEFINE_EVENT_TYPE(wxEVT_UPDATE_UI)
// Generic command events
// Note: a click is a higher-level event than button down/up
-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;
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SET_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_KILL_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_ENTER)
// Help events
-wxEventType wxEVT_HELP;
-wxEventType wxEVT_DETAILED_HELP;
+DEFINE_EVENT_TYPE(wxEVT_HELP)
+DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP)
+
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
// ============================================================================
// implementation
// 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;
- }
+#if WXWIN_COMPATIBILITY_2
+ // check that we don't overlap with the user-defined types: if it does
+ // happen, the best solution is probably to update the existing code to
+ // use wxNewEventType() instead of wxEVT_USER_FIRST
+ //
+ // due to the uncertainty
+ wxASSERT_MSG( s_lastUsedEventType < wxEVT_USER_FIRST - 1,
+ _T("possible event type conflict") );
+#endif // WXWIN_COMPATIBILITY_2
- m_eventType = evType;
- m_id = id;
- m_lastId = idLast;
- m_fn = fn;
- m_callbackUserData = data;
+ return s_lastUsedEventType++;
}
// ----------------------------------------------------------------------------
m_middleDown = FALSE;
m_x = 0;
m_y = 0;
+ m_wheelRotation = 0;
+ m_wheelDelta = 0;
+ m_linesPerAction = 0;
}
void wxMouseEvent::CopyObject(wxObject& obj_d) const
// or any button up event (but = -1)
bool wxMouseEvent::ButtonUp(int but) const
{
- switch (but) {
+ switch (but)
+ {
case -1:
return (LeftUp() || MiddleUp() || RightUp());
case 1:
// True if the given button is currently changing state
bool wxMouseEvent::Button(int but) const
{
- switch (but) {
+ switch (but)
+ {
case -1:
return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1));
case 1:
bool wxMouseEvent::ButtonIsDown(int but) const
{
- switch (but) {
+ switch (but)
+ {
case -1:
return (LeftIsDown() || MiddleIsDown() || RightIsDown());
case 1:
return FALSE;
}
+int wxMouseEvent::GetButton() const
+{
+ for ( int i = 1; i <= 3; i++ )
+ {
+ if ( Button(i) )
+ {
+ return i;
+ }
+ }
+
+ return -1;
+}
+
// Find the logical position of the event given the DC
wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const
{
obj->m_x = m_x;
obj->m_y = m_y;
obj->m_keyCode = m_keyCode;
-
+
obj->m_shiftDown = m_shiftDown;
obj->m_controlDown = m_controlDown;
obj->m_metaDown = m_metaDown;
wxNode *node = m_dynamicEvents->First();
while (node)
{
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
- if (entry->m_callbackUserData) delete entry->m_callbackUserData;
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+ if (entry->m_callbackUserData)
+ delete entry->m_callbackUserData;
delete entry;
node = node->Next();
}
wxPendingEvents->Append(this);
wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
-
+
// 3) Inform the system that new pending events are somwehere,
// and that these should be processed in idle time.
wxWakeUpIdle();
delete node;
// In ProcessEvent, new events might get added and
- // we can safely leave the crtical section here.
+ // we can safely leave the crtical section here.
#if defined(__VISAGECPP__)
wxLEAVE_CRIT_SECT( m_eventsLocker);
#else
bool wxEvtHandler::ProcessEvent(wxEvent& event)
{
#if wxUSE_GUI
+
+ // We have to use the actual window or processing events from wxWindowNative
+ // destructor won't work (we don't see the wxWindow class)
+#ifdef __WXDEBUG__
// check that our flag corresponds to reality
- wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
+ wxClassInfo* info = NULL;
+#ifdef __WXUNIVERSAL__
+# if defined(__WXMSW__)
+ info = CLASSINFO(wxWindowMSW);
+# elif defined(__WXGTK__)
+ info = CLASSINFO(wxWindowGTK);
+# elif defined(__WXMGL__)
+ info = CLASSINFO(wxWindowMGL);
+# elif defined(__WXMAC__)
+ info = CLASSINFO(wxWindowMac);
+# elif defined(__WXMOTIF__)
+ info = CLASSINFO(wxWindowMotif);
+# endif
+#else
+ info = CLASSINFO(wxWindow);
+#endif
+
+ wxASSERT_MSG( m_isWindow == IsKindOf(info),
+ _T("this should [not] be a window but it is [not]") );
+#endif
+
#endif // wxUSE_GUI
// An event handler can be enabled or disabled
if ( GetEvtHandlerEnabled() )
{
-
+
#if 0
/*
What is this? When using GUI threads, a non main
}
#if wxUSE_GUI
- // Carry on up the parent-child hierarchy,
- // but only if event is a command event: it wouldn't
- // make sense for a parent to receive a child's size event, for example
+ // Carry on up the parent-child hierarchy, but only if event is a command
+ // event: it wouldn't make sense for a parent to receive a child's size
+ // event, for example
if ( m_isWindow && event.IsCommandEvent() )
{
wxWindow *win = (wxWindow *)this;
- wxWindow *parent = win->GetParent();
- if (parent && !parent->IsBeingDeleted())
- return parent->GetEventHandler()->ProcessEvent(event);
+
+ // also, don't propagate events beyond the first top level window: it
+ // doesn't make sense to process dialogs events in the parent frame
+ if ( !win->IsTopLevel() )
+ {
+ wxWindow *parent = win->GetParent();
+ if (parent && !parent->IsBeingDeleted())
+ return parent->GetEventHandler()->ProcessEvent(event);
+ }
}
#endif // wxUSE_GUI
wxObjectEventFunction func,
wxObject *userData )
{
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxEventTableEntry *entry = new wxEventTableEntry;
+ entry->m_eventType = eventType;
+ entry->m_id = id;
+ entry->m_lastId = lastId;
+ entry->m_fn = func;
+ entry->m_callbackUserData = userData;
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
wxDynamicEventTableEntry *entry =
new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if (!m_dynamicEvents)
m_dynamicEvents = new wxList;
wxNode *node = m_dynamicEvents->First();
while (node)
{
- wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
if ((entry->m_id == id) &&
((entry->m_lastId == lastId) || (lastId == -1)) &&
((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
{
- if (entry->m_callbackUserData) delete entry->m_callbackUserData;
+ if (entry->m_callbackUserData)
+ delete entry->m_callbackUserData;
m_dynamicEvents->DeleteNode( node );
delete entry;
return TRUE;
wxNode *node = m_dynamicEvents->First();
while (node)
{
- wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
if (entry->m_fn)
{
projects / wxWidgets.git / blobdiff