X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d53c76bab8fd8ddd178f45fe8dc0c37a9f90c4a..58dd5b3b3e5bf943ed42268d74efcdc95ad2f0ec:/include/wx/event.h diff --git a/include/wx/event.h b/include/wx/event.h index 2831bc3f86..033cff7998 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -23,9 +23,7 @@ #include "wx/gdicmn.h" #endif -#if wxUSE_THREADS - #include "wx/thread.h" -#endif +#include "wx/thread.h" // ---------------------------------------------------------------------------- // forward declarations @@ -46,6 +44,218 @@ class WXDLLEXPORT wxList; typedef int wxEventType; +#if defined(__VISAGECPP__) && __IBMCPP__ >= 400 +// must define these static for VA or else you get multiply defined symbols everywhere +extern const wxEventType wxEVT_NULL; +extern const wxEventType wxEVT_FIRST; + +extern const wxEventType wxEVT_COMMAND_BUTTON_CLICKED; +extern const wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED; +extern const wxEventType wxEVT_COMMAND_CHOICE_SELECTED; +extern const wxEventType wxEVT_COMMAND_LISTBOX_SELECTED; +extern const wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED; +extern const wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED; +extern const wxEventType wxEVT_COMMAND_TEXT_UPDATED; +extern const wxEventType wxEVT_COMMAND_TEXT_ENTER; +extern const wxEventType wxEVT_COMMAND_MENU_SELECTED; +extern const wxEventType wxEVT_COMMAND_TOOL_CLICKED; +extern const wxEventType wxEVT_COMMAND_SLIDER_UPDATED; +extern const wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED; +extern const wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED; +extern const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED; +extern const wxEventType wxEVT_COMMAND_VLBOX_SELECTED; +extern const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED; +extern const wxEventType wxEVT_COMMAND_TOOL_RCLICKED; +extern const wxEventType wxEVT_COMMAND_TOOL_ENTER; +extern const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED; + +/* Sockets send events, too */ +extern const wxEventType wxEVT_SOCKET; + +/* Mouse event types */ +extern const wxEventType wxEVT_LEFT_DOWN; +extern const wxEventType wxEVT_LEFT_UP; +extern const wxEventType wxEVT_MIDDLE_DOWN; +extern const wxEventType wxEVT_MIDDLE_UP; +extern const wxEventType wxEVT_RIGHT_DOWN; +extern const wxEventType wxEVT_RIGHT_UP; +extern const wxEventType wxEVT_MOTION; +extern const wxEventType wxEVT_ENTER_WINDOW; +extern const wxEventType wxEVT_LEAVE_WINDOW; +extern const wxEventType wxEVT_LEFT_DCLICK; +extern const wxEventType wxEVT_MIDDLE_DCLICK; +extern const wxEventType wxEVT_RIGHT_DCLICK; +extern const wxEventType wxEVT_SET_FOCUS; +extern const wxEventType wxEVT_KILL_FOCUS; + + /* Non-client mouse events */ +extern const wxEventType wxEVT_NC_LEFT_DOWN; +extern const wxEventType wxEVT_NC_LEFT_UP; +extern const wxEventType wxEVT_NC_MIDDLE_DOWN; +extern const wxEventType wxEVT_NC_MIDDLE_UP; +extern const wxEventType wxEVT_NC_RIGHT_DOWN; +extern const wxEventType wxEVT_NC_RIGHT_UP; +extern const wxEventType wxEVT_NC_MOTION; +extern const wxEventType wxEVT_NC_ENTER_WINDOW; +extern const wxEventType wxEVT_NC_LEAVE_WINDOW; +extern const wxEventType wxEVT_NC_LEFT_DCLICK; +extern const wxEventType wxEVT_NC_MIDDLE_DCLICK; +extern const wxEventType wxEVT_NC_RIGHT_DCLICK; + +/* Character input event type */ +extern const wxEventType wxEVT_CHAR; +extern const wxEventType wxEVT_CHAR_HOOK; +extern const wxEventType wxEVT_NAVIGATION_KEY; +extern const wxEventType wxEVT_KEY_DOWN; +extern const wxEventType wxEVT_KEY_UP; + + /* + * wxScrollbar and wxSlider event identifiers + */ +extern const wxEventType wxEVT_SCROLL_TOP; +extern const wxEventType wxEVT_SCROLL_BOTTOM; +extern const wxEventType wxEVT_SCROLL_LINEUP; +extern const wxEventType wxEVT_SCROLL_LINEDOWN; +extern const wxEventType wxEVT_SCROLL_PAGEUP; +extern const wxEventType wxEVT_SCROLL_PAGEDOWN; +extern const wxEventType wxEVT_SCROLL_THUMBTRACK; + + /* + * Scroll events from wxWindow + */ +extern const wxEventType wxEVT_SCROLLWIN_TOP; +extern const wxEventType wxEVT_SCROLLWIN_BOTTOM; +extern const wxEventType wxEVT_SCROLLWIN_LINEUP; +extern const wxEventType wxEVT_SCROLLWIN_LINEDOWN; +extern const wxEventType wxEVT_SCROLLWIN_PAGEUP; +extern const wxEventType wxEVT_SCROLLWIN_PAGEDOWN; +extern const wxEventType wxEVT_SCROLLWIN_THUMBTRACK; + + /* + * System events + */ +extern const wxEventType wxEVT_SIZE; +extern const wxEventType wxEVT_MOVE; +extern const wxEventType wxEVT_CLOSE_WINDOW; +extern const wxEventType wxEVT_END_SESSION; +extern const wxEventType wxEVT_QUERY_END_SESSION; +extern const wxEventType wxEVT_ACTIVATE_APP; +extern const wxEventType wxEVT_POWER; +extern const wxEventType wxEVT_ACTIVATE; +extern const wxEventType wxEVT_CREATE; +extern const wxEventType wxEVT_DESTROY; +extern const wxEventType wxEVT_SHOW; +extern const wxEventType wxEVT_ICONIZE; +extern const wxEventType wxEVT_MAXIMIZE; +extern const wxEventType wxEVT_MOUSE_CAPTURE_CHANGED; +extern const wxEventType wxEVT_PAINT; +extern const wxEventType wxEVT_ERASE_BACKGROUND; +extern const wxEventType wxEVT_NC_PAINT; +extern const wxEventType wxEVT_PAINT_ICON; +extern const wxEventType wxEVT_MENU_CHAR; +extern const wxEventType wxEVT_MENU_INIT; +extern const wxEventType wxEVT_MENU_HIGHLIGHT; +extern const wxEventType wxEVT_POPUP_MENU_INIT; +extern const wxEventType wxEVT_CONTEXT_MENU; +extern const wxEventType wxEVT_SYS_COLOUR_CHANGED; +extern const wxEventType wxEVT_SETTING_CHANGED; +extern const wxEventType wxEVT_QUERY_NEW_PALETTE; +extern const wxEventType wxEVT_PALETTE_CHANGED; +extern const wxEventType wxEVT_JOY_BUTTON_DOWN; +extern const wxEventType wxEVT_JOY_BUTTON_UP; +extern const wxEventType wxEVT_JOY_MOVE; +extern const wxEventType wxEVT_JOY_ZMOVE; +extern const wxEventType wxEVT_DROP_FILES; +extern const wxEventType wxEVT_DRAW_ITEM; +extern const wxEventType wxEVT_MEASURE_ITEM; +extern const wxEventType wxEVT_COMPARE_ITEM; +extern const wxEventType wxEVT_INIT_DIALOG; +extern const wxEventType wxEVT_IDLE; +extern const wxEventType wxEVT_UPDATE_UI; + + /* System misc. */ +extern const wxEventType wxEVT_END_PROCESS; + + /* Dial up events */ +extern const wxEventType wxEVT_DIALUP_CONNECTED; +extern const wxEventType wxEVT_DIALUP_DISCONNECTED; + + /* Generic command events */ + /* Note: a click is a higher-level event than button down/up */ +extern const wxEventType wxEVT_COMMAND_LEFT_CLICK; +extern const wxEventType wxEVT_COMMAND_LEFT_DCLICK; +extern const wxEventType wxEVT_COMMAND_RIGHT_CLICK; +extern const wxEventType wxEVT_COMMAND_RIGHT_DCLICK; +extern const wxEventType wxEVT_COMMAND_SET_FOCUS; +extern const wxEventType wxEVT_COMMAND_KILL_FOCUS; +extern const wxEventType wxEVT_COMMAND_ENTER; + + /* Tree control event types */ +extern const wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG; +extern const wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG; +extern const wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT; +extern const wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT; +extern const wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM; +extern const wxEventType wxEVT_COMMAND_TREE_GET_INFO; +extern const wxEventType wxEVT_COMMAND_TREE_SET_INFO; +extern const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED; +extern const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING; +extern const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED; +extern const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING; +extern const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED; +extern const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING; +extern const wxEventType wxEVT_COMMAND_TREE_KEY_DOWN; +extern const wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED; +extern const wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK; +extern const wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK; + + /* List control event types */ +extern const wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG; +extern const wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG; +extern const wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT; +extern const wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT; +extern const wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM; +extern const wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS; +extern const wxEventType wxEVT_COMMAND_LIST_GET_INFO; +extern const wxEventType wxEVT_COMMAND_LIST_SET_INFO; +extern const wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED; +extern const wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED; +extern const wxEventType wxEVT_COMMAND_LIST_KEY_DOWN; +extern const wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM; +extern const wxEventType wxEVT_COMMAND_LIST_COL_CLICK; +extern const wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK; +extern const wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK; +extern const wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED; + + /* Tab and notebook control event types */ +extern const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED; +extern const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING; +extern const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED; +extern const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING; + +/* Splitter events */ +extern const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED; +extern const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING; +extern const wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED; +extern const wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT; + +/* Wizard events */ +extern const wxEventType wxEVT_WIZARD_PAGE_CHANGED; +extern const wxEventType wxEVT_WIZARD_PAGE_CHANGING; +extern const wxEventType wxEVT_WIZARD_CANCEL; + +/* Calendar events */ +extern const wxEventType wxEVT_CALENDAR_SEL_CHANGED; +extern const wxEventType wxEVT_CALENDAR_DAY_CHANGED; +extern const wxEventType wxEVT_CALENDAR_MONTH_CHANGED; +extern const wxEventType wxEVT_CALENDAR_YEAR_CHANGED; +extern const wxEventType wxEVT_CALENDAR_DOUBLECLICKED; +extern const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED; + +extern const wxEventType wxEVT_USER_FIRST; + +#else // everybody else + const wxEventType wxEVT_NULL = 0; const wxEventType wxEVT_FIRST = 10000; @@ -68,6 +278,7 @@ const wxEventType wxEVT_COMMAND_VLBOX_SELECTED = wxEVT_FIRST + 14; const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_FIRST + 15; const wxEventType wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16; const wxEventType wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17; +const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED = wxEVT_FIRST + 18; /* Sockets send events, too */ const wxEventType wxEVT_SOCKET = wxEVT_FIRST + 50; @@ -251,7 +462,17 @@ 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; -const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000; +/* Calendar events */ +const wxEventType wxEVT_CALENDAR_SEL_CHANGED = wxEVT_FIRST + 950; +const wxEventType wxEVT_CALENDAR_DAY_CHANGED = wxEVT_FIRST + 951; +const wxEventType wxEVT_CALENDAR_MONTH_CHANGED = wxEVT_FIRST + 952; +const wxEventType wxEVT_CALENDAR_YEAR_CHANGED = wxEVT_FIRST + 953; +const wxEventType wxEVT_CALENDAR_DOUBLECLICKED = wxEVT_FIRST + 954; +const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955; + +const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000; + +#endif // for VisualAge C++ V4.0 /* Compatibility */ @@ -437,6 +658,10 @@ public: // 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; @@ -471,8 +696,14 @@ public: int GetOrientation() const { return (int) m_extraLong ; } int GetPosition() const { return m_commandInt ; } + bool IsScrolling() const { return m_isScrolling; } void SetOrientation(int orient) { m_extraLong = (long) orient; } void SetPosition(int pos) { m_commandInt = pos; } + void SetScrolling(bool isScrolling) { m_isScrolling = isScrolling; } + + void CopyObject(wxObject& obj) const; +public: + bool m_isScrolling; }; // ScrollWin event class, derived fom wxEvent. wxScrollWinEvents @@ -502,13 +733,16 @@ public: int GetOrientation() const { return (int) m_extraLong ; } int GetPosition() const { return m_commandInt ; } + bool IsScrolling() const { return m_isScrolling; } void SetOrientation(int orient) { m_extraLong = (long) orient; } void SetPosition(int pos) { m_commandInt = pos; } + void SetScrolling(bool isScrolling) { m_isScrolling = isScrolling; } void CopyObject(wxObject& object_dest) const; public: int m_commandInt; // Additional information - long m_extraLong; + long m_extraLong; + bool m_isScrolling; }; // Mouse event class @@ -607,8 +841,23 @@ public: bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); } // Find the position of the event - void GetPosition(long *xpos, long *ypos) const { *xpos = m_x; *ypos = m_y; } - void Position(long *xpos, long *ypos) const { *xpos = m_x; *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); } @@ -618,6 +867,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; @@ -633,8 +890,8 @@ public: 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; @@ -669,24 +926,36 @@ public: long KeyCode() const { return 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 - { *xpos = m_x; *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; public: - long m_x; - long m_y; + wxCoord m_x, m_y; + long m_keyCode; + bool m_controlDown; bool m_shiftDown; bool m_altDown; @@ -1193,27 +1462,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 @@ -1281,6 +1579,10 @@ protected: wxEVT_COMPARE_ITEM */ +// ============================================================================ +// event handler and related classes +// ============================================================================ + typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); struct WXDLLEXPORT wxEventTableEntry @@ -1314,31 +1616,22 @@ public: void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; } void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; } - void SetEvtHandlerEnabled(bool en) { m_enabled = en; } + void SetEvtHandlerEnabled(bool enabled) { m_enabled = enabled; } bool GetEvtHandlerEnabled() const { return m_enabled; } -#if WXWIN_COMPATIBILITY_2 - virtual void OnCommand(wxWindow& WXUNUSED(win), - wxCommandEvent& WXUNUSED(event)) - { - wxFAIL_MSG(wxT("shouldn't be called any more")); - } + // process an event right now + virtual bool ProcessEvent(wxEvent& event); - // Called if child control has no callback function - virtual long Default() - { return GetNextHandler() ? GetNextHandler()->Default() : 0; }; -#endif // WXWIN_COMPATIBILITY_2 + // add an event to be processed later + void AddPendingEvent(wxEvent& event); -#if WXWIN_COMPATIBILITY - virtual bool OnClose(); -#endif + // process all pending events + void ProcessPendingEvents(); + // add a #if wxUSE_THREADS bool ProcessThreadEvent(wxEvent& event); - void ProcessPendingEvents(); #endif - virtual bool ProcessEvent(wxEvent& event); - virtual bool SearchEventTable(wxEventTable& table, wxEvent& event); // Dynamic association of a member function handler with the event handler, // id and event type @@ -1352,14 +1645,50 @@ 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 + +#if WXWIN_COMPATIBILITY_2 + virtual void OnCommand(wxWindow& WXUNUSED(win), + wxCommandEvent& WXUNUSED(event)) + { + wxFAIL_MSG(wxT("shouldn't be called any more")); + } + + // Called if child control has no callback function + virtual long Default() + { return GetNextHandler() ? GetNextHandler()->Default() : 0; }; +#endif // WXWIN_COMPATIBILITY_2 + +#if WXWIN_COMPATIBILITY + virtual bool OnClose(); #endif private: - static const wxEventTableEntry sm_eventTableEntries[]; + static const wxEventTableEntry sm_eventTableEntries[]; protected: static const wxEventTable sm_eventTable; @@ -1369,16 +1698,22 @@ protected: protected: wxEvtHandler* m_nextHandler; wxEvtHandler* m_previousHandler; - bool m_enabled; // Is event handler enabled? 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 // a window (which is true in 99% of cases), use this flag bool m_isWindow; + + // Is event handler enabled? + bool m_enabled; }; typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); @@ -1614,6 +1949,17 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ #define EVT_UPDATE_UI(id, func) \ { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },\ +// ---------------------------------------------------------------------------- +// Global data +// ---------------------------------------------------------------------------- + +// for pending event processing - notice that there is intentionally no +// WXDLLEXPORT here +extern wxList *wxPendingEvents; +#if wxUSE_THREADS + extern wxCriticalSection *wxPendingEventsLocker; +#endif + // ---------------------------------------------------------------------------- // Helper functions // ----------------------------------------------------------------------------