To avoid error message, do not even try to set focus on MSW popup window that doesn...

[wxWidgets.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 297e223555004dea223ccd1a5bfbea8deeb7dc7a..590c3adf3e0939eee70349257d7f743f21b964f2 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        event.cpp
+// Name:        src/common/event.cpp

 // Purpose:     Event classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     Event classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "event.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,253 +24,43 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/event.h"
+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
-    #include "wx/app.h"

     #include "wx/list.h"
     #include "wx/list.h"

+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/stopwatch.h"
+    #include "wx/module.h"

 
     #if wxUSE_GUI
 
     #if wxUSE_GUI

+        #include "wx/window.h"

         #include "wx/control.h"
         #include "wx/control.h"

-        #include "wx/utils.h"

         #include "wx/dc.h"
         #include "wx/dc.h"

+        #include "wx/textctrl.h"
+        #include "wx/validate.h"

     #endif // wxUSE_GUI
 #endif
 
     #endif // wxUSE_GUI
 #endif
 

-#include "wx/event.h"
-
-#if wxUSE_GUI
-    #include "wx/validate.h"
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-int wxNewEventType()
-{
-    static int wxCurrentEventType = 10000;
-
-    return wxCurrentEventType++;
-}
-
-const int wxEVT_NULL = 0;
-const int wxEVT_FIRST = 10000;
-
-const int wxEVT_COMMAND_BUTTON_CLICKED = wxNewEventType();
-const int wxEVT_COMMAND_CHECKBOX_CLICKED = wxNewEventType();
-const int wxEVT_COMMAND_CHOICE_SELECTED = wxNewEventType();
-const int wxEVT_COMMAND_LISTBOX_SELECTED = wxNewEventType();
-const int wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxNewEventType();
-const int wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxNewEventType();
-const int wxEVT_COMMAND_TEXT_UPDATED = wxNewEventType();
-const int wxEVT_COMMAND_TEXT_ENTER = wxNewEventType();
-const int wxEVT_COMMAND_MENU_SELECTED = wxNewEventType();
-const int wxEVT_COMMAND_TOOL_CLICKED = wxNewEventType();
-const int wxEVT_COMMAND_SLIDER_UPDATED = wxNewEventType();
-const int wxEVT_COMMAND_RADIOBOX_SELECTED = wxNewEventType();
-const int wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxNewEventType();
-const int wxEVT_COMMAND_SCROLLBAR_UPDATED = wxNewEventType();
-const int wxEVT_COMMAND_VLBOX_SELECTED = wxNewEventType();
-const int wxEVT_COMMAND_COMBOBOX_SELECTED = wxNewEventType();
-const int wxEVT_COMMAND_TOOL_RCLICKED = wxNewEventType();
-const int wxEVT_COMMAND_TOOL_ENTER = wxNewEventType();
-const int wxEVT_COMMAND_SPINCTRL_UPDATED = wxNewEventType();
-
-// Sockets and timers send events, too
-const int wxEVT_SOCKET = wxNewEventType();
-const int wxEVT_TIMER = wxNewEventType();
-
-// Mouse event types
-const int wxEVT_LEFT_DOWN = wxNewEventType();
-const int wxEVT_LEFT_UP = wxNewEventType();
-const int wxEVT_MIDDLE_DOWN = wxNewEventType();
-const int wxEVT_MIDDLE_UP = wxNewEventType();
-const int wxEVT_RIGHT_DOWN = wxNewEventType();
-const int wxEVT_RIGHT_UP = wxNewEventType();
-const int wxEVT_MOTION = wxNewEventType();
-const int wxEVT_ENTER_WINDOW = wxNewEventType();
-const int wxEVT_LEAVE_WINDOW = wxNewEventType();
-const int wxEVT_LEFT_DCLICK = wxNewEventType();
-const int wxEVT_MIDDLE_DCLICK = wxNewEventType();
-const int wxEVT_RIGHT_DCLICK = wxNewEventType();
-const int wxEVT_SET_FOCUS = wxNewEventType();
-const int wxEVT_KILL_FOCUS = wxNewEventType();
-
-// Non-client mouse events
-const int wxEVT_NC_LEFT_DOWN = wxNewEventType();
-const int wxEVT_NC_LEFT_UP = wxNewEventType();
-const int wxEVT_NC_MIDDLE_DOWN = wxNewEventType();
-const int wxEVT_NC_MIDDLE_UP = wxNewEventType();
-const int wxEVT_NC_RIGHT_DOWN = wxNewEventType();
-const int wxEVT_NC_RIGHT_UP = wxNewEventType();
-const int wxEVT_NC_MOTION = wxNewEventType();
-const int wxEVT_NC_ENTER_WINDOW = wxNewEventType();
-const int wxEVT_NC_LEAVE_WINDOW = wxNewEventType();
-const int wxEVT_NC_LEFT_DCLICK = wxNewEventType();
-const int wxEVT_NC_MIDDLE_DCLICK = wxNewEventType();
-const int wxEVT_NC_RIGHT_DCLICK = wxNewEventType();
-
-// Character input event type
-const int wxEVT_CHAR = wxNewEventType();
-const int wxEVT_CHAR_HOOK = wxNewEventType();
-const int wxEVT_NAVIGATION_KEY = wxNewEventType();
-const int wxEVT_KEY_DOWN = wxNewEventType();
-const int wxEVT_KEY_UP = wxNewEventType();
-
-// Set cursor event
-const int wxEVT_SET_CURSOR = wxNewEventType();
-
-// wxScrollbar and wxSlider event identifiers
-const int wxEVT_SCROLL_TOP = wxNewEventType();
-const int wxEVT_SCROLL_BOTTOM = wxNewEventType();
-const int wxEVT_SCROLL_LINEUP = wxNewEventType();
-const int wxEVT_SCROLL_LINEDOWN = wxNewEventType();
-const int wxEVT_SCROLL_PAGEUP = wxNewEventType();
-const int wxEVT_SCROLL_PAGEDOWN = wxNewEventType();
-const int wxEVT_SCROLL_THUMBTRACK = wxNewEventType();
-const int wxEVT_SCROLL_THUMBRELEASE = wxNewEventType();
-
-// Scroll events from wxWindow
-const int wxEVT_SCROLLWIN_TOP = wxNewEventType();
-const int wxEVT_SCROLLWIN_BOTTOM = wxNewEventType();
-const int wxEVT_SCROLLWIN_LINEUP = wxNewEventType();
-const int wxEVT_SCROLLWIN_LINEDOWN = wxNewEventType();
-const int wxEVT_SCROLLWIN_PAGEUP = wxNewEventType();
-const int wxEVT_SCROLLWIN_PAGEDOWN = wxNewEventType();
-const int wxEVT_SCROLLWIN_THUMBTRACK = wxNewEventType();
-const int wxEVT_SCROLLWIN_THUMBRELEASE = wxNewEventType();
-
-// System events
-const int wxEVT_SIZE = wxNewEventType();
-const int wxEVT_MOVE = wxNewEventType();
-const int wxEVT_CLOSE_WINDOW = wxNewEventType();
-const int wxEVT_END_SESSION = wxNewEventType();
-const int wxEVT_QUERY_END_SESSION = wxNewEventType();
-const int wxEVT_ACTIVATE_APP = wxNewEventType();
-const int wxEVT_POWER = wxNewEventType();
-const int wxEVT_ACTIVATE = wxNewEventType();
-const int wxEVT_CREATE = wxNewEventType();
-const int wxEVT_DESTROY = wxNewEventType();
-const int wxEVT_SHOW = wxNewEventType();
-const int wxEVT_ICONIZE = wxNewEventType();
-const int wxEVT_MAXIMIZE = wxNewEventType();
-const int wxEVT_MOUSE_CAPTURE_CHANGED = wxNewEventType();
-const int wxEVT_PAINT = wxNewEventType();
-const int wxEVT_ERASE_BACKGROUND = wxNewEventType();
-const int wxEVT_NC_PAINT = wxNewEventType();
-const int wxEVT_PAINT_ICON = wxNewEventType();
-const int wxEVT_MENU_CHAR = wxNewEventType();
-const int wxEVT_MENU_INIT = wxNewEventType();
-const int wxEVT_MENU_HIGHLIGHT = wxNewEventType();
-const int wxEVT_POPUP_MENU_INIT = wxNewEventType();
-const int wxEVT_CONTEXT_MENU = wxNewEventType();
-const int wxEVT_SYS_COLOUR_CHANGED = wxNewEventType();
-const int wxEVT_SETTING_CHANGED = wxNewEventType();
-const int wxEVT_QUERY_NEW_PALETTE = wxNewEventType();
-const int wxEVT_PALETTE_CHANGED = wxNewEventType();
-const int wxEVT_JOY_BUTTON_DOWN = wxNewEventType();
-const int wxEVT_JOY_BUTTON_UP = wxNewEventType();
-const int wxEVT_JOY_MOVE = wxNewEventType();
-const int wxEVT_JOY_ZMOVE = wxNewEventType();
-const int wxEVT_DROP_FILES = wxNewEventType();
-const int wxEVT_DRAW_ITEM = wxNewEventType();
-const int wxEVT_MEASURE_ITEM = wxNewEventType();
-const int wxEVT_COMPARE_ITEM = wxNewEventType();
-const int wxEVT_INIT_DIALOG = wxNewEventType();
-const int wxEVT_IDLE = wxNewEventType();
-const int wxEVT_UPDATE_UI = wxNewEventType();
-
-// System misc.
-const int wxEVT_END_PROCESS = wxNewEventType();
-
-// Dial up events
-const int wxEVT_DIALUP_CONNECTED = wxNewEventType();
-const int wxEVT_DIALUP_DISCONNECTED = wxNewEventType();
+#include "wx/thread.h"

 
 

-// Generic command events
-// Note: a click is a higher-level event than button down/up
-const int wxEVT_COMMAND_LEFT_CLICK = wxNewEventType();
-const int wxEVT_COMMAND_LEFT_DCLICK = wxNewEventType();
-const int wxEVT_COMMAND_RIGHT_CLICK = wxNewEventType();
-const int wxEVT_COMMAND_RIGHT_DCLICK = wxNewEventType();
-const int wxEVT_COMMAND_SET_FOCUS = wxNewEventType();
-const int wxEVT_COMMAND_KILL_FOCUS = wxNewEventType();
-const int wxEVT_COMMAND_ENTER = wxNewEventType();
-
-// Tree control event types
-const int wxEVT_COMMAND_TREE_BEGIN_DRAG = wxNewEventType();
-const int wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxNewEventType();
-const int wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxNewEventType();
-const int wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxNewEventType();
-const int wxEVT_COMMAND_TREE_DELETE_ITEM = wxNewEventType();
-const int wxEVT_COMMAND_TREE_GET_INFO = wxNewEventType();
-const int wxEVT_COMMAND_TREE_SET_INFO = wxNewEventType();
-const int wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxNewEventType();
-const int wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxNewEventType();
-const int wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxNewEventType();
-const int wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxNewEventType();
-const int wxEVT_COMMAND_TREE_SEL_CHANGED = wxNewEventType();
-const int wxEVT_COMMAND_TREE_SEL_CHANGING = wxNewEventType();
-const int wxEVT_COMMAND_TREE_KEY_DOWN = wxNewEventType();
-const int wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxNewEventType();
-const int wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxNewEventType();
-const int wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxNewEventType();
-const int wxEVT_COMMAND_TREE_END_DRAG = wxNewEventType();
-
-// List control event types
-const int wxEVT_COMMAND_LIST_BEGIN_DRAG = wxNewEventType();
-const int wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxNewEventType();
-const int wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxNewEventType();
-const int wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxNewEventType();
-const int wxEVT_COMMAND_LIST_DELETE_ITEM = wxNewEventType();
-const int wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxNewEventType();
-const int wxEVT_COMMAND_LIST_GET_INFO = wxNewEventType();
-const int wxEVT_COMMAND_LIST_SET_INFO = wxNewEventType();
-const int wxEVT_COMMAND_LIST_ITEM_SELECTED = wxNewEventType();
-const int wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxNewEventType();
-const int wxEVT_COMMAND_LIST_KEY_DOWN = wxNewEventType();
-const int wxEVT_COMMAND_LIST_INSERT_ITEM = wxNewEventType();
-const int wxEVT_COMMAND_LIST_COL_CLICK = wxNewEventType();
-const int wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxNewEventType();
-const int wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxNewEventType();
-const int wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxNewEventType();
-
-// Tab and notebook control event types
-const int wxEVT_COMMAND_TAB_SEL_CHANGED = wxNewEventType();
-const int wxEVT_COMMAND_TAB_SEL_CHANGING = wxNewEventType();
-const int wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxNewEventType();
-const int wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxNewEventType();
-
-// Splitter events
-const int wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxNewEventType();
-const int wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxNewEventType();
-const int wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxNewEventType();
-const int wxEVT_COMMAND_SPLITTER_UNSPLIT = wxNewEventType();
-
-// Wizard events
-const int wxEVT_WIZARD_PAGE_CHANGED = wxNewEventType();
-const int wxEVT_WIZARD_PAGE_CHANGING = wxNewEventType();
-const int wxEVT_WIZARD_CANCEL = wxNewEventType();
-
-// Calendar events
-const int wxEVT_CALENDAR_SEL_CHANGED = wxNewEventType();
-const int wxEVT_CALENDAR_DAY_CHANGED = wxNewEventType();
-const int wxEVT_CALENDAR_MONTH_CHANGED = wxNewEventType();
-const int wxEVT_CALENDAR_YEAR_CHANGED = wxNewEventType();
-const int wxEVT_CALENDAR_DOUBLECLICKED = wxNewEventType();
-const int wxEVT_CALENDAR_WEEKDAY_CLICKED = wxNewEventType();
+#if wxUSE_BASE
+    #include "wx/ptr_scpd.h"

 
 

-// Help events
-const int wxEVT_HELP = wxNewEventType();
-const int wxEVT_DETAILED_HELP = wxNewEventType();
+    wxDECLARE_SCOPED_PTR(wxEvent, wxEventPtr)
+    wxDEFINE_SCOPED_PTR(wxEvent, wxEventPtr)
+#endif // wxUSE_BASE

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
+#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(wxCommandEvent, wxEvent)
 
 #if wxUSE_GUI
     IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)


@@ -285,9 +71,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
     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(wxEraseEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)

+    IMPLEMENT_DYNAMIC_CLASS(wxChildFocusEvent, wxCommandEvent)

     IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)


@@ -297,48 +85,270 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)

+    IMPLEMENT_DYNAMIC_CLASS(wxSetCursorEvent, wxEvent)

     IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)

+    IMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent)

     IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
     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(wxWindowDestroyEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, 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
 
 #endif // wxUSE_GUI
 

+#if wxUSE_BASE
+

 const wxEventTable *wxEvtHandler::GetEventTable() const
     { return &wxEvtHandler::sm_eventTable; }
 
 const wxEventTable wxEvtHandler::sm_eventTable =
     { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
 
 const wxEventTable *wxEvtHandler::GetEventTable() const
     { return &wxEvtHandler::sm_eventTable; }
 
 const wxEventTable wxEvtHandler::sm_eventTable =
     { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
 

+wxEventHashTable &wxEvtHandler::GetEventHashTable() const
+    { return wxEvtHandler::sm_eventHashTable; }
+
+wxEventHashTable wxEvtHandler::sm_eventHashTable(wxEvtHandler::sm_eventTable);
+

 const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
 const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =

-    { wxEventTableEntry( 0, 0, 0, (wxObjectEventFunction) NULL, (wxObject*) NULL ) };
+    { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
+
+
+// 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
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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 *wxPendingEvents = NULL;

 
 #if wxUSE_THREADS
     // protects wxPendingEvents list
 
 #if wxUSE_THREADS
     // protects wxPendingEvents list

-    wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL;
+    wxCriticalSection *wxPendingEventsLocker = NULL;
+#endif
+
+// common event types are defined here, other event types are defined by the
+// components which use them
+
+const wxEventType wxEVT_FIRST = 10000;
+const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
+
+DEFINE_EVENT_TYPE(wxEVT_NULL)
+DEFINE_EVENT_TYPE(wxEVT_IDLE)
+DEFINE_EVENT_TYPE(wxEVT_SOCKET)
+DEFINE_EVENT_TYPE(wxEVT_TIMER)
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+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)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED)
+
+// 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)
+DEFINE_EVENT_TYPE(wxEVT_AUX1_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_AUX1_UP)
+DEFINE_EVENT_TYPE(wxEVT_AUX1_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_AUX2_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_AUX2_UP)
+DEFINE_EVENT_TYPE(wxEVT_AUX2_DCLICK)
+
+// 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)
+
+// 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)
+#if wxUSE_HOTKEY
+DEFINE_EVENT_TYPE(wxEVT_HOTKEY)

 #endif
 
 #endif
 

+// Set cursor event
+DEFINE_EVENT_TYPE(wxEVT_SET_CURSOR)
+
+// 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_CHANGED)
+
+// 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)
+
+// 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_MOVE_START)
+DEFINE_EVENT_TYPE(wxEVT_MOVE_END)
+DEFINE_EVENT_TYPE(wxEVT_CLOSE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_HIBERNATE)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE_APP)
+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_MOUSE_CAPTURE_LOST)
+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)
+
+// Clipboard events
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_COPY)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_CUT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_PASTE)
+
+// 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)
+
+// Help events
+DEFINE_EVENT_TYPE(wxEVT_HELP)
+DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP)
+
+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
+wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL;
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// event initialization
+// ----------------------------------------------------------------------------
+
+int wxNewEventType()
+{
+    // MT-FIXME
+    static int s_lastUsedEventType = wxEVT_FIRST;
+
+    return s_lastUsedEventType++;
+}
+

 // ----------------------------------------------------------------------------
 // wxEvent
 // ----------------------------------------------------------------------------
 
 /*
 // ----------------------------------------------------------------------------
 // wxEvent
 // ----------------------------------------------------------------------------
 
 /*

- * General wxWindows events, covering
+ * General wxWidgets events, covering

  * all interesting things that might happen (button clicking, resizing,
  * setting text in widgets, etc.).
  *
  * all interesting things that might happen (button clicking, resizing,
  * setting text in widgets, etc.).
  *


@@ -346,31 +356,49 @@ wxList *wxPendingEvents = (wxList *)NULL;
  *
  */
 
  *
  */
 

-wxEvent::wxEvent(int theId)
+wxEvent::wxEvent(int theId, wxEventType commandType )

 {
 {

-    m_eventType = wxEVT_NULL;
+    m_eventType = commandType;

     m_eventObject = (wxObject *) NULL;
     m_timeStamp = 0;
     m_id = theId;
     m_eventObject = (wxObject *) NULL;
     m_timeStamp = 0;
     m_id = theId;

-    m_skipped = FALSE;
+    m_skipped = false;

     m_callbackUserData = (wxObject *) NULL;
     m_callbackUserData = (wxObject *) NULL;

-    m_isCommandEvent = FALSE;
+    m_isCommandEvent = false;
+    m_propagationLevel = wxEVENT_PROPAGATE_NONE;

 }
 
 }
 

-void wxEvent::CopyObject(wxObject& object_dest) const
+wxEvent::wxEvent(const wxEvent& src)
+    : wxObject(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)

 {
 {

-    wxEvent *obj = (wxEvent *)&object_dest;
-    wxObject::CopyObject(object_dest);
-
-    obj->m_eventType = m_eventType;
-    obj->m_eventObject = m_eventObject;
-    obj->m_timeStamp = m_timeStamp;
-    obj->m_id = m_id;
-    obj->m_skipped = m_skipped;
-    obj->m_callbackUserData = m_callbackUserData;
-    obj->m_isCommandEvent = m_isCommandEvent;

 }
 
 }
 

+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;
+
+    return *this;
+}
+
+#endif // wxUSE_BASE
+

 #if wxUSE_GUI
 
 /*
 #if wxUSE_GUI
 
 /*


@@ -378,42 +406,103 @@ void wxEvent::CopyObject(wxObject& object_dest) const
  *
  */
 
  *
  */
 

+#ifdef __VISUALC__
+    // 'this' : used in base member initializer list (for m_commandString)
+    #pragma warning(disable:4355)
+#endif
+

 wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
 wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)

+              : wxEvent(theId, commandType)

 {
 {

-    m_eventType = commandType;

     m_clientData = (char *) NULL;
     m_clientObject = (wxClientData *) NULL;
     m_extraLong = 0;
     m_commandInt = 0;
     m_clientData = (char *) NULL;
     m_clientObject = (wxClientData *) NULL;
     m_extraLong = 0;
     m_commandInt = 0;

-    m_id = theId;
-    m_commandString = wxEmptyString;
-    m_isCommandEvent = TRUE;
-}
+    m_isCommandEvent = true;

 
 

-void wxCommandEvent::CopyObject(wxObject& obj_d) const
-{
-    wxCommandEvent *obj = (wxCommandEvent *)&obj_d;
+    // the command events are propagated upwards by default
+    m_propagationLevel = wxEVENT_PROPAGATE_MAX;
+}

 
 

-    wxEvent::CopyObject(obj_d);
+#ifdef __VISUALC__
+    #pragma warning(default:4355)
+#endif

 
 

-    obj->m_clientData    = m_clientData;
-    obj->m_clientObject  = m_clientObject;
-    obj->m_extraLong     = m_extraLong;
-    obj->m_commandInt    = m_commandInt;
-    obj->m_commandString = m_commandString;
+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;
+    }

 }
 
 /*
 }
 
 /*

- * Notify events
+ * UI update events

  */
 
  */
 

-void wxNotifyEvent::CopyObject(wxObject& obj_d) const
+#if wxUSE_LONGLONG
+wxLongLong wxUpdateUIEvent::sm_lastUpdate = 0;
+#endif
+
+long wxUpdateUIEvent::sm_updateInterval = 0;
+
+wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
+
+// Can we update?
+bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)

 {
 {

-    wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d;
+    // 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;
+
+    if (sm_updateInterval == -1)
+        return false;
+
+    if (sm_updateInterval == 0)
+        return true;
+
+#if wxUSE_STOPWATCH && wxUSE_LONGLONG
+    wxLongLong now = wxGetLocalTimeMillis();
+    if (now > (sm_lastUpdate + sm_updateInterval))
+    {
+        return true;
+    }

 
 

-    wxEvent::CopyObject(obj_d);
+    return false;
+#else
+    // If we don't have wxStopWatch or wxLongLong, we
+    // should err on the safe side and update now anyway.
+    return true;
+#endif
+}

 
 

-    if (!m_bAllow) obj->Veto();
+// Reset the update time to provide a delay until the next
+// time we should update
+void wxUpdateUIEvent::ResetUpdateTime()
+{
+#if wxUSE_STOPWATCH && wxUSE_LONGLONG
+    if (sm_updateInterval > 0)
+    {
+        wxLongLong now = wxGetLocalTimeMillis();
+        if (now > (sm_lastUpdate + sm_updateInterval))
+        {
+            sm_lastUpdate = now;
+        }
+    }
+#endif

 }
 
 /*
 }
 
 /*


@@ -424,7 +513,7 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
                              int id,
                              int pos,
                              int orient)
                              int id,
                              int pos,
                              int orient)

-             : wxCommandEvent(commandType, id)
+    : wxCommandEvent(commandType, id)

 {
     m_extraLong = orient;
     m_commandInt = pos;
 {
     m_extraLong = orient;
     m_commandInt = pos;


@@ -443,16 +532,6 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
     m_commandInt = pos;
 }
 
     m_commandInt = pos;
 }
 

-void wxScrollWinEvent::CopyObject(wxObject& obj_d) const
-{
-    wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d;
-
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_extraLong    = m_extraLong;
-    obj->m_commandInt   = m_commandInt;
-}
-

 /*
  * Mouse events
  *
 /*
  * Mouse events
  *


@@ -461,131 +540,207 @@ void wxScrollWinEvent::CopyObject(wxObject& obj_d) const
 wxMouseEvent::wxMouseEvent(wxEventType commandType)
 {
     m_eventType = commandType;
 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_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::CopyObject(wxObject& obj_d) const
+void wxMouseEvent::Assign(const wxMouseEvent& event)

 {
 {

-    wxMouseEvent *obj = (wxMouseEvent *)&obj_d;
-
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_metaDown = m_metaDown;
-    obj->m_altDown = m_altDown;
-    obj->m_controlDown = m_controlDown;
-    obj->m_shiftDown = m_shiftDown;
-    obj->m_leftDown = m_leftDown;
-    obj->m_rightDown = m_rightDown;
-    obj->m_middleDown = m_middleDown;
-    obj->m_x = m_x;
-    obj->m_y = m_y;
+    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_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)
     {
 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();
             return LeftDClick();

-        case 2:
+
+        case wxMOUSE_BTN_MIDDLE:

             return MiddleDClick();
             return MiddleDClick();

-        case 3:
+
+        case wxMOUSE_BTN_RIGHT:

             return RightDClick();
             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)
     {
 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();
             return LeftDown();

-        case 2:
+
+        case wxMOUSE_BTN_MIDDLE:

             return MiddleDown();
             return MiddleDown();

-        case 3:
+
+        case wxMOUSE_BTN_RIGHT:

             return RightDown();
             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
 {
 bool wxMouseEvent::ButtonUp(int but) const
 {

-    switch (but) {
-        case -1:
-            return (LeftUp() || MiddleUp() || RightUp());
-        case 1:
+    switch (but)
+    {
+        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();
             return LeftUp();

-        case 2:
+
+        case wxMOUSE_BTN_MIDDLE:

             return MiddleUp();
             return MiddleUp();

-        case 3:
+
+        case wxMOUSE_BTN_RIGHT:

             return RightUp();
             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
 {
 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());
+    switch (but)
+    {

         default:
             wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button"));
         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
 {
 }
 
 bool wxMouseEvent::ButtonIsDown(int but) const
 {

-    switch (but) {
-        case -1:
-            return (LeftIsDown() || MiddleIsDown() || RightIsDown());
-        case 1:
+    switch (but)
+    {
+        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();
             return LeftIsDown();

-        case 2:
+
+        case wxMOUSE_BTN_MIDDLE:

             return MiddleIsDown();
             return MiddleIsDown();

-        case 3:
+
+        case wxMOUSE_BTN_RIGHT:

             return RightIsDown();
             return RightIsDown();

-        default:
-            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown"));
+
+        case wxMOUSE_BTN_AUX1:
+            return Aux1IsDown();
+
+        case wxMOUSE_BTN_AUX2:
+            return Aux2IsDown();
+    }
+}
+
+int wxMouseEvent::GetButton() const
+{
+    for ( int i = 1; i < wxMOUSE_BTN_MAX; i++ )
+    {
+        if ( Button(i) )
+        {
+            return i;
+        }

     }
 
     }
 

-    return FALSE;
+    return wxMOUSE_BTN_NONE;

 }
 
 // Find the logical position of the event given the DC
 }
 
 // Find the logical position of the event given the DC


@@ -597,177 +752,283 @@ wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const
 
 
 /*
 
 
 /*

- * Keyboard events
+ * Keyboard event

  *
  */
 
 wxKeyEvent::wxKeyEvent(wxEventType type)
 {
     m_eventType = type;
  *
  */
 
 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;
     m_keyCode = 0;
     m_scanCode = 0;

+#if wxUSE_UNICODE
+    m_uniChar = 0;
+#endif

 }
 
 }
 

-void wxKeyEvent::CopyObject(wxObject& obj_d) const
+wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
+          : wxEvent(evt),
+            wxKeyboardState(evt)

 {
 {

-    wxKeyEvent *obj = (wxKeyEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    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;
-    obj->m_altDown     = m_altDown;
-    obj->m_keyCode     = m_keyCode;
-}
-
+    m_x = evt.m_x;
+    m_y = evt.m_y;

 
 

-/*
- * Misc events
- */
+    m_keyCode = evt.m_keyCode;

 
 

-void wxSizeEvent::CopyObject(wxObject& obj_d) const
-{
-    wxSizeEvent *obj = (wxSizeEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+    m_scanCode = evt.m_scanCode;
+    m_rawCode = evt.m_rawCode;
+    m_rawFlags = evt.m_rawFlags;

 
 

-    obj->m_size = m_size;
+#if wxUSE_UNICODE
+    m_uniChar = evt.m_uniChar;
+#endif

 }
 
 }
 

-void wxMoveEvent::CopyObject(wxObject& obj_d) const
+wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)

 {
 {

-    wxMoveEvent *obj = (wxMoveEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_pos = m_pos;
+    SetEventType(wxEVT_CREATE);
+    SetEventObject(win);

 }
 
 }
 

-void wxEraseEvent::CopyObject(wxObject& obj_d) const
+wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)

 {
 {

-    wxEraseEvent *obj = (wxEraseEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_dc = m_dc;
+    SetEventType(wxEVT_DESTROY);
+    SetEventObject(win);

 }
 
 }
 

-void wxActivateEvent::CopyObject(wxObject& obj_d) const
+wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
+                 : wxCommandEvent(wxEVT_CHILD_FOCUS)

 {
 {

-    wxActivateEvent *obj = (wxActivateEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_active = m_active;
+    SetEventObject(win);

 }
 
 }
 

-void wxMenuEvent::CopyObject(wxObject& obj_d) const
+// ----------------------------------------------------------------------------
+// wxHelpEvent
+// ----------------------------------------------------------------------------
+
+/* static */
+wxHelpEvent::Origin wxHelpEvent::GuessOrigin(Origin origin)

 {
 {

-    wxMenuEvent *obj = (wxMenuEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+    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;
+    }

 
 

-    obj->m_menuId = m_menuId;
+    return origin;

 }
 
 }
 

-void wxCloseEvent::CopyObject(wxObject& obj_d) const
-{
-    wxCloseEvent *obj = (wxCloseEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+#endif // wxUSE_GUI

 
 

-    obj->m_loggingOff = m_loggingOff;
-    obj->m_veto = m_veto;
-#if WXWIN_COMPATIBILITY
-    obj->m_force = m_force;
-#endif
-    obj->m_canVeto = m_canVeto;
-}

 
 

-void wxShowEvent::CopyObject(wxObject& obj_d) const
+#if wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxEventHashTable
+// ----------------------------------------------------------------------------
+
+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)

 {
 {

-    wxShowEvent *obj = (wxShowEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+    AllocEventTypeTable(EVENT_TYPE_TABLE_INIT_SIZE);

 
 

-    obj->m_show = m_show;
+    m_next = sm_first;
+    if (m_next)
+        m_next->m_previous = this;
+    sm_first = this;

 }
 
 }
 

-void wxJoystickEvent::CopyObject(wxObject& obj_d) const
+wxEventHashTable::~wxEventHashTable()

 {
 {

-    wxJoystickEvent *obj = (wxJoystickEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_pos = m_pos;
-    obj->m_zPosition = m_zPosition;
-    obj->m_buttonChange = m_buttonChange;
-    obj->m_buttonState = m_buttonState;
-    obj->m_joyStick = m_joyStick;
+    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 wxDropFilesEvent::CopyObject(wxObject& obj_d) const
+void wxEventHashTable::Clear()

 {
 {

-    wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+    for ( size_t i = 0; i < m_size; i++ )
+    {
+        EventTypeTablePointer  eTTnode = m_eventTypeTable[i];
+        delete eTTnode;
+    }
+
+    delete[] m_eventTypeTable;
+    m_eventTypeTable = NULL;

 
 

-    obj->m_noFiles = m_noFiles;
-    obj->m_pos = m_pos;
-    // TODO: Problem with obj->m_files. It should be deallocated by the
-    // destructor of the event.
+    m_size = 0;

 }
 
 }
 

-void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
+
+// Clear all tables
+void wxEventHashTable::ClearAll()

 {
 {

-    wxUpdateUIEvent *obj = (wxUpdateUIEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_checked = m_checked;
-    obj->m_enabled = m_enabled;
-    obj->m_text = m_text;
-    obj->m_setText = m_setText;
-    obj->m_setChecked = m_setChecked;
-    obj->m_setEnabled = m_setEnabled;
+    wxEventHashTable* table = sm_first;
+    while (table)
+    {
+        table->Clear();
+        table = table->m_next;
+    }

 }
 
 }
 

-void wxPaletteChangedEvent::CopyObject(wxObject &obj_d) const
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
+
+bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self)

 {
 {

-    wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+    if (m_rebuildHash)
+    {
+        InitHashTable();
+        m_rebuildHash = false;
+    }
+
+    if (!m_eventTypeTable)
+        return false;

 
 

-    obj->m_changedWindow = m_changedWindow;
+    // Find all entries for the given event type.
+    wxEventType eventType = event.GetEventType();
+    const EventTypeTablePointer eTTnode = m_eventTypeTable[eventType % m_size];
+    if (eTTnode && eTTnode->eventType == eventType)
+    {
+        // Now start the search for an event handler
+        // that can handle an event with the given ID.
+        const wxEventTableEntryPointerArray&
+            eventEntryTable = eTTnode->eventEntryTable;
+
+        const size_t count = eventEntryTable.GetCount();
+        for (size_t n = 0; n < count; n++)
+        {
+            if ( wxEvtHandler::
+                    ProcessEventIfMatches(*eventEntryTable[n], self, event) )
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;

 }
 
 }
 

-void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const
+void wxEventHashTable::InitHashTable()

 {
 {

-    wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+    // Loop over the event tables and all its base tables.
+    const wxEventTable *table = &m_table;
+    while (table)
+    {
+        // Retrieve all valid event handler entries
+        const wxEventTableEntry *entry = table->entries;
+        while (entry->m_fn != 0)
+        {
+            // Add the event entry in the Hash.
+            AddEntry(*entry);
+
+            entry++;
+        }

 
 

-    obj->m_paletteRealized = m_paletteRealized;
+        table = table->baseTable;
+    }
+
+    // Lets free some memory.
+    size_t i;
+    for(i = 0; i < m_size; i++)
+    {
+        EventTypeTablePointer  eTTnode = m_eventTypeTable[i];
+        if (eTTnode)
+        {
+            eTTnode->eventEntryTable.Shrink();
+        }
+    }

 }
 
 }
 

-wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
+void wxEventHashTable::AddEntry(const wxEventTableEntry &entry)

 {
 {

-    SetEventType(wxEVT_CREATE);
-    SetEventObject(win);
+    // 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;
+
+    if (eTTnode)
+    {
+        if (eTTnode->eventType != entry.m_eventType)
+        {
+            // Resize the table!
+            GrowEventTypeTable();
+            // Try again to add it.
+            AddEntry(entry);
+            return;
+        }
+    }
+    else
+    {
+        eTTnode = new EventTypeTable;
+        eTTnode->eventType = entry.m_eventType;
+        *peTTnode = eTTnode;
+    }
+
+    // Fill all hash entries between entry.m_id and entry.m_lastId...
+    eTTnode->eventEntryTable.Add(&entry);

 }
 
 }
 

-wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
+void wxEventHashTable::AllocEventTypeTable(size_t size)

 {
 {

-    SetEventType(wxEVT_DESTROY);
-    SetEventObject(win);
+    m_eventTypeTable = new EventTypeTablePointer[size];
+    memset((void *)m_eventTypeTable, 0, sizeof(EventTypeTablePointer)*size);
+    m_size = size;

 }
 
 }
 

-#endif // wxUSE_GUI
-
-void wxIdleEvent::CopyObject(wxObject& obj_d) const
+void wxEventHashTable::GrowEventTypeTable()

 {
 {

-    wxIdleEvent *obj = (wxIdleEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+    size_t oldSize = m_size;
+    EventTypeTablePointer *oldEventTypeTable = m_eventTypeTable;
+
+    // TODO: Search the most optimal grow sequence
+    AllocEventTypeTable(/* GetNextPrime(oldSize) */oldSize*2+1);
+
+    for ( size_t i = 0; i < oldSize; /* */ )
+    {
+        EventTypeTablePointer  eTToldNode = oldEventTypeTable[i];
+        if (eTToldNode)
+        {
+            EventTypeTablePointer *peTTnode = &m_eventTypeTable[eTToldNode->eventType % m_size];
+            EventTypeTablePointer  eTTnode = *peTTnode;
+
+            // Check for collision, we don't want any.
+            if (eTTnode)
+            {
+                GrowEventTypeTable();
+                continue; // Don't increment the counter,
+                          // as we still need to add this element.
+            }
+            else
+            {
+                // Get the old value and put it in the new table.
+                *peTTnode = oldEventTypeTable[i];
+            }
+        }
+
+        i++;
+    }

 
 

-    obj->m_requestMore = m_requestMore;
+    delete[] oldEventTypeTable;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// wxEvtHandler
+// ----------------------------------------------------------------------------
+

 /*
  * Event handler
  */
 /*
  * Event handler
  */


@@ -776,15 +1037,13 @@ wxEvtHandler::wxEvtHandler()
 {
     m_nextHandler = (wxEvtHandler *) NULL;
     m_previousHandler = (wxEvtHandler *) NULL;
 {
     m_nextHandler = (wxEvtHandler *) NULL;
     m_previousHandler = (wxEvtHandler *) NULL;

-    m_enabled = TRUE;
+    m_enabled = true;

     m_dynamicEvents = (wxList *) NULL;
     m_dynamicEvents = (wxList *) NULL;

-    m_isWindow = FALSE;

     m_pendingEvents = (wxList *) NULL;
     m_pendingEvents = (wxList *) NULL;

-#if wxUSE_THREADS
-#  if !defined(__VISAGECPP__)
-    m_eventsLocker = new wxCriticalSection;
-#  endif
-#endif
+
+    // no client data (yet)
+    m_clientData = NULL;
+    m_clientDataType = wxClientData_None;

 }
 
 wxEvtHandler::~wxEvtHandler()
 }
 
 wxEvtHandler::~wxEvtHandler()


@@ -798,29 +1057,68 @@ wxEvtHandler::~wxEvtHandler()
 
     if (m_dynamicEvents)
     {
 
     if (m_dynamicEvents)
     {

-        wxNode *node = m_dynamicEvents->First();
-        while (node)
+        for ( wxList::iterator it = m_dynamicEvents->begin(),
+                               end = m_dynamicEvents->end();
+              it != end;
+              ++it )

         {
         {

-            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
-            if (entry->m_callbackUserData) delete entry->m_callbackUserData;
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
+
+            // Remove ourselves from sink destructor notifications
+            // (this has usually been been done, in wxTrackable destructor)
+            wxEvtHandler *eventSink = entry->m_eventSink;
+            if ( eventSink )
+            {
+                wxEventConnectionRef * const
+                    evtConnRef = FindRefInTrackerList(eventSink);
+                if ( evtConnRef )
+                {
+                    eventSink->RemoveNode(evtConnRef);
+                    delete evtConnRef;
+                }
+            }
+
+            if (entry->m_callbackUserData)
+                delete entry->m_callbackUserData;

             delete entry;
             delete entry;

-            node = node->Next();

         }
         delete m_dynamicEvents;
     };
 
         }
         delete m_dynamicEvents;
     };
 

+    if (m_pendingEvents)
+        m_pendingEvents->DeleteContents(true);

     delete m_pendingEvents;
 
     delete m_pendingEvents;
 

+    // Remove us from wxPendingEvents if necessary.
+    if ( wxPendingEvents )
+    {
+#if wxUSE_THREADS
+        if (wxPendingEventsLocker)
+            wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+#endif
+
+        if ( wxPendingEvents->DeleteObject(this) )
+        {
+            // check that we were present only once in the list
+            wxASSERT_MSG( !wxPendingEvents->Find(this),
+                          "Handler occurs twice in wxPendingEvents list" );
+        }
+        //else: we weren't in this list at all, it's ok
+

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-#  if !defined(__VISAGECPP__)
-    delete m_eventsLocker;
-#  endif
+        if (wxPendingEventsLocker)
+            wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);

 #endif
 #endif

+    }
+
+    // we only delete object data, not untyped
+    if ( m_clientDataType == wxClientData_Object )
+        delete m_clientObject;

 }
 
 #if wxUSE_THREADS
 
 }
 
 #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(),
 {
     // check that we are really in a child thread
     wxASSERT_MSG( !wxThread::IsMain(),


@@ -828,33 +1126,22 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
 
     AddPendingEvent(event);
 
 
     AddPendingEvent(event);
 

-    return TRUE;
+    return true;

 }
 
 #endif // wxUSE_THREADS
 
 }
 
 #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
+    wxCHECK_RET( event, "NULL event can't 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;
 
 
     if ( !m_pendingEvents )
       m_pendingEvents = new wxList;
 

-    wxEvent *event2 = (wxEvent *)event.Clone();
-
-    m_pendingEvents->Append(event2);
-
-#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.
 
     // 2) Add this event handler to list of event handlers that
     //    have pending events.


@@ -863,144 +1150,119 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
 
     if ( !wxPendingEvents )
         wxPendingEvents = new wxList;
 
     if ( !wxPendingEvents )
         wxPendingEvents = new wxList;

-    wxPendingEvents->Append(this);
+    if ( !wxPendingEvents->Find(this) )
+        wxPendingEvents->Append(this);

 
     wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
 
     wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);

-    
-    // 3) Inform the system that new pending events are somwehere,
+
+    // 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 wxPendingEvents 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 somewhere,

     //    and that these should be processed in idle time.
     wxWakeUpIdle();
 }
 
 void wxEvtHandler::ProcessPendingEvents()
 {
     //    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 );

 
 

-    wxNode *node = m_pendingEvents->First();
-    while ( node )
-    {
-        wxEvent *event = (wxEvent *)node->Data();
-        delete node;
+    // 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" );

 
 

-        // 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);
+    wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
+    wxEventPtr event(static_cast<wxEvent *>(node->GetData()));
+
+    // 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 (wxPendingEventsLocker)
+            wxENTER_CRIT_SECT(*wxPendingEventsLocker);

 #endif
 #endif

-        ProcessEvent(*event);
-        delete event;
-#if defined(__VISAGECPP__)
-        wxENTER_CRIT_SECT( m_eventsLocker);
-#else
-        wxENTER_CRIT_SECT( *m_eventsLocker);
+        wxPendingEvents->DeleteObject(this);
+#if wxUSE_THREADS
+        if (wxPendingEventsLocker)
+            wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);

 #endif
 #endif

-
-        node = m_pendingEvents->First();

     }
 
     }
 

-#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
  */
 }
 
 /*
  * Event table stuff
  */

-
-bool wxEvtHandler::ProcessEvent(wxEvent& event)
+/* static */ bool
+wxEvtHandler::ProcessEventIfMatches(const wxEventTableEntryBase& entry,
+                                    wxEvtHandler *handler,
+                                    wxEvent& event)

 {
 {

-#if wxUSE_GUI
-    // check that our flag corresponds to reality
-    wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
-#endif // wxUSE_GUI
-
-    // An event handler can be enabled or disabled
-    if ( GetEvtHandlerEnabled() )
+    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)))

     {
     {

-    
-#if 0
-/*
-        What is this? When using GUI threads, a non main
-        threads can send an event and process it itself.
-        This breaks GTK's GUI threads, so please explain.
-*/
-
-        // Check whether we are in a child thread.
-        if ( !wxThread::IsMain() )
-          return ProcessThreadEvent(event);
-#endif
+        event.Skip(false);
+        event.m_callbackUserData = entry.m_callbackUserData;

 
 

-        // Handle per-instance dynamic event tables first
-        if ( m_dynamicEvents && SearchDynamicEventTable(event) )
-            return TRUE;
-
-        // Then static per-class event tables
-        const wxEventTable *table = GetEventTable();
-
-#if wxUSE_GUI && wxUSE_VALIDATORS
-        // Try the associated validator first, if this is a window.
-        // Problem: if the event handler of the window has been replaced,
-        // this wxEvtHandler may no longer be a window.
-        // Therefore validators won't be processed if the handler
-        // has been replaced with SetEventHandler.
-        // THIS CAN BE CURED if PushEventHandler is used instead of
-        // SetEventHandler, and then processing will be passed down the
-        // chain of event handlers.
-        if (m_isWindow)
+#if wxUSE_EXCEPTIONS
+        if ( wxTheApp )

         {
         {

-            wxWindow *win = (wxWindow *)this;
-
-            // Can only use the validator of the window which
-            // is receiving the event
-            if ( win == event.GetEventObject() )
-            {
-                wxValidator *validator = win->GetValidator();
-                if ( validator && validator->ProcessEvent(event) )
-                {
-                    return TRUE;
-                }
-            }
+            // 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->HandleEvent(handler, (wxEventFunction)entry.m_fn, event);

         }
         }

-#endif
-
-        // Search upwards through the inheritance hierarchy
-        while (table)
+        else
+#endif // wxUSE_EXCEPTIONS

         {
         {

-            if ( SearchEventTable((wxEventTable&)*table, event) )
-                return TRUE;
-            table = table->baseTable;
+            // no need for an extra virtual function call
+            (handler->*((wxEventFunction) (entry.m_fn)))(event);

         }
         }

-    }

 
 

-    // Try going down the event handler chain
-    if ( GetNextHandler() )
-    {
-        if ( GetNextHandler()->ProcessEvent(event) )
-            return TRUE;
+        if (!event.GetSkipped())
+            return true;

     }
 
     }
 

-#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
-    if ( m_isWindow && event.IsCommandEvent() )
+    return false;
+}
+
+bool wxEvtHandler::TryParent(wxEvent& event)
+{
+    if ( GetNextHandler() )

     {
     {

-        wxWindow *win = (wxWindow *)this;
-        wxWindow *parent = win->GetParent();
-        if (parent && !parent->IsBeingDeleted())
-            return parent->GetEventHandler()->ProcessEvent(event);
+        // 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);

     }
     }

-#endif // wxUSE_GUI

 
 

-    // Last try - application object.

     if ( wxTheApp && (this != wxTheApp) )
     {
         // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always
     if ( wxTheApp && (this != wxTheApp) )
     {
         // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always


@@ -1009,148 +1271,290 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
         if ( event.GetEventType() != wxEVT_IDLE )
         {
             if ( wxTheApp->ProcessEvent(event) )
         if ( event.GetEventType() != wxEVT_IDLE )
         {
             if ( wxTheApp->ProcessEvent(event) )

-                return TRUE;
+                return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
+bool wxEvtHandler::ProcessEvent(wxEvent& event)

 {
 {

-    wxEventType eventType = event.GetEventType();
-    int eventId = event.GetId();
+    // allow the application to hook into event processing
+    if ( wxTheApp )
+    {
+        int rc = wxTheApp->FilterEvent(event);
+        if ( rc != -1 )
+        {
+            wxASSERT_MSG( rc == 1 || rc == 0,
+                          _T("unexpected wxApp::FilterEvent return value") );

 
 

-    // BC++ doesn't like testing for m_fn without != 0
-    for ( int i = 0; table.entries[i].m_fn != 0; i++ )
+            return rc != 0;
+        }
+        //else: proceed normally
+    }
+
+    if ( ProcessEventHere(event) )
+        return true;
+
+    // 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)
+{
+    // An event handler can be enabled or disabled
+    if ( GetEvtHandlerEnabled() )

     {
     {

-        // 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
+        // if we have a validator, it has higher priority than our own event
+        // table
+        if ( TryValidator(event) )
+            return true;

 
 

-        // 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;
+        // Handle per-instance dynamic event tables first
+        if ( m_dynamicEvents && SearchDynamicEventTable(event) )
+            return true;

 
 

-            if ( (tableId1 == -1) ||
-                 (tableId2 == -1 && eventId == tableId1) ||
-                 (tableId2 != -1 &&
-                    (eventId >= tableId1 && eventId <= tableId2)) )
-            {
-                event.Skip(FALSE);
-                event.m_callbackUserData = entry.m_callbackUserData;
+        // Then static per-class event tables
+        if ( GetEventHashTable().HandleEvent(event, this) )
+            return true;
+    }
+
+    // Try going down the event handler chain
+    if ( GetNextHandler() && GetNextHandler()->ProcessEventHere(event) )
+        return true;

 
 

-                (this->*((wxEventFunction) (entry.m_fn)))(event);
+    // We don't have a handler for this event.
+    return false;
+}

 
 

-                return !event.GetSkipped();
+bool wxEvtHandler::SafelyProcessEvent(wxEvent& event)
+{
+#if wxUSE_EXCEPTIONS
+    try
+    {
+#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
+
+            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)
+{
+    const wxEventType eventType = event.GetEventType();
+    for ( int i = 0; table.entries[i].m_fn != 0; i++ )
+    {
+        const wxEventTableEntry& entry = table.entries[i];
+        if ( eventType == entry.m_eventType )
+        {
+            if ( ProcessEventIfMatches(entry, this, event) )
+                return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 void wxEvtHandler::Connect( int id, int lastId,
 }
 
 void wxEvtHandler::Connect( int id, int lastId,

-                            int eventType,
+                            wxEventType eventType,

                             wxObjectEventFunction func,
                             wxObjectEventFunction func,

-                            wxObject *userData )
+                            wxObject *userData,
+                            wxEvtHandler* eventSink )

 {
 {

-    wxDynamicEventTableEntry *entry = new wxDynamicEventTableEntry;
-    entry->m_id = id;
-    entry->m_lastId = lastId;
-    entry->m_eventType = eventType;
-    entry->m_fn = func;
-    entry->m_callbackUserData = userData;
+    wxDynamicEventTableEntry *entry =
+        new wxDynamicEventTableEntry(eventType, id, lastId, func, userData, eventSink);

 
     if (!m_dynamicEvents)
         m_dynamicEvents = new wxList;
 
 
     if (!m_dynamicEvents)
         m_dynamicEvents = new wxList;
 

-    m_dynamicEvents->Append( (wxObject*) entry );
+    // 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
+    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,
 }
 
 bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
                   wxObjectEventFunction func,

-                  wxObject *userData )
+                  wxObject *userData,
+                  wxEvtHandler* eventSink )

 {
     if (!m_dynamicEvents)
 {
     if (!m_dynamicEvents)

-        return FALSE;
+        return false;

 
 

-    wxNode *node = m_dynamicEvents->First();
+    // Remove connection from tracker node (wxEventConnectionRef)
+    if ( eventSink && eventSink != this )
+    {
+        wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
+        if ( evtConnRef )
+            evtConnRef->DecRef();
+    }
+
+    wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();

     while (node)
     {
     while (node)
     {

-        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
+

         if ((entry->m_id == id) &&
         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_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_callbackUserData == userData) || (userData == (wxObject*)NULL)))
         {

-            if (entry->m_callbackUserData) delete entry->m_callbackUserData;
-            m_dynamicEvents->DeleteNode( node );
+            if (entry->m_callbackUserData)
+                delete entry->m_callbackUserData;
+            m_dynamicEvents->Erase( node );

             delete entry;
             delete entry;

-            return TRUE;
+            return true;

         }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     }

-    return FALSE;
+    return false;

 }
 
 bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
 {
 }
 
 bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
 {

-    wxCHECK_MSG( m_dynamicEvents, FALSE,
+    wxCHECK_MSG( m_dynamicEvents, false,

                  wxT("caller should check that we have dynamic events") );
 
                  wxT("caller should check that we have dynamic events") );
 

-    int commandId = event.GetId();
-
-    wxNode *node = m_dynamicEvents->First();
+    wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();

     while (node)
     {
     while (node)
     {

-        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
+
+        // get next node before (maybe) calling the event handler as it could
+        // call Disconnect() invalidating the current node
+        node = node->GetNext();

 
 

-        if (entry->m_fn)
+        if ((event.GetEventType() == entry->m_eventType) && (entry->m_fn != 0))

         {
         {

-            // 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;
+            wxEvtHandler *handler = entry->m_eventSink ? entry->m_eventSink
+                                                       : this;
+            if ( ProcessEventIfMatches(*entry, handler, event) )
+                return true;
+        }
+    }

 
 

-                (this->*((wxEventFunction) (entry->m_fn)))(event);
+    return false;
+}

 
 

-                if (event.GetSkipped())
-                    return FALSE;
-                else
-                    return TRUE;
-            }
+void wxEvtHandler::DoSetClientObject( wxClientData *data )
+{
+    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
+                  wxT("can't have both object and void client data") );
+
+    if ( m_clientObject )
+        delete m_clientObject;
+
+    m_clientObject = data;
+    m_clientDataType = wxClientData_Object;
+}
+
+wxClientData *wxEvtHandler::DoGetClientObject() const
+{
+    // it's not an error to call GetClientObject() on a window which doesn't
+    // have client data at all - NULL will be returned
+    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
+                  wxT("this window doesn't have object client data") );
+
+    return m_clientObject;
+}
+
+void wxEvtHandler::DoSetClientData( void *data )
+{
+    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
+                  wxT("can't have both object and void client data") );
+
+    m_clientData = data;
+    m_clientDataType = wxClientData_Void;
+}
+
+void *wxEvtHandler::DoGetClientData() const
+{
+    // it's not an error to call GetClientData() on a window which doesn't have
+    // client data at all - NULL will be returned
+    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
+                  wxT("this window doesn't have void client 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;

         }
         }

-        node = node->Next();

     }
     }

-    return FALSE;
-};

 
 

-#if WXWIN_COMPATIBILITY
-bool wxEvtHandler::OnClose()
+    return NULL;
+}
+
+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_eventSink==sink )
+        {
+            if (entry->m_callbackUserData)
+                delete entry->m_callbackUserData;
+            m_dynamicEvents->Erase( node );
+            delete entry;
+        }
+        node = node_nxt;
+    }

 }
 }

-#endif // WXWIN_COMPATIBILITY
+
+#endif // wxUSE_BASE

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 


@@ -1177,4 +1581,38 @@ wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
     return focusWin;
 }
 
     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
 #endif // wxUSE_GUI