/////////////////////////////////////////////////////////////////////////////
-// Name: event.cpp
+// Name: src/common/event.cpp
// Purpose: Event classes
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "event.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/event.h"
+#include "wx/evtloop.h"
+
#ifndef WX_PRECOMP
- #include "wx/defs.h"
- #include "wx/app.h"
#include "wx/list.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/stopwatch.h"
+ #include "wx/module.h"
#if wxUSE_GUI
+ #include "wx/window.h"
#include "wx/control.h"
- #include "wx/utils.h"
#include "wx/dc.h"
+ #include "wx/spinbutt.h"
+ #include "wx/textctrl.h"
+ #include "wx/validate.h"
#endif // wxUSE_GUI
#endif
-#include "wx/event.h"
+#include "wx/thread.h"
-#if wxUSE_GUI
- #include "wx/validate.h"
-#if wxUSE_STOPWATCH
- #include "wx/stopwatch.h"
-#endif
-#endif // wxUSE_GUI
+#if wxUSE_BASE
+ #include "wx/ptr_scpd.h"
+
+ wxDECLARE_SCOPED_PTR(wxEvent, wxEventPtr)
+ wxDEFINE_SCOPED_PTR(wxEvent, wxEventPtr)
+#endif // wxUSE_BASE
// ----------------------------------------------------------------------------
// wxWin macros
#if wxUSE_BASE
IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
#endif // wxUSE_BASE
#if wxUSE_GUI
- IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
- IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)
IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureLostEvent, wxEvent)
+ IMPLEMENT_DYNAMIC_CLASS(wxClipboardTextEvent, wxCommandEvent)
#endif // wxUSE_GUI
#if wxUSE_BASE
wxEventHashTable wxEvtHandler::sm_eventHashTable(wxEvtHandler::sm_eventTable);
const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
- { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
+ { DECLARE_EVENT_TABLE_TERMINATOR() };
+
+
+// wxUSE_MEMORY_TRACING considers memory freed from the static objects dtors
+// leaked, so we need to manually clean up all event tables before checking for
+// the memory leaks when using it, however this breaks re-initializing the
+// library (i.e. repeated calls to wxInitialize/wxUninitialize) because the
+// event tables won't be rebuilt the next time, so disable this by default
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
+
+class wxEventTableEntryModule: public wxModule
+{
+public:
+ wxEventTableEntryModule() { }
+ virtual bool OnInit() { return true; }
+ virtual void OnExit() { wxEventHashTable::ClearAll(); }
+
+ DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule)
+
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
// ----------------------------------------------------------------------------
// global variables
// ----------------------------------------------------------------------------
-// To put pending event handlers
-wxList *wxPendingEvents = (wxList *)NULL;
+// List containing event handlers with pending events (each handler can occur
+// at most once here)
+wxList *wxHandlersWithPendingEvents = NULL;
#if wxUSE_THREADS
- // protects wxPendingEvents list
- wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL;
+ // protects wxHandlersWithPendingEvents list
+ wxCriticalSection *wxHandlersWithPendingEventsLocker = NULL;
#endif
-#if !WXWIN_COMPATIBILITY_EVENT_TYPES
-
// common event types are defined here, other event types are defined by the
// components which use them
const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
DEFINE_EVENT_TYPE(wxEVT_NULL)
-DEFINE_EVENT_TYPE(wxEVT_IDLE)
-DEFINE_EVENT_TYPE(wxEVT_SOCKET)
-
-#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+wxDEFINE_EVENT( wxEVT_IDLE, wxIdleEvent )
#endif // wxUSE_BASE
#if wxUSE_GUI
-#if !WXWIN_COMPATIBILITY_EVENT_TYPES
-
-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_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
-DEFINE_EVENT_TYPE(wxEVT_TIMER)
+wxDEFINE_EVENT( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_SCROLLBAR_UPDATED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_VLBOX_SELECTED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_RCLICKED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_ENTER, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, wxCommandEvent )
// Mouse event types
-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_CHILD_FOCUS)
-DEFINE_EVENT_TYPE(wxEVT_MOUSEWHEEL)
-
-// Non-client mouse events
-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)
+wxDEFINE_EVENT( wxEVT_LEFT_DOWN, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_LEFT_UP, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_MIDDLE_DOWN, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_MIDDLE_UP, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_RIGHT_DOWN, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_RIGHT_UP, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_MOTION, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_ENTER_WINDOW, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_LEAVE_WINDOW, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_LEFT_DCLICK, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_MIDDLE_DCLICK, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_RIGHT_DCLICK, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_SET_FOCUS, wxFocusEvent )
+wxDEFINE_EVENT( wxEVT_KILL_FOCUS, wxFocusEvent )
+wxDEFINE_EVENT( wxEVT_CHILD_FOCUS, wxChildFocusEvent )
+wxDEFINE_EVENT( wxEVT_MOUSEWHEEL, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_AUX1_DOWN, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_AUX1_UP, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_AUX1_DCLICK, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_AUX2_DOWN, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_AUX2_UP, wxMouseEvent )
+wxDEFINE_EVENT( wxEVT_AUX2_DCLICK, wxMouseEvent )
// Character input event type
-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)
+wxDEFINE_EVENT( wxEVT_CHAR, wxKeyEvent )
+wxDEFINE_EVENT( wxEVT_CHAR_HOOK, wxKeyEvent )
+wxDEFINE_EVENT( wxEVT_NAVIGATION_KEY, wxNavigationKeyEvent )
+wxDEFINE_EVENT( wxEVT_KEY_DOWN, wxKeyEvent )
+wxDEFINE_EVENT( wxEVT_KEY_UP, wxKeyEvent )
#if wxUSE_HOTKEY
-DEFINE_EVENT_TYPE(wxEVT_HOTKEY)
+wxDEFINE_EVENT( wxEVT_HOTKEY, wxKeyEvent )
#endif
// Set cursor event
-DEFINE_EVENT_TYPE(wxEVT_SET_CURSOR)
+wxDEFINE_EVENT( wxEVT_SET_CURSOR, wxSetCursorEvent )
// wxScrollbar and wxSlider event identifiers
-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)
-DEFINE_EVENT_TYPE(wxEVT_SCROLL_ENDSCROLL)
+wxDEFINE_EVENT( wxEVT_SCROLL_TOP, wxScrollEvent )
+wxDEFINE_EVENT( wxEVT_SCROLL_BOTTOM, wxScrollEvent )
+wxDEFINE_EVENT( wxEVT_SCROLL_LINEUP, wxScrollEvent )
+wxDEFINE_EVENT( wxEVT_SCROLL_LINEDOWN, wxScrollEvent )
+wxDEFINE_EVENT( wxEVT_SCROLL_PAGEUP, wxScrollEvent )
+wxDEFINE_EVENT( wxEVT_SCROLL_PAGEDOWN, wxScrollEvent )
+wxDEFINE_EVENT( wxEVT_SCROLL_THUMBTRACK, wxScrollEvent )
+wxDEFINE_EVENT( wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent )
+wxDEFINE_EVENT( wxEVT_SCROLL_CHANGED, wxScrollEvent )
+
+// Due to a bug in older wx versions, wxSpinEvents were being sent with type of
+// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But
+// with the type-safe events in place, these event types are associated with
+// wxScrollEvent. To allow handling of spin events, new event types have been
+// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility
+// the spin event types are being initialized with the scroll event types.
+
+#if wxUSE_SPINBTN
+
+wxDEFINE_EVENT_ALIAS( wxEVT_SPIN_UP, wxSpinEvent, wxEVT_SCROLL_LINEUP )
+wxDEFINE_EVENT_ALIAS( wxEVT_SPIN_DOWN, wxSpinEvent, wxEVT_SCROLL_LINEDOWN )
+wxDEFINE_EVENT_ALIAS( wxEVT_SPIN, wxSpinEvent, wxEVT_SCROLL_THUMBTRACK )
+
+#endif // wxUSE_SPINBTN
// Scroll events from wxWindow
-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)
+wxDEFINE_EVENT( wxEVT_SCROLLWIN_TOP, wxScrollWinEvent )
+wxDEFINE_EVENT( wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent )
+wxDEFINE_EVENT( wxEVT_SCROLLWIN_LINEUP, wxScrollWinEvent )
+wxDEFINE_EVENT( wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEvent )
+wxDEFINE_EVENT( wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEvent )
+wxDEFINE_EVENT( wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEvent )
+wxDEFINE_EVENT( wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEvent )
+wxDEFINE_EVENT( wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEvent )
// System events
-DEFINE_EVENT_TYPE(wxEVT_SIZE)
-DEFINE_EVENT_TYPE(wxEVT_SIZING)
-DEFINE_EVENT_TYPE(wxEVT_MOVE)
-DEFINE_EVENT_TYPE(wxEVT_MOVING)
-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_OPEN)
-DEFINE_EVENT_TYPE(wxEVT_MENU_CLOSE)
-DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT)
-DEFINE_EVENT_TYPE(wxEVT_CONTEXT_MENU)
-DEFINE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED)
-DEFINE_EVENT_TYPE(wxEVT_DISPLAY_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_UPDATE_UI)
+wxDEFINE_EVENT( wxEVT_SIZE, wxSizeEvent )
+wxDEFINE_EVENT( wxEVT_SIZING, wxSizeEvent )
+wxDEFINE_EVENT( wxEVT_MOVE, wxMoveEvent )
+wxDEFINE_EVENT( wxEVT_MOVING, wxMoveEvent )
+wxDEFINE_EVENT( wxEVT_MOVE_START, wxMoveEvent )
+wxDEFINE_EVENT( wxEVT_MOVE_END, wxMoveEvent )
+wxDEFINE_EVENT( wxEVT_CLOSE_WINDOW, wxCloseEvent )
+wxDEFINE_EVENT( wxEVT_END_SESSION, wxCloseEvent )
+wxDEFINE_EVENT( wxEVT_QUERY_END_SESSION, wxCloseEvent )
+wxDEFINE_EVENT( wxEVT_HIBERNATE, wxActivateEvent )
+wxDEFINE_EVENT( wxEVT_ACTIVATE_APP, wxActivateEvent )
+wxDEFINE_EVENT( wxEVT_ACTIVATE, wxActivateEvent )
+wxDEFINE_EVENT( wxEVT_CREATE, wxWindowCreateEvent )
+wxDEFINE_EVENT( wxEVT_DESTROY, wxWindowDestroyEvent )
+wxDEFINE_EVENT( wxEVT_SHOW, wxShowEvent )
+wxDEFINE_EVENT( wxEVT_ICONIZE, wxIconizeEvent )
+wxDEFINE_EVENT( wxEVT_MAXIMIZE, wxMaximizeEvent )
+wxDEFINE_EVENT( wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEvent )
+wxDEFINE_EVENT( wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEvent )
+wxDEFINE_EVENT( wxEVT_PAINT, wxPaintEvent )
+wxDEFINE_EVENT( wxEVT_ERASE_BACKGROUND, wxEraseEvent )
+wxDEFINE_EVENT( wxEVT_NC_PAINT, wxNcPaintEvent )
+wxDEFINE_EVENT( wxEVT_MENU_OPEN, wxMenuEvent )
+wxDEFINE_EVENT( wxEVT_MENU_CLOSE, wxMenuEvent )
+wxDEFINE_EVENT( wxEVT_MENU_HIGHLIGHT, wxMenuEvent )
+wxDEFINE_EVENT( wxEVT_CONTEXT_MENU, wxContextMenuEvent )
+wxDEFINE_EVENT( wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEvent )
+wxDEFINE_EVENT( wxEVT_DISPLAY_CHANGED, wxDisplayChangedEvent )
+wxDEFINE_EVENT( wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEvent )
+wxDEFINE_EVENT( wxEVT_PALETTE_CHANGED, wxPaletteChangedEvent )
+wxDEFINE_EVENT( wxEVT_JOY_BUTTON_DOWN, wxJoystickEvent )
+wxDEFINE_EVENT( wxEVT_JOY_BUTTON_UP, wxJoystickEvent )
+wxDEFINE_EVENT( wxEVT_JOY_MOVE, wxJoystickEvent )
+wxDEFINE_EVENT( wxEVT_JOY_ZMOVE, wxJoystickEvent )
+wxDEFINE_EVENT( wxEVT_DROP_FILES, wxDropFilesEvent )
+wxDEFINE_EVENT( wxEVT_INIT_DIALOG, wxInitDialogEvent )
+wxDEFINE_EVENT( wxEVT_UPDATE_UI, wxUpdateUIEvent )
+
+// Clipboard events
+wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_COPY, wxClipboardTextEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_CUT, wxClipboardTextEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_PASTE, wxClipboardTextEvent )
// Generic command events
// Note: a click is a higher-level event than button down/up
-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)
+wxDEFINE_EVENT( wxEVT_COMMAND_LEFT_CLICK, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_LEFT_DCLICK, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_RIGHT_CLICK, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_RIGHT_DCLICK, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_SET_FOCUS, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_KILL_FOCUS, wxCommandEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_ENTER, wxCommandEvent )
// Help events
-DEFINE_EVENT_TYPE(wxEVT_HELP)
-DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP)
-
-#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+wxDEFINE_EVENT( wxEVT_HELP, wxHelpEvent )
+wxDEFINE_EVENT( wxEVT_DETAILED_HELP, wxHelpEvent )
#endif // wxUSE_GUI
#if wxUSE_BASE
+wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL;
+
// ============================================================================
// implementation
// ============================================================================
// MT-FIXME
static int s_lastUsedEventType = wxEVT_FIRST;
-#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
-
return s_lastUsedEventType++;
}
+// ----------------------------------------------------------------------------
+// wxEventFunctor
+// ----------------------------------------------------------------------------
+
+wxEventFunctor::~wxEventFunctor()
+{
+}
// ----------------------------------------------------------------------------
// wxEvent
// ----------------------------------------------------------------------------
/*
- * General wxWindows events, covering
+ * General wxWidgets events, covering
* all interesting things that might happen (button clicking, resizing,
* setting text in widgets, etc.).
*
wxEvent::wxEvent(int theId, wxEventType commandType )
{
m_eventType = commandType;
- m_eventObject = (wxObject *) NULL;
+ m_eventObject = NULL;
m_timeStamp = 0;
m_id = theId;
- m_skipped = FALSE;
- m_callbackUserData = (wxObject *) NULL;
- m_isCommandEvent = FALSE;
+ m_skipped = false;
+ m_callbackUserData = NULL;
+ m_isCommandEvent = false;
m_propagationLevel = wxEVENT_PROPAGATE_NONE;
+ m_wasProcessed = false;
}
-wxEvent::wxEvent(const wxEvent &src)
- : wxObject()
+wxEvent::wxEvent(const wxEvent& src)
+ : wxObject(src)
, m_eventObject(src.m_eventObject)
, m_eventType(src.m_eventType)
, m_timeStamp(src.m_timeStamp)
, m_propagationLevel(src.m_propagationLevel)
, m_skipped(src.m_skipped)
, m_isCommandEvent(src.m_isCommandEvent)
+ , m_wasProcessed(false)
+{
+}
+
+wxEvent& wxEvent::operator=(const wxEvent& src)
{
+ wxObject::operator=(src);
+
+ m_eventObject = src.m_eventObject;
+ m_eventType = src.m_eventType;
+ m_timeStamp = src.m_timeStamp;
+ m_id = src.m_id;
+ m_callbackUserData = src.m_callbackUserData;
+ m_propagationLevel = src.m_propagationLevel;
+ m_skipped = src.m_skipped;
+ m_isCommandEvent = src.m_isCommandEvent;
+
+ // don't change m_wasProcessed
+
+ return *this;
}
#endif // wxUSE_BASE
*
*/
+#ifdef __VISUALC__
+ // 'this' : used in base member initializer list (for m_commandString)
+ #pragma warning(disable:4355)
+#endif
+
wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
: wxEvent(theId, commandType)
{
- m_clientData = (char *) NULL;
- m_clientObject = (wxClientData *) NULL;
+ m_clientData = NULL;
+ m_clientObject = NULL;
m_extraLong = 0;
m_commandInt = 0;
- m_isCommandEvent = TRUE;
+ m_isCommandEvent = true;
// the command events are propagated upwards by default
m_propagationLevel = wxEVENT_PROPAGATE_MAX;
}
+#ifdef __VISUALC__
+ #pragma warning(default:4355)
+#endif
+
+wxString wxCommandEvent::GetString() const
+{
+ if (m_eventType != wxEVT_COMMAND_TEXT_UPDATED || !m_eventObject)
+ {
+ return m_cmdString;
+ }
+ else
+ {
+#if wxUSE_TEXTCTRL
+ wxTextCtrl *txt = wxDynamicCast(m_eventObject, wxTextCtrl);
+ if ( txt )
+ return txt->GetValue();
+ else
+#endif // wxUSE_TEXTCTRL
+ return m_cmdString;
+ }
+}
+
/*
* UI update events
*/
wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
// Can we update?
-bool wxUpdateUIEvent::CanUpdate(wxWindow* win)
+bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)
{
// Don't update if we've switched global updating off
// and this window doesn't support updates.
if (win &&
(GetMode() == wxUPDATE_UI_PROCESS_SPECIFIED &&
((win->GetExtraStyle() & wxWS_EX_PROCESS_UI_UPDATES) == 0)))
- return FALSE;
+ return false;
if (sm_updateInterval == -1)
- return FALSE;
- else if (sm_updateInterval == 0)
- return TRUE;
- else
- {
+ return false;
+
+ if (sm_updateInterval == 0)
+ return true;
+
#if wxUSE_STOPWATCH && wxUSE_LONGLONG
- wxLongLong now = wxGetLocalTimeMillis();
- if (now > (sm_lastUpdate + sm_updateInterval))
- {
- return TRUE;
- }
+ wxLongLong now = wxGetLocalTimeMillis();
+ if (now > (sm_lastUpdate + sm_updateInterval))
+ {
+ return true;
+ }
+
+ return false;
#else
- // If we don't have wxStopWatch or wxLongLong, we
- // should err on the safe side and update now anyway.
- return TRUE;
+ // If we don't have wxStopWatch or wxLongLong, we
+ // should err on the safe side and update now anyway.
+ return true;
#endif
- }
- return FALSE;
}
// Reset the update time to provide a delay until the next
#endif
}
-/*
- * Idle events
- */
-
-wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL;
-
-// Can we send an idle event?
-bool wxIdleEvent::CanSend(wxWindow* win)
-{
- // Don't update if we've switched global updating off
- // and this window doesn't support updates.
- if (win &&
- (GetMode() == wxIDLE_PROCESS_SPECIFIED &&
- ((win->GetExtraStyle() & wxWS_EX_PROCESS_IDLE) == 0)))
- return FALSE;
-
- return TRUE;
-}
-
/*
* Scroll events
*/
wxMouseEvent::wxMouseEvent(wxEventType commandType)
{
m_eventType = commandType;
- m_metaDown = FALSE;
- m_altDown = FALSE;
- m_controlDown = FALSE;
- m_shiftDown = FALSE;
- m_leftDown = FALSE;
- m_rightDown = FALSE;
- m_middleDown = FALSE;
+
m_x = 0;
m_y = 0;
+
+ m_leftDown = false;
+ m_middleDown = false;
+ m_rightDown = false;
+ m_aux1Down = false;
+ m_aux2Down = false;
+
+ m_clickCount = -1;
+
m_wheelRotation = 0;
m_wheelDelta = 0;
m_linesPerAction = 0;
+ m_wheelAxis = 0;
}
void wxMouseEvent::Assign(const wxMouseEvent& event)
{
- m_eventType = event.m_eventType;
+ wxEvent::operator=(event);
+
+ // Borland C++ 5.82 doesn't compile an explicit call to an implicitly
+ // defined operator=() so need to do it this way:
+ *static_cast<wxMouseState *>(this) = event;
m_x = event.m_x;
m_y = event.m_y;
m_leftDown = event.m_leftDown;
m_middleDown = event.m_middleDown;
m_rightDown = event.m_rightDown;
-
- m_controlDown = event.m_controlDown;
- m_shiftDown = event.m_shiftDown;
- m_altDown = event.m_altDown;
- m_metaDown = event.m_metaDown;
+ m_aux1Down = event.m_aux1Down;
+ m_aux2Down = event.m_aux2Down;
m_wheelRotation = event.m_wheelRotation;
m_wheelDelta = event.m_wheelDelta;
m_linesPerAction = event.m_linesPerAction;
+ m_wheelAxis = event.m_wheelAxis;
}
-// True if was a button dclick event (1 = left, 2 = middle, 3 = right)
-// or any button dclick event (but = -1)
+// return true if was a button dclick event
bool wxMouseEvent::ButtonDClick(int but) const
{
switch (but)
{
- case -1:
- return (LeftDClick() || MiddleDClick() || RightDClick());
- case 1:
+ default:
+ wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick"));
+ // fall through
+
+ case wxMOUSE_BTN_ANY:
+ return (LeftDClick() || MiddleDClick() || RightDClick() ||
+ Aux1DClick() || Aux2DClick());
+
+ case wxMOUSE_BTN_LEFT:
return LeftDClick();
- case 2:
+
+ case wxMOUSE_BTN_MIDDLE:
return MiddleDClick();
- case 3:
+
+ case wxMOUSE_BTN_RIGHT:
return RightDClick();
- default:
- wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick"));
- }
- return FALSE;
+ case wxMOUSE_BTN_AUX1:
+ return Aux1DClick();
+
+ case wxMOUSE_BTN_AUX2:
+ return Aux2DClick();
+ }
}
-// True if was a button down event (1 = left, 2 = middle, 3 = right)
-// or any button down event (but = -1)
+// return true if was a button down event
bool wxMouseEvent::ButtonDown(int but) const
{
switch (but)
{
- case -1:
- return (LeftDown() || MiddleDown() || RightDown());
- case 1:
+ default:
+ wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown"));
+ // fall through
+
+ case wxMOUSE_BTN_ANY:
+ return (LeftDown() || MiddleDown() || RightDown() ||
+ Aux1Down() || Aux2Down());
+
+ case wxMOUSE_BTN_LEFT:
return LeftDown();
- case 2:
+
+ case wxMOUSE_BTN_MIDDLE:
return MiddleDown();
- case 3:
+
+ case wxMOUSE_BTN_RIGHT:
return RightDown();
- default:
- wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown"));
- }
- return FALSE;
+ case wxMOUSE_BTN_AUX1:
+ return Aux1Down();
+
+ case wxMOUSE_BTN_AUX2:
+ return Aux2Down();
+ }
}
-// True if was a button up event (1 = left, 2 = middle, 3 = right)
-// or any button up event (but = -1)
+// return true if was a button up event
bool wxMouseEvent::ButtonUp(int but) const
{
switch (but)
{
- case -1:
- return (LeftUp() || MiddleUp() || RightUp());
- case 1:
+ default:
+ wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp"));
+ // fall through
+
+ case wxMOUSE_BTN_ANY:
+ return (LeftUp() || MiddleUp() || RightUp() ||
+ Aux1Up() || Aux2Up());
+
+ case wxMOUSE_BTN_LEFT:
return LeftUp();
- case 2:
+
+ case wxMOUSE_BTN_MIDDLE:
return MiddleUp();
- case 3:
+
+ case wxMOUSE_BTN_RIGHT:
return RightUp();
- default:
- wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp"));
- }
- return FALSE;
+ case wxMOUSE_BTN_AUX1:
+ return Aux1Up();
+
+ case wxMOUSE_BTN_AUX2:
+ return Aux2Up();
+ }
}
-// True if the given button is currently changing state
+// return true if the given button is currently changing state
bool wxMouseEvent::Button(int but) const
{
switch (but)
{
- case -1:
- return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1));
- case 1:
- return (LeftDown() || LeftUp() || LeftDClick());
- case 2:
- return (MiddleDown() || MiddleUp() || MiddleDClick());
- case 3:
- return (RightDown() || RightUp() || RightDClick());
default:
wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button"));
- }
+ // fall through
+
+ case wxMOUSE_BTN_ANY:
+ return ButtonUp(wxMOUSE_BTN_ANY) ||
+ ButtonDown(wxMOUSE_BTN_ANY) ||
+ ButtonDClick(wxMOUSE_BTN_ANY);
+
+ case wxMOUSE_BTN_LEFT:
+ return LeftDown() || LeftUp() || LeftDClick();
- return FALSE;
+ case wxMOUSE_BTN_MIDDLE:
+ return MiddleDown() || MiddleUp() || MiddleDClick();
+
+ case wxMOUSE_BTN_RIGHT:
+ return RightDown() || RightUp() || RightDClick();
+
+ case wxMOUSE_BTN_AUX1:
+ return Aux1Down() || Aux1Up() || Aux1DClick();
+
+ case wxMOUSE_BTN_AUX2:
+ return Aux2Down() || Aux2Up() || Aux2DClick();
+ }
}
bool wxMouseEvent::ButtonIsDown(int but) const
{
switch (but)
{
- case -1:
- return (LeftIsDown() || MiddleIsDown() || RightIsDown());
- case 1:
+ default:
+ wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown"));
+ // fall through
+
+ case wxMOUSE_BTN_ANY:
+ return LeftIsDown() || MiddleIsDown() || RightIsDown() || Aux1Down() || Aux2Down();
+
+ case wxMOUSE_BTN_LEFT:
return LeftIsDown();
- case 2:
+
+ case wxMOUSE_BTN_MIDDLE:
return MiddleIsDown();
- case 3:
+
+ case wxMOUSE_BTN_RIGHT:
return RightIsDown();
- default:
- wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown"));
- }
- return FALSE;
+ case wxMOUSE_BTN_AUX1:
+ return Aux1IsDown();
+
+ case wxMOUSE_BTN_AUX2:
+ return Aux2IsDown();
+ }
}
int wxMouseEvent::GetButton() const
{
- for ( int i = 1; i <= 3; i++ )
+ for ( int i = 1; i < wxMOUSE_BTN_MAX; i++ )
{
if ( Button(i) )
{
}
}
- return -1;
+ return wxMOUSE_BTN_NONE;
}
// Find the logical position of the event given the DC
wxKeyEvent::wxKeyEvent(wxEventType type)
{
m_eventType = type;
- m_shiftDown = FALSE;
- m_controlDown = FALSE;
- m_metaDown = FALSE;
- m_altDown = FALSE;
m_keyCode = 0;
m_scanCode = 0;
#if wxUSE_UNICODE
}
wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
- : wxEvent(evt)
+ : wxEvent(evt),
+ wxKeyboardState(evt)
{
m_x = evt.m_x;
m_y = evt.m_y;
m_keyCode = evt.m_keyCode;
- m_controlDown = evt.m_controlDown;
- m_shiftDown = evt.m_shiftDown;
- m_altDown = evt.m_altDown;
- m_metaDown = evt.m_metaDown;
m_scanCode = evt.m_scanCode;
m_rawCode = evt.m_rawCode;
m_rawFlags = evt.m_rawFlags;
#endif
}
-long wxKeyEvent::KeyCode() const
-{
- return m_keyCode;
-}
-
wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
{
SetEventType(wxEVT_CREATE);
SetEventObject(win);
}
+// ----------------------------------------------------------------------------
+// wxHelpEvent
+// ----------------------------------------------------------------------------
+
+/* static */
+wxHelpEvent::Origin wxHelpEvent::GuessOrigin(Origin origin)
+{
+ if ( origin == Origin_Unknown )
+ {
+ // assume that the event comes from the help button if it's not from
+ // keyboard and that pressing F1 always results in the help event
+ origin = wxGetKeyState(WXK_F1) ? Origin_Keyboard : Origin_HelpButton;
+ }
+
+ return origin;
+}
+
#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
// ----------------------------------------------------------------------------
// wxEventHashTable
// ----------------------------------------------------------------------------
-static const int EVENT_TYPE_TABLE_INIT_SIZE = 31; // Not to big not to small...
+static const int EVENT_TYPE_TABLE_INIT_SIZE = 31; // Not too big not too small...
+
+wxEventHashTable* wxEventHashTable::sm_first = NULL;
wxEventHashTable::wxEventHashTable(const wxEventTable &table)
: m_table(table),
- m_rebuildHash(TRUE)
+ m_rebuildHash(true)
{
AllocEventTypeTable(EVENT_TYPE_TABLE_INIT_SIZE);
+
+ m_next = sm_first;
+ if (m_next)
+ m_next->m_previous = this;
+ sm_first = this;
}
wxEventHashTable::~wxEventHashTable()
{
- size_t i;
- for(i = 0; i < m_size; i++)
+ if (m_next)
+ m_next->m_previous = m_previous;
+ if (m_previous)
+ m_previous->m_next = m_next;
+ if (sm_first == this)
+ sm_first = m_next;
+
+ Clear();
+}
+
+void wxEventHashTable::Clear()
+{
+ for ( size_t i = 0; i < m_size; i++ )
{
EventTypeTablePointer eTTnode = m_eventTypeTable[i];
- if (eTTnode)
- {
- delete eTTnode;
- }
+ delete eTTnode;
}
delete[] m_eventTypeTable;
+ m_eventTypeTable = NULL;
+
+ m_size = 0;
+}
+
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
+
+// Clear all tables
+void wxEventHashTable::ClearAll()
+{
+ wxEventHashTable* table = sm_first;
+ while (table)
+ {
+ table->Clear();
+ table = table->m_next;
+ }
}
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
+
bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self)
{
if (m_rebuildHash)
{
InitHashTable();
- m_rebuildHash = FALSE;
+ m_rebuildHash = false;
}
+ if (!m_eventTypeTable)
+ return false;
+
// Find all entries for the given event type.
wxEventType eventType = event.GetEventType();
const EventTypeTablePointer eTTnode = m_eventTypeTable[eventType % m_size];
{
// Now start the search for an event handler
// that can handle an event with the given ID.
- int eventId = event.GetId();
- const wxEventTableEntryPointerArray &eventEntryTable = eTTnode->eventEntryTable;
+ const wxEventTableEntryPointerArray&
+ eventEntryTable = eTTnode->eventEntryTable;
- size_t n;
- size_t count = eventEntryTable.GetCount();
- for (n = 0; n < count; n++)
+ const size_t count = eventEntryTable.GetCount();
+ for (size_t n = 0; n < count; n++)
{
- const wxEventTableEntry* entry = eventEntryTable[n];
- int tableId1 = entry->m_id,
- tableId2 = entry->m_lastId;
-
- if ((tableId1 == -1) ||
- (tableId2 == -1 && tableId1 == eventId) ||
- (tableId2 != -1 &&
- (eventId >= tableId1 && eventId <= tableId2)))
- {
- event.Skip(FALSE);
- event.m_callbackUserData = entry->m_callbackUserData;
-
- (self->*((wxEventFunction) (entry->m_fn)))(event);
-
- if (!event.GetSkipped())
- return TRUE;
- }
+ const wxEventTableEntry& entry = *eventEntryTable[n];
+ if ( wxEvtHandler::ProcessEventIfMatchesId(entry, self, event) )
+ return true;
}
-
- return FALSE;
}
- return FALSE;
+ return false;
}
void wxEventHashTable::InitHashTable()
void wxEventHashTable::AddEntry(const wxEventTableEntry &entry)
{
+ // This might happen 'accidentally' as the app is exiting
+ if (!m_eventTypeTable)
+ return;
+
EventTypeTablePointer *peTTnode = &m_eventTypeTable[entry.m_eventType % m_size];
EventTypeTablePointer eTTnode = *peTTnode;
// wxEvtHandler
// ----------------------------------------------------------------------------
-#if wxUSE_BASE
-
/*
* Event handler
*/
wxEvtHandler::wxEvtHandler()
{
- m_nextHandler = (wxEvtHandler *) NULL;
- m_previousHandler = (wxEvtHandler *) NULL;
- m_enabled = TRUE;
- m_dynamicEvents = (wxList *) NULL;
- m_pendingEvents = (wxList *) NULL;
-#if wxUSE_THREADS
-# if !defined(__VISAGECPP__)
- m_eventsLocker = new wxCriticalSection;
-# endif
-#endif
+ m_nextHandler = NULL;
+ m_previousHandler = NULL;
+ m_enabled = true;
+ m_dynamicEvents = NULL;
+ m_pendingEvents = NULL;
+
// no client data (yet)
m_clientData = NULL;
m_clientDataType = wxClientData_None;
wxEvtHandler::~wxEvtHandler()
{
- // Takes itself out of the list of handlers
- if (m_previousHandler)
- m_previousHandler->m_nextHandler = m_nextHandler;
-
- if (m_nextHandler)
- m_nextHandler->m_previousHandler = m_previousHandler;
+ Unlink();
if (m_dynamicEvents)
{
- wxList::iterator it = m_dynamicEvents->begin(),
- en = m_dynamicEvents->end();
- for (;it != en; ++it)
+ for ( wxList::iterator it = m_dynamicEvents->begin(),
+ end = m_dynamicEvents->end();
+ it != end;
+ ++it )
{
-#if WXWIN_COMPATIBILITY_EVENT_TYPES
- wxEventTableEntry *entry = (wxEventTableEntry*)*it;
-#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
-#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
- if (entry->m_callbackUserData)
- delete entry->m_callbackUserData;
+ // Remove ourselves from sink destructor notifications
+ // (this has usually been done, in wxTrackable destructor)
+ wxEvtHandler *eventSink = entry->m_fn->GetHandler();
+ if ( eventSink )
+ {
+ wxEventConnectionRef * const
+ evtConnRef = FindRefInTrackerList(eventSink);
+ if ( evtConnRef )
+ {
+ eventSink->RemoveNode(evtConnRef);
+ delete evtConnRef;
+ }
+ }
+
+ delete entry->m_callbackUserData;
delete entry;
}
delete m_dynamicEvents;
};
+ if (m_pendingEvents)
+ m_pendingEvents->DeleteContents(true);
delete m_pendingEvents;
+ // Remove us from wxHandlersWithPendingEvents if necessary.
+ if ( wxHandlersWithPendingEvents )
+ {
#if wxUSE_THREADS
-# if !defined(__VISAGECPP__)
- delete m_eventsLocker;
-# endif
-
- // Remove us from wxPendingEvents if necessary.
- if(wxPendingEventsLocker)
- wxENTER_CRIT_SECT(*wxPendingEventsLocker);
- if ( wxPendingEvents ) {
- wxPendingEvents->DeleteObject(this);
- }
- if(wxPendingEventsLocker)
- wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+ if (wxHandlersWithPendingEventsLocker)
+ wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker);
#endif
+ if ( wxHandlersWithPendingEvents->DeleteObject(this) )
+ {
+ // check that we were present only once in the list
+ wxASSERT_MSG( !wxHandlersWithPendingEvents->Find(this),
+ "Handler occurs twice in wxHandlersWithPendingEvents list" );
+ }
+ //else: we weren't in this list at all, it's ok
+
+#if wxUSE_THREADS
+ if (wxHandlersWithPendingEventsLocker)
+ wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker);
+#endif
+ }
+
// we only delete object data, not untyped
if ( m_clientDataType == wxClientData_Object )
delete m_clientObject;
}
+void wxEvtHandler::Unlink()
+{
+ // this event handler must take itself out of the chain of handlers:
+
+ if (m_previousHandler)
+ m_previousHandler->SetNextHandler(m_nextHandler);
+
+ if (m_nextHandler)
+ m_nextHandler->SetPreviousHandler(m_previousHandler);
+
+ m_nextHandler = NULL;
+ m_previousHandler = NULL;
+}
+
+bool wxEvtHandler::IsUnlinked() const
+{
+ return m_previousHandler == NULL &&
+ m_nextHandler == NULL;
+}
+
#if wxUSE_THREADS
-bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
+bool wxEvtHandler::ProcessThreadEvent(const wxEvent& event)
{
// check that we are really in a child thread
wxASSERT_MSG( !wxThread::IsMain(),
AddPendingEvent(event);
- return TRUE;
+ return true;
}
#endif // wxUSE_THREADS
-void wxEvtHandler::AddPendingEvent(wxEvent& event)
+void wxEvtHandler::QueueEvent(wxEvent *event)
{
- // 1) Add event to list of pending events of this event handler
-
- wxEvent *eventCopy = event.Clone();
+ wxCHECK_RET( event, "NULL event can't be posted" );
- // we must be able to copy the events here so the event class must
- // implement Clone() properly instead of just providing a NULL stab for it
- wxCHECK_RET( eventCopy,
- _T("events of this type aren't supposed to be posted") );
-
-#if defined(__VISAGECPP__)
- wxENTER_CRIT_SECT( m_eventsLocker);
-#else
- wxENTER_CRIT_SECT( *m_eventsLocker);
-#endif
+ // 1) Add this event to our list of pending events
+ wxENTER_CRIT_SECT( m_pendingEventsLock );
if ( !m_pendingEvents )
m_pendingEvents = new wxList;
- m_pendingEvents->Append(eventCopy);
-
-#if defined(__VISAGECPP__)
- wxLEAVE_CRIT_SECT( m_eventsLocker);
-#else
- wxLEAVE_CRIT_SECT( *m_eventsLocker);
-#endif
+ m_pendingEvents->Append(event);
// 2) Add this event handler to list of event handlers that
// have pending events.
- wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+ wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker);
+
+ if ( !wxHandlersWithPendingEvents )
+ wxHandlersWithPendingEvents = new wxList;
+ if ( !wxHandlersWithPendingEvents->Find(this) )
+ wxHandlersWithPendingEvents->Append(this);
- if ( !wxPendingEvents )
- wxPendingEvents = new wxList;
- wxPendingEvents->Append(this);
+ wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker);
- wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+ // only release m_pendingEventsLock now because otherwise there is a race
+ // condition as described in the ticket #9093: we could process the event
+ // just added to m_pendingEvents in our ProcessPendingEvents() below before
+ // we had time to append this pointer to wxHandlersWithPendingEvents list; thus
+ // breaking the invariant that a handler should be in the list iff it has
+ // any pending events to process
+ wxLEAVE_CRIT_SECT( m_pendingEventsLock );
- // 3) Inform the system that new pending events are somwehere,
+ // 3) Inform the system that new pending events are somewhere,
// and that these should be processed in idle time.
wxWakeUpIdle();
}
void wxEvtHandler::ProcessPendingEvents()
{
-#if defined(__VISAGECPP__)
- wxENTER_CRIT_SECT( m_eventsLocker);
-#else
- wxENTER_CRIT_SECT( *m_eventsLocker);
-#endif
+ wxENTER_CRIT_SECT( m_pendingEventsLock );
+
+ // this method is only called by wxApp if this handler does have
+ // pending events
+ wxCHECK_RET( m_pendingEvents && !m_pendingEvents->IsEmpty(),
+ "should have pending events if called" );
wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
- while ( node )
- {
- wxEvent *event = (wxEvent *)node->GetData();
- m_pendingEvents->Erase(node);
+ wxEventPtr event(static_cast<wxEvent *>(node->GetData()));
- // In ProcessEvent, new events might get added and
- // we can safely leave the crtical section here.
-#if defined(__VISAGECPP__)
- wxLEAVE_CRIT_SECT( m_eventsLocker);
-#else
- wxLEAVE_CRIT_SECT( *m_eventsLocker);
+ // it's important we remove event from list before processing it, else a
+ // nested event loop, for example from a modal dialog, might process the
+ // same event again.
+ m_pendingEvents->Erase(node);
+
+ // if there are no more pending events left, we don't need to stay in this
+ // list
+ if ( m_pendingEvents->IsEmpty() )
+ {
+#if wxUSE_THREADS
+ if (wxHandlersWithPendingEventsLocker)
+ wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker);
#endif
- ProcessEvent(*event);
- delete event;
-#if defined(__VISAGECPP__)
- wxENTER_CRIT_SECT( m_eventsLocker);
-#else
- wxENTER_CRIT_SECT( *m_eventsLocker);
+ wxHandlersWithPendingEvents->DeleteObject(this);
+#if wxUSE_THREADS
+ if (wxHandlersWithPendingEventsLocker)
+ wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker);
#endif
-
- node = m_pendingEvents->GetFirst();
}
-#if defined(__VISAGECPP__)
- wxLEAVE_CRIT_SECT( m_eventsLocker);
-#else
- wxLEAVE_CRIT_SECT( *m_eventsLocker);
-#endif
+ wxLEAVE_CRIT_SECT( m_pendingEventsLock );
+
+ ProcessEvent(*event);
+
+ // careful: this object could have been deleted by the event handler
+ // executed by the above ProcessEvent() call, so we can't access any fields
+ // of this object any more
}
/*
* Event table stuff
*/
+/* static */ bool
+wxEvtHandler::ProcessEventIfMatchesId(const wxEventTableEntryBase& entry,
+ wxEvtHandler *handler,
+ wxEvent& event)
+{
+ int tableId1 = entry.m_id,
+ tableId2 = entry.m_lastId;
+
+ // match only if the event type is the same and the id is either -1 in
+ // the event table (meaning "any") or the event id matches the id
+ // specified in the event table either exactly or by falling into
+ // range between first and last
+ if ((tableId1 == wxID_ANY) ||
+ (tableId2 == wxID_ANY && tableId1 == event.GetId()) ||
+ (tableId2 != wxID_ANY &&
+ (event.GetId() >= tableId1 && event.GetId() <= tableId2)))
+ {
+ event.Skip(false);
+ event.m_callbackUserData = entry.m_callbackUserData;
+
+#if wxUSE_EXCEPTIONS
+ if ( wxTheApp )
+ {
+ // call the handler via wxApp method which allows the user to catch
+ // any exceptions which may be thrown by any handler in the program
+ // in one place
+ wxTheApp->CallEventHandler(handler, *entry.m_fn, event);
+ }
+ else
+#endif // wxUSE_EXCEPTIONS
+ {
+ (*entry.m_fn)(handler, event);
+ }
+
+ if (!event.GetSkipped())
+ return true;
+ }
+
+ return false;
+}
bool wxEvtHandler::TryParent(wxEvent& event)
{
+ if ( GetNextHandler() )
+ {
+ // the next handler will pass it to wxTheApp if it doesn't process it,
+ // so return from here to avoid doing it again
+ return GetNextHandler()->TryParent(event);
+ }
+
if ( wxTheApp && (this != wxTheApp) )
{
// Special case: don't pass wxEVT_IDLE to wxApp, since it'll always
if ( event.GetEventType() != wxEVT_IDLE )
{
if ( wxTheApp->ProcessEvent(event) )
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
bool wxEvtHandler::ProcessEvent(wxEvent& event)
{
// allow the application to hook into event processing
- if ( wxTheApp )
+ //
+ // note that we should only do it if we're the first event handler called
+ // to avoid calling FilterEvent() multiple times as the event goes through
+ // the event handler chain and possibly upwards the window hierarchy
+ if ( !event.WasProcessed() )
{
- int rc = wxTheApp->FilterEvent(event);
- if ( rc != -1 )
+ if ( wxTheApp )
{
- wxASSERT_MSG( rc == 1 || rc == 0,
- _T("unexpected wxApp::FilterEvent return value") );
+ int rc = wxTheApp->FilterEvent(event);
+ if ( rc != -1 )
+ {
+ wxASSERT_MSG( rc == 1 || rc == 0,
+ "unexpected wxApp::FilterEvent return value" );
- return rc != 0;
+ return rc != 0;
+ }
+ //else: proceed normally
}
- //else: proceed normally
}
- // An event handler can be enabled or disabled
- if ( GetEvtHandlerEnabled() )
- {
- // if we have a validator, it has higher priority than our own event
- // table
-#if wxUSE_VALIDATORS
- if ( TryValidator(event) )
- return TRUE;
-#endif // wxUSE_VALIDATORS
-
- // Handle per-instance dynamic event tables first
- if ( m_dynamicEvents && SearchDynamicEventTable(event) )
- return TRUE;
-
- // Then static per-class event tables
- if ( GetEventHashTable().HandleEvent(event, this) )
- return TRUE;
- }
+ if ( ProcessEventHere(event) )
+ return true;
- // Try going down the event handler chain
+ // pass the event to the next handler, notice that we shouldn't call
+ // TryParent() even if it doesn't handle the event as the last handler in
+ // the chain will do it
if ( GetNextHandler() )
+ return GetNextHandler()->ProcessEvent(event);
+
+ // propagate the event upwards the window chain and/or to the application
+ // object if it wasn't processed at this level
+ return TryParent(event);
+}
+
+bool wxEvtHandler::ProcessEventHere(wxEvent& event)
+{
+ // If the event handler is disabled it doesn't process any events
+ if ( !GetEvtHandlerEnabled() )
+ return false;
+
+ // If we have a validator, it has higher priority than our own event
+ // handlers
+ if ( TryValidator(event) )
+ return true;
+
+ // Handle per-instance dynamic event tables first
+ if ( m_dynamicEvents && SearchDynamicEventTable(event) )
+ return true;
+
+ // Then static per-class event tables
+ if ( GetEventHashTable().HandleEvent(event, this) )
+ return true;
+
+ // We don't have a handler for this event.
+ return false;
+}
+
+bool wxEvtHandler::SafelyProcessEvent(wxEvent& event)
+{
+#if wxUSE_EXCEPTIONS
+ try
{
- if ( GetNextHandler()->ProcessEvent(event) )
- return TRUE;
+#endif
+ return ProcessEvent(event);
+#if wxUSE_EXCEPTIONS
}
+ catch ( ... )
+ {
+ wxEventLoopBase *loop = wxEventLoopBase::GetActive();
+ try
+ {
+ if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() )
+ {
+ if ( loop )
+ loop->Exit();
+ }
+ //else: continue running current event loop
- // Finally propagate the event upwards the window chain and/or to the
- // application object as necessary
- return TryParent(event);
+ return false;
+ }
+ catch ( ... )
+ {
+ // OnExceptionInMainLoop() threw, possibly rethrowing the same
+ // exception again: very good, but we still need Exit() to
+ // be called
+ if ( loop )
+ loop->Exit();
+ throw;
+ }
+ }
+#endif // wxUSE_EXCEPTIONS
}
bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
{
- wxEventType eventType = event.GetEventType();
- int eventId = event.GetId();
-
- // BC++ doesn't like testing for m_fn without != 0
+ const wxEventType eventType = event.GetEventType();
for ( int i = 0; table.entries[i].m_fn != 0; i++ )
{
- // the line using reference exposes a bug in gcc: although it _seems_
- // to work, it leads to weird crashes later on during program
- // execution
-#ifdef __GNUG__
- wxEventTableEntry entry = table.entries[i];
-#else
const wxEventTableEntry& entry = table.entries[i];
-#endif
-
- // match only if the event type is the same and the id is either -1 in
- // the event table (meaning "any") or the event id matches the id
- // specified in the event table either exactly or by falling into
- // range between first and last
if ( eventType == entry.m_eventType )
{
- int tableId1 = entry.m_id,
- tableId2 = entry.m_lastId;
-
- if ( (tableId1 == -1) ||
- (tableId2 == -1 && eventId == tableId1) ||
- (tableId2 != -1 &&
- (eventId >= tableId1 && eventId <= tableId2)) )
- {
- event.Skip(FALSE);
- event.m_callbackUserData = entry.m_callbackUserData;
-
- (this->*((wxEventFunction) (entry.m_fn)))(event);
-
- return !event.GetSkipped();
- }
+ if ( ProcessEventIfMatchesId(entry, this, event) )
+ return true;
}
}
- return FALSE;
+ return false;
}
-void wxEvtHandler::Connect( int id, int lastId,
- int eventType,
- wxObjectEventFunction func,
- wxObject *userData,
- wxEvtHandler* eventSink )
+void wxEvtHandler::Subscribe( int id, int lastId,
+ wxEventType eventType,
+ wxEventFunctor *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, eventSink);
-#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+ new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
if (!m_dynamicEvents)
m_dynamicEvents = new wxList;
// Insert at the front of the list so most recent additions are found first
m_dynamicEvents->Insert( (wxObject*) entry );
+
+ // Make sure we get to know when a sink is destroyed
+ wxEvtHandler *eventSink = func->GetHandler();
+ if ( eventSink && eventSink != this )
+ {
+ wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
+ if ( evtConnRef )
+ evtConnRef->IncRef( );
+ else
+ new wxEventConnectionRef(this, eventSink);
+ }
}
-bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
- wxObjectEventFunction func,
- wxObject *userData,
- wxEvtHandler* eventSink )
+bool
+wxEvtHandler::Unsubscribe(int id,
+ int lastId,
+ wxEventType eventType,
+ const wxEventFunctor& func,
+ wxObject *userData)
{
if (!m_dynamicEvents)
- return FALSE;
+ return false;
+
+ // Remove connection from tracker node (wxEventConnectionRef)
+ wxEvtHandler *eventSink = func.GetHandler();
+ if ( eventSink && eventSink != this )
+ {
+ wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
+ if ( evtConnRef )
+ evtConnRef->DecRef();
+ }
wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
while (node)
{
-#if WXWIN_COMPATIBILITY_EVENT_TYPES
- wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData();
-#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
- wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
-#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
if ((entry->m_id == id) &&
- ((entry->m_lastId == lastId) || (lastId == -1)) &&
+ ((entry->m_lastId == lastId) || (lastId == wxID_ANY)) &&
((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
- ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
- ((entry->m_eventSink == eventSink) || (eventSink == (wxEvtHandler*)NULL)) &&
- ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
+ entry->m_fn->Matches(func) &&
+ ((entry->m_callbackUserData == userData) || !userData))
{
- if (entry->m_callbackUserData)
- delete entry->m_callbackUserData;
+ delete entry->m_callbackUserData;
m_dynamicEvents->Erase( node );
delete entry;
- return TRUE;
+ return true;
}
node = node->GetNext();
}
- return FALSE;
+ return false;
}
bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
{
- wxCHECK_MSG( m_dynamicEvents, FALSE,
+ wxCHECK_MSG( m_dynamicEvents, false,
wxT("caller should check that we have dynamic events") );
- int commandId = event.GetId();
-
wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
while (node)
{
-#if WXWIN_COMPATIBILITY_EVENT_TYPES
- wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData();
-#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
- wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
-#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
- if (entry->m_fn)
- {
- // Match, if event spec says any id will do (id == -1)
- if ( (event.GetEventType() == entry->m_eventType) &&
- (entry->m_id == -1 ||
- (entry->m_lastId == -1 && commandId == entry->m_id) ||
- (entry->m_lastId != -1 &&
- (commandId >= entry->m_id && commandId <= entry->m_lastId))) )
- {
- event.Skip(FALSE);
- event.m_callbackUserData = entry->m_callbackUserData;
-
-#if !WXWIN_COMPATIBILITY_EVENT_TYPES
- if (entry->m_eventSink)
- ((entry->m_eventSink)->*((wxEventFunction) (entry->m_fn)))(event);
- else
-#endif
- (this->*((wxEventFunction) (entry->m_fn)))(event);
+ // get next node before (maybe) calling the event handler as it could
+ // call Disconnect() invalidating the current node
+ node = node->GetNext();
- if ( ! event.GetSkipped() )
- return TRUE;
- }
+ if ( event.GetEventType() == entry->m_eventType )
+ {
+ wxEvtHandler *handler = entry->m_fn->GetHandler();
+ if ( !handler )
+ handler = this;
+ if ( ProcessEventIfMatchesId(*entry, handler, event) )
+ return true;
}
- node = node->GetNext();
}
- return FALSE;
-};
+
+ return false;
+}
void wxEvtHandler::DoSetClientObject( wxClientData *data )
{
return m_clientData;
}
+// A helper to find an wxEventConnectionRef object
+wxEventConnectionRef *
+wxEvtHandler::FindRefInTrackerList(wxEvtHandler *eventSink)
+{
+ for ( wxTrackerNode *node = eventSink->GetFirst(); node; node = node->m_nxt )
+ {
+ // we only want wxEventConnectionRef nodes here
+ wxEventConnectionRef *evtConnRef = node->ToEventConnection();
+ if ( evtConnRef && evtConnRef->m_src == this )
+ {
+ wxASSERT( evtConnRef->m_sink==eventSink );
+ return evtConnRef;
+ }
+ }
+
+ return NULL;
+}
-#if WXWIN_COMPATIBILITY
-bool wxEvtHandler::OnClose()
+void wxEvtHandler::OnSinkDestroyed( wxEvtHandler *sink )
{
- if (GetNextHandler())
- return GetNextHandler()->OnClose();
- else
- return FALSE;
+ wxASSERT(m_dynamicEvents);
+
+ // remove all connections with this sink
+ wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(), node_nxt;
+ while (node)
+ {
+ wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
+ node_nxt = node->GetNext();
+
+ if ( entry->m_fn->GetHandler() == sink )
+ {
+ delete entry->m_callbackUserData;
+ m_dynamicEvents->Erase( node );
+ delete entry;
+ }
+ node = node_nxt;
+ }
}
-#endif // WXWIN_COMPATIBILITY
#endif // wxUSE_BASE
else
win = win->GetParent();
}
- if (win == (wxWindow*) NULL)
- focusWin = (wxWindow*) NULL;
+ if (win == NULL)
+ focusWin = NULL;
return focusWin;
}
+// ----------------------------------------------------------------------------
+// wxEventBlocker
+// ----------------------------------------------------------------------------
+
+wxEventBlocker::wxEventBlocker(wxWindow *win, wxEventType type)
+{
+ wxCHECK_RET(win, wxT("Null window given to wxEventBlocker"));
+
+ m_window = win;
+
+ Block(type);
+ m_window->PushEventHandler(this);
+}
+
+wxEventBlocker::~wxEventBlocker()
+{
+ wxEvtHandler *popped = m_window->PopEventHandler(false);
+ wxCHECK_RET(popped == this,
+ wxT("Don't push other event handlers into a window managed by wxEventBlocker!"));
+}
+
+bool wxEventBlocker::ProcessEvent(wxEvent& event)
+{
+ // should this event be blocked?
+ for ( size_t i = 0; i < m_eventsToBlock.size(); i++ )
+ {
+ wxEventType t = (wxEventType)m_eventsToBlock[i];
+ if ( t == wxEVT_ANY || t == event.GetEventType() )
+ return true; // yes, it should: mark this event as processed
+ }
+
+ return false;
+}
+
#endif // wxUSE_GUI
+
projects / wxWidgets.git / blobdiff