Unused parameter warning fix.

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 043fa5caabde72bbdd3727475904d904e68b5fa6..8492fd3ec03f83479aea1d382a7da10b3fe4b91d 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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,7 +17,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.

     #pragma implementation "event.h"
 #endif
 
     #pragma implementation "event.h"
 #endif
 


@@ -41,20 +48,26 @@
 #endif
 
 #include "wx/event.h"
 #endif
 
 #include "wx/event.h"

+#include "wx/module.h"

 
 #if wxUSE_GUI
     #include "wx/validate.h"
 
 #if wxUSE_GUI
     #include "wx/validate.h"

+#if wxUSE_STOPWATCH
+    #include "wx/stopwatch.h"
+#endif

 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // 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)
+#endif // wxUSE_BASE

 
 #if wxUSE_GUI
 
 #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(wxCommandEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)


@@ -67,6 +80,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, 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)


@@ -76,26 +90,54 @@ 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(wxContextMenuEvent, 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)

 #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[] =
     { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
 
 const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
     { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
 

+    
+#ifdef __WXDEBUG__
+// Clear up event hash table contents or we can get problems
+// when C++ is cleaning up the static object
+class wxEventTableEntryModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule)
+public:
+    wxEventTableEntryModule() {}
+    bool OnInit() { return true; }
+    void OnExit()
+    {
+        wxEventHashTable::ClearAll();
+    }
+};
+IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule)
+#endif
+    

 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------


@@ -113,7 +155,21 @@ wxList *wxPendingEvents = (wxList *)NULL;
 // common event types are defined here, other event types are defined by the
 // components which use them
 
 // 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_NULL)

+DEFINE_EVENT_TYPE(wxEVT_IDLE)
+DEFINE_EVENT_TYPE(wxEVT_SOCKET)
+
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+#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_BUTTON_CLICKED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED)


@@ -132,7 +188,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED)
 
 // Sockets and timers send events, too
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED)
 
 // Sockets and timers send events, too

-DEFINE_EVENT_TYPE(wxEVT_SOCKET)

 DEFINE_EVENT_TYPE(wxEVT_TIMER)
 
 // Mouse event types
 DEFINE_EVENT_TYPE(wxEVT_TIMER)
 
 // Mouse event types


@@ -150,6 +205,7 @@ 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_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_MOUSEWHEEL)
 
 // Non-client mouse events


@@ -172,6 +228,9 @@ DEFINE_EVENT_TYPE(wxEVT_CHAR_HOOK)
 DEFINE_EVENT_TYPE(wxEVT_NAVIGATION_KEY)
 DEFINE_EVENT_TYPE(wxEVT_KEY_DOWN)
 DEFINE_EVENT_TYPE(wxEVT_KEY_UP)
 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

 
 // Set cursor event
 DEFINE_EVENT_TYPE(wxEVT_SET_CURSOR)
 
 // Set cursor event
 DEFINE_EVENT_TYPE(wxEVT_SET_CURSOR)


@@ -185,6 +244,7 @@ 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_PAGEDOWN)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
 DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)

+DEFINE_EVENT_TYPE(wxEVT_SCROLL_ENDSCROLL)

 
 // Scroll events from wxWindow
 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
 
 // Scroll events from wxWindow
 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)


@@ -198,7 +258,9 @@ DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE)
 
 // System events
 DEFINE_EVENT_TYPE(wxEVT_SIZE)
 
 // System events
 DEFINE_EVENT_TYPE(wxEVT_SIZE)

+DEFINE_EVENT_TYPE(wxEVT_SIZING)

 DEFINE_EVENT_TYPE(wxEVT_MOVE)
 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_CLOSE_WINDOW)
 DEFINE_EVENT_TYPE(wxEVT_END_SESSION)
 DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION)


@@ -215,12 +277,12 @@ 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_ERASE_BACKGROUND)
 DEFINE_EVENT_TYPE(wxEVT_NC_PAINT)
 DEFINE_EVENT_TYPE(wxEVT_PAINT_ICON)

-DEFINE_EVENT_TYPE(wxEVT_MENU_CHAR)
-DEFINE_EVENT_TYPE(wxEVT_MENU_INIT)
+DEFINE_EVENT_TYPE(wxEVT_MENU_OPEN)
+DEFINE_EVENT_TYPE(wxEVT_MENU_CLOSE)

 DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT)
 DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT)

-DEFINE_EVENT_TYPE(wxEVT_POPUP_MENU_INIT)

 DEFINE_EVENT_TYPE(wxEVT_CONTEXT_MENU)
 DEFINE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_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_SETTING_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE)
 DEFINE_EVENT_TYPE(wxEVT_PALETTE_CHANGED)


@@ -233,7 +295,6 @@ 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_MEASURE_ITEM)
 DEFINE_EVENT_TYPE(wxEVT_COMPARE_ITEM)
 DEFINE_EVENT_TYPE(wxEVT_INIT_DIALOG)

-DEFINE_EVENT_TYPE(wxEVT_IDLE)

 DEFINE_EVENT_TYPE(wxEVT_UPDATE_UI)
 
 // Generic command events
 DEFINE_EVENT_TYPE(wxEVT_UPDATE_UI)
 
 // Generic command events


@@ -252,6 +313,10 @@ DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP)
 
 #endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
 
 
 #endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
 

+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+

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


@@ -265,16 +330,6 @@ int wxNewEventType()
     // MT-FIXME
     static int s_lastUsedEventType = wxEVT_FIRST;
 
     // 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++;
 }
 
     return s_lastUsedEventType++;
 }
 


@@ -283,7 +338,7 @@ int wxNewEventType()
 // ----------------------------------------------------------------------------
 
 /*
 // ----------------------------------------------------------------------------
 
 /*

- * 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.).
  *


@@ -291,31 +346,33 @@ int wxNewEventType()
  *
  */
 
  *
  */
 

-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()
+    , 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;

 }
 
 }
 

+#endif // wxUSE_BASE
+

 #if wxUSE_GUI
 
 /*
 #if wxUSE_GUI
 
 /*


@@ -324,41 +381,94 @@ void wxEvent::CopyObject(wxObject& object_dest) const
  */
 
 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;
+
+    // the command events are propagated upwards by default
+    m_propagationLevel = wxEVENT_PROPAGATE_MAX;

 }
 
 }
 

-void wxCommandEvent::CopyObject(wxObject& obj_d) const
+/*
+ * UI update events
+ */
+
+#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)

 {
 {

-    wxCommandEvent *obj = (wxCommandEvent *)&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
+}

 
 

-    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;
+// 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

 }
 
 /*
 }
 
 /*

- * Notify events
+ * Idle events

  */
 
  */
 

-void wxNotifyEvent::CopyObject(wxObject& obj_d) const
-{
-    wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d;
+wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL;

 
 

-    wxEvent::CopyObject(obj_d);
-
-    if (!m_bAllow) obj->Veto();
+// 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;

 }
 
 /*
 }
 
 /*


@@ -369,7 +479,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;


@@ -388,16 +498,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
  *


@@ -406,13 +506,13 @@ 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_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_wheelRotation = 0;
     m_x = 0;
     m_y = 0;
     m_wheelRotation = 0;


@@ -420,123 +520,141 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
     m_linesPerAction = 0;
 }
 
     m_linesPerAction = 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;
+    m_eventType = event.m_eventType;
+
+    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_wheelRotation = event.m_wheelRotation;
+    m_wheelDelta = event.m_wheelDelta;
+    m_linesPerAction = event.m_linesPerAction;

 }
 
 }
 

-// 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:
+        default:
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick"));
+            // fall through
+
+        case wxMOUSE_BTN_ANY:

             return (LeftDClick() || MiddleDClick() || RightDClick());
             return (LeftDClick() || MiddleDClick() || RightDClick());

-        case 1:
+
+        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;

 }
 
 }
 

-// 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:
+        default:
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown"));
+            // fall through
+
+        case wxMOUSE_BTN_ANY:

             return (LeftDown() || MiddleDown() || RightDown());
             return (LeftDown() || MiddleDown() || RightDown());

-        case 1:
+
+        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;

 }
 
 }
 

-// 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)
     {
 bool wxMouseEvent::ButtonUp(int but) const
 {
     switch (but)
     {

-        case -1:
+        default:
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp"));
+            // fall through
+
+        case wxMOUSE_BTN_ANY:

             return (LeftUp() || MiddleUp() || RightUp());
             return (LeftUp() || MiddleUp() || RightUp());

-        case 1:
+
+        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;

 }
 
 }
 

-// 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)
     {
 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"));
         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();
+    }

 }
 
 bool wxMouseEvent::ButtonIsDown(int but) const
 {
     switch (but)
     {
 }
 
 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();
+
+        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"));

     }
     }

-
-    return FALSE;

 }
 
 int wxMouseEvent::GetButton() const
 }
 
 int wxMouseEvent::GetButton() const


@@ -549,7 +667,7 @@ int wxMouseEvent::GetButton() const
         }
     }
 
         }
     }
 

-    return -1;
+    return wxMOUSE_BTN_NONE;

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


@@ -561,177 +679,282 @@ 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_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)

 {
 {

-    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;

 
 

+    m_keyCode = evt.m_keyCode;

 
 

-/*
- * Misc events
- */
+    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;

 
 

-void wxSizeEvent::CopyObject(wxObject& obj_d) const
-{
-    wxSizeEvent *obj = (wxSizeEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_size = m_size;
+#if wxUSE_UNICODE
+    m_uniChar = evt.m_uniChar;
+#endif

 }
 
 }
 

-void wxMoveEvent::CopyObject(wxObject& obj_d) const
+long wxKeyEvent::KeyCode() const

 {
 {

-    wxMoveEvent *obj = (wxMoveEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_pos = m_pos;
+    return m_keyCode;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-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
-{
-    wxShowEvent *obj = (wxShowEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
+#if wxUSE_BASE

 
 

-    obj->m_show = m_show;
+// ----------------------------------------------------------------------------
+// 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)
+{
+    AllocEventTypeTable(EVENT_TYPE_TABLE_INIT_SIZE);
+    
+    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);
+    size_t i;
+    for(i = 0; i < m_size; i++)
+    {
+        EventTypeTablePointer  eTTnode = m_eventTypeTable[i];
+        if (eTTnode)
+        {
+            delete eTTnode;
+        }
+    }

 
 

-    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.
+    // Necessary in order to not invoke the
+    // overloaded delete operator when statics are cleaned up
+    if (m_eventTypeTable)
+        delete[] m_eventTypeTable;
+
+    m_eventTypeTable = NULL;
+    m_size = 0;

 }
 
 }
 

-void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const
+// 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
+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;

 
 

-    obj->m_requestMore = m_requestMore;
+            // 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++;
+    }
+
+    delete[] oldEventTypeTable;

 }
 
 }
 

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

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


@@ -740,15 +963,17 @@ 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;
 #if wxUSE_THREADS
 #  if !defined(__VISAGECPP__)
     m_eventsLocker = new wxCriticalSection;
 #  endif
 #endif
     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()


@@ -762,19 +987,19 @@ wxEvtHandler::~wxEvtHandler()
 
     if (m_dynamicEvents)
     {
 
     if (m_dynamicEvents)
     {

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

         {
 #if WXWIN_COMPATIBILITY_EVENT_TYPES
         {
 #if WXWIN_COMPATIBILITY_EVENT_TYPES

-            wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+            wxEventTableEntry *entry = (wxEventTableEntry*)*it;

 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES

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

 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
             if (entry->m_callbackUserData)
                 delete entry->m_callbackUserData;
             delete entry;
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
             if (entry->m_callbackUserData)
                 delete entry->m_callbackUserData;
             delete entry;

-            node = node->Next();

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


@@ -785,7 +1010,20 @@ wxEvtHandler::~wxEvtHandler()
 #  if !defined(__VISAGECPP__)
     delete m_eventsLocker;
 #  endif
 #  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);

 #endif
 #endif

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

 }
 
 #if wxUSE_THREADS
 }
 
 #if wxUSE_THREADS


@@ -798,15 +1036,30 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
 
     AddPendingEvent(event);
 
 
     AddPendingEvent(event);
 

-    return TRUE;
+    return true;

 }
 
 }
 

+void wxEvtHandler::ClearEventLocker()
+{
+#if !defined(__VISAGECPP__)
+    delete m_eventsLocker;
+    m_eventsLocker = NULL;
+#endif
+};
+

 #endif // wxUSE_THREADS
 
 void wxEvtHandler::AddPendingEvent(wxEvent& event)
 {
     // 1) Add event to list of pending events of this event handler
 
 #endif // wxUSE_THREADS
 
 void wxEvtHandler::AddPendingEvent(wxEvent& event)
 {
     // 1) Add event to list of pending events of this event handler
 

+    wxEvent *eventCopy = event.Clone();
+
+    // 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
 #if defined(__VISAGECPP__)
     wxENTER_CRIT_SECT( m_eventsLocker);
 #else


@@ -816,9 +1069,7 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
     if ( !m_pendingEvents )
       m_pendingEvents = new wxList;
 
     if ( !m_pendingEvents )
       m_pendingEvents = new wxList;
 

-    wxEvent *event2 = (wxEvent *)event.Clone();
-
-    m_pendingEvents->Append(event2);
+    m_pendingEvents->Append(eventCopy);

 
 #if defined(__VISAGECPP__)
     wxLEAVE_CRIT_SECT( m_eventsLocker);
 
 #if defined(__VISAGECPP__)
     wxLEAVE_CRIT_SECT( m_eventsLocker);


@@ -844,17 +1095,22 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
 
 void wxEvtHandler::ProcessPendingEvents()
 {
 
 void wxEvtHandler::ProcessPendingEvents()
 {

+    // this method is only called by wxApp if this handler does have pending
+    // events
+    wxCHECK_RET( m_pendingEvents,
+                 wxT("Please call wxApp::ProcessPendingEvents() instead") );
+

 #if defined(__VISAGECPP__)
     wxENTER_CRIT_SECT( m_eventsLocker);
 #else
     wxENTER_CRIT_SECT( *m_eventsLocker);
 #endif
 
 #if defined(__VISAGECPP__)
     wxENTER_CRIT_SECT( m_eventsLocker);
 #else
     wxENTER_CRIT_SECT( *m_eventsLocker);
 #endif
 

-    wxNode *node = m_pendingEvents->First();
+    wxList::compatibility_iterator node = m_pendingEvents->GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxEvent *event = (wxEvent *)node->Data();
-        delete node;
+        wxEvent *event = (wxEvent *)node->GetData();
+        m_pendingEvents->Erase(node);

 
         // In ProcessEvent, new events might get added and
         // we can safely leave the crtical section here.
 
         // In ProcessEvent, new events might get added and
         // we can safely leave the crtical section here.


@@ -871,7 +1127,7 @@ void wxEvtHandler::ProcessPendingEvents()
         wxENTER_CRIT_SECT( *m_eventsLocker);
 #endif
 
         wxENTER_CRIT_SECT( *m_eventsLocker);
 #endif
 

-        node = m_pendingEvents->First();
+        node = m_pendingEvents->GetFirst();

     }
 
 #if defined(__VISAGECPP__)
     }
 
 #if defined(__VISAGECPP__)


@@ -884,123 +1140,50 @@ void wxEvtHandler::ProcessPendingEvents()
 /*
  * 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
-
-    // We have to use the actual window or processing events from wxWindowNative
-    // destructor won't work (we don't see the wxWindow class)
-#ifdef __WXDEBUG__
-    // check that our flag corresponds to reality
-    wxClassInfo* info = NULL;
-#ifdef __WXUNIVERSAL__
-#  if defined(__WXMSW__)
-    info = CLASSINFO(wxWindowMSW);
-#  elif defined(__WXGTK__)
-    info = CLASSINFO(wxWindowGTK);
-#  elif defined(__WXMGL__)
-    info = CLASSINFO(wxWindowMGL);
-#  elif defined(__WXMAC__)
-    info = CLASSINFO(wxWindowMac);
-#  elif defined(__WXMOTIF__)
-    info = CLASSINFO(wxWindowMotif);
-#  endif
-#else
-    info = CLASSINFO(wxWindow);
-#endif
-
-    wxASSERT_MSG( m_isWindow == IsKindOf(info),
-                  _T("this should [not] be a window but it is [not]") );
-#endif
-
-#endif // wxUSE_GUI
-
-    // An event handler can be enabled or disabled
-    if ( GetEvtHandlerEnabled() )
+    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 == -1) ||
+        (tableId2 == -1 && tableId1 == event.GetId()) ||
+        (tableId2 != -1 &&
+         (event.GetId() >= tableId1 && event.GetId() <= tableId2)))

     {
     {

+        event.Skip(false);
+        event.m_callbackUserData = entry.m_callbackUserData;

 
 

-#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
-
-        // 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() )
-    {
-        wxWindow *win = (wxWindow *)this;
-
-        // also, don't propagate events beyond the first top level window: it
-        // doesn't make sense to process dialogs events in the parent frame
-        if ( !win->IsTopLevel() )
-        {
-            wxWindow *parent = win->GetParent();
-            if (parent && !parent->IsBeingDeleted())
-                return parent->GetEventHandler()->ProcessEvent(event);
-        }
-    }
-#endif // wxUSE_GUI
+    return false;
+}

 
 

-    // Last try - application object.
+bool wxEvtHandler::TryParent(wxEvent& event)
+{

     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,61 +1192,80 @@ 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
+    }
+
+    // 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;
+    }

 
 

-                (this->*((wxEventFunction) (entry.m_fn)))(event);
+    // Try going down the event handler chain
+    if ( GetNextHandler() )
+    {
+        if ( GetNextHandler()->ProcessEvent(event) )
+            return true;
+    }

 
 

-                return !event.GetSkipped();
-            }
+    // Finally propagate the event upwards the window chain and/or to the
+    // application object as necessary
+    return TryParent(event);
+}
+
+
+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,
                             int eventType,
                             wxObjectEventFunction func,
 }
 
 void wxEvtHandler::Connect( int id, int lastId,
                             int eventType,
                             wxObjectEventFunction func,

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

 {
 #if WXWIN_COMPATIBILITY_EVENT_TYPES
     wxEventTableEntry *entry = new wxEventTableEntry;
 {
 #if WXWIN_COMPATIBILITY_EVENT_TYPES
     wxEventTableEntry *entry = new wxEventTableEntry;


@@ -1074,98 +1276,128 @@ void wxEvtHandler::Connect( int id, int lastId,
     entry->m_callbackUserData = userData;
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
     wxDynamicEventTableEntry *entry =
     entry->m_callbackUserData = userData;
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
     wxDynamicEventTableEntry *entry =

-        new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
+        new wxDynamicEventTableEntry(eventType, id, lastId, func, userData, eventSink);

 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
     if (!m_dynamicEvents)
         m_dynamicEvents = new wxList;
 
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
     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 );

 }
 
 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();
+    wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();

     while (node)
     {
 #if WXWIN_COMPATIBILITY_EVENT_TYPES
     while (node)
     {
 #if WXWIN_COMPATIBILITY_EVENT_TYPES

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

 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES

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

 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
         if ((entry->m_id == id) &&
             ((entry->m_lastId == lastId) || (lastId == -1)) &&
             ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
             ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
         if ((entry->m_id == id) &&
             ((entry->m_lastId == lastId) || (lastId == -1)) &&
             ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
             ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&

+            ((entry->m_eventSink == eventSink) || (eventSink == (wxEvtHandler*)NULL)) &&

             ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
         {
             if (entry->m_callbackUserData)
                 delete entry->m_callbackUserData;
             ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
         {
             if (entry->m_callbackUserData)
                 delete entry->m_callbackUserData;

-            m_dynamicEvents->DeleteNode( node );
+            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)
     {
 #if WXWIN_COMPATIBILITY_EVENT_TYPES
     while (node)
     {
 #if WXWIN_COMPATIBILITY_EVENT_TYPES

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

 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES

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

 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 
 #endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
 

-        if (entry->m_fn)
+        if ((event.m_eventType == 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;
-
-                (this->*((wxEventFunction) (entry->m_fn)))(event);
+            wxEvtHandler *handler =
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+                                    entry->m_eventSink ? entry->m_eventSink
+                                                       :
+#endif
+                                                         this;

 
 

-                if (event.GetSkipped())
-                    return FALSE;
-                else
-                    return TRUE;
+            if ( ProcessEventIfMatches(*entry, handler, event) )
+            {
+                return true;

             }
         }
             }
         }

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

     }
     }

-    return FALSE;
+
+    return false;

 };
 
 };
 

-#if WXWIN_COMPATIBILITY
-bool wxEvtHandler::OnClose()
+void wxEvtHandler::DoSetClientObject( wxClientData *data )

 {
 {

-    if (GetNextHandler())
-        return GetNextHandler()->OnClose();
-    else
-        return FALSE;
+    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;

 }
 }

-#endif // WXWIN_COMPATIBILITY
+
+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;
+}
+
+#endif // wxUSE_BASE

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI