Various compile fixes.

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 89a55d9a7eda7626bdd94b5ae49311c8d3a936a7..97d84b676c5b03343d317aba96c4fe742330ecb3 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -46,22 +46,15 @@
     #include "wx/validate.h"
 #endif // wxUSE_GUI
 
     #include "wx/validate.h"
 #endif // wxUSE_GUI
 

-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-wxEventType wxEVT_NULL = 0;
-wxEventType wxEVT_FIRST = 10000;
-

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)

-IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)

 
 #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)


@@ -70,9 +63,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)


@@ -82,7 +77,9 @@ 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(wxNavigationKeyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)


@@ -90,6 +87,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)

+    IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)

 #endif // wxUSE_GUI
 
 const wxEventTable *wxEvtHandler::GetEventTable() const
 #endif // wxUSE_GUI
 
 const wxEventTable *wxEvtHandler::GetEventTable() const


@@ -99,7 +97,7 @@ const wxEventTable wxEvtHandler::sm_eventTable =
     { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
 
 const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
     { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
 
 const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =

-    { wxEventTableEntry(0, 0, 0, (wxObjectEventFunction)NULL, NULL) };
+    { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };

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


@@ -113,213 +111,151 @@ wxList *wxPendingEvents = (wxList *)NULL;
     wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL;
 #endif
 
     wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL;
 #endif
 

-wxEventType wxEVT_COMMAND_BUTTON_CLICKED;
-wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED;
-wxEventType wxEVT_COMMAND_CHOICE_SELECTED;
-wxEventType wxEVT_COMMAND_LISTBOX_SELECTED;
-wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
-wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED;
-wxEventType wxEVT_COMMAND_TEXT_UPDATED;
-wxEventType wxEVT_COMMAND_TEXT_ENTER;
-wxEventType wxEVT_COMMAND_MENU_SELECTED;
-wxEventType wxEVT_COMMAND_TOOL_CLICKED;
-wxEventType wxEVT_COMMAND_SLIDER_UPDATED;
-wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED;
-wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED;
-wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED;
-wxEventType wxEVT_COMMAND_VLBOX_SELECTED;
-wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED;
-wxEventType wxEVT_COMMAND_TOOL_RCLICKED;
-wxEventType wxEVT_COMMAND_TOOL_ENTER;
-wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED;
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+// common event types are defined here, other event types are defined by the
+// components which use them
+
+DEFINE_EVENT_TYPE(wxEVT_NULL)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MENU_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBUTTON_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SCROLLBAR_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_VLBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED)

 
 // Sockets and timers send events, too
 
 // Sockets and timers send events, too

-wxEventType wxEVT_SOCKET;
-wxEventType wxEVT_TIMER;
+DEFINE_EVENT_TYPE(wxEVT_SOCKET)
+DEFINE_EVENT_TYPE(wxEVT_TIMER)

 
 // Mouse event types
 
 // Mouse event types

-wxEventType wxEVT_LEFT_DOWN;
-wxEventType wxEVT_LEFT_UP;
-wxEventType wxEVT_MIDDLE_DOWN;
-wxEventType wxEVT_MIDDLE_UP;
-wxEventType wxEVT_RIGHT_DOWN;
-wxEventType wxEVT_RIGHT_UP;
-wxEventType wxEVT_MOTION;
-wxEventType wxEVT_ENTER_WINDOW;
-wxEventType wxEVT_LEAVE_WINDOW;
-wxEventType wxEVT_LEFT_DCLICK;
-wxEventType wxEVT_MIDDLE_DCLICK;
-wxEventType wxEVT_RIGHT_DCLICK;
-wxEventType wxEVT_SET_FOCUS;
-wxEventType wxEVT_KILL_FOCUS;
+DEFINE_EVENT_TYPE(wxEVT_LEFT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_LEFT_UP)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_UP)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_UP)
+DEFINE_EVENT_TYPE(wxEVT_MOTION)
+DEFINE_EVENT_TYPE(wxEVT_ENTER_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_LEAVE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_SET_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_KILL_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_CHILD_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_MOUSEWHEEL)

 
 // Non-client mouse events
 
 // Non-client mouse events

-wxEventType wxEVT_NC_LEFT_DOWN;
-wxEventType wxEVT_NC_LEFT_UP;
-wxEventType wxEVT_NC_MIDDLE_DOWN;
-wxEventType wxEVT_NC_MIDDLE_UP;
-wxEventType wxEVT_NC_RIGHT_DOWN;
-wxEventType wxEVT_NC_RIGHT_UP;
-wxEventType wxEVT_NC_MOTION;
-wxEventType wxEVT_NC_ENTER_WINDOW;
-wxEventType wxEVT_NC_LEAVE_WINDOW;
-wxEventType wxEVT_NC_LEFT_DCLICK;
-wxEventType wxEVT_NC_MIDDLE_DCLICK;
-wxEventType wxEVT_NC_RIGHT_DCLICK;
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_MOTION)
+DEFINE_EVENT_TYPE(wxEVT_NC_ENTER_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEAVE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DCLICK)

 
 // Character input event type
 
 // Character input event type

-wxEventType wxEVT_CHAR;
-wxEventType wxEVT_CHAR_HOOK;
-wxEventType wxEVT_NAVIGATION_KEY;
-wxEventType wxEVT_KEY_DOWN;
-wxEventType wxEVT_KEY_UP;
+DEFINE_EVENT_TYPE(wxEVT_CHAR)
+DEFINE_EVENT_TYPE(wxEVT_CHAR_HOOK)
+DEFINE_EVENT_TYPE(wxEVT_NAVIGATION_KEY)
+DEFINE_EVENT_TYPE(wxEVT_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_KEY_UP)

 
 // Set cursor event
 
 // Set cursor event

-wxEventType wxEVT_SET_CURSOR;
+DEFINE_EVENT_TYPE(wxEVT_SET_CURSOR)

 
 // wxScrollbar and wxSlider event identifiers
 
 // wxScrollbar and wxSlider event identifiers

-wxEventType wxEVT_SCROLL_TOP;
-wxEventType wxEVT_SCROLL_BOTTOM;
-wxEventType wxEVT_SCROLL_LINEUP;
-wxEventType wxEVT_SCROLL_LINEDOWN;
-wxEventType wxEVT_SCROLL_PAGEUP;
-wxEventType wxEVT_SCROLL_PAGEDOWN;
-wxEventType wxEVT_SCROLL_THUMBTRACK;
-wxEventType wxEVT_SCROLL_THUMBRELEASE;
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_TOP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_BOTTOM)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)

 
 // Scroll events from wxWindow
 
 // Scroll events from wxWindow

-wxEventType wxEVT_SCROLLWIN_TOP;
-wxEventType wxEVT_SCROLLWIN_BOTTOM;
-wxEventType wxEVT_SCROLLWIN_LINEUP;
-wxEventType wxEVT_SCROLLWIN_LINEDOWN;
-wxEventType wxEVT_SCROLLWIN_PAGEUP;
-wxEventType wxEVT_SCROLLWIN_PAGEDOWN;
-wxEventType wxEVT_SCROLLWIN_THUMBTRACK;
-wxEventType wxEVT_SCROLLWIN_THUMBRELEASE;
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBTRACK)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE)

 
 // System events
 
 // System events

-wxEventType wxEVT_SIZE;
-wxEventType wxEVT_MOVE;
-wxEventType wxEVT_CLOSE_WINDOW;
-wxEventType wxEVT_END_SESSION;
-wxEventType wxEVT_QUERY_END_SESSION;
-wxEventType wxEVT_ACTIVATE_APP;
-wxEventType wxEVT_POWER;
-wxEventType wxEVT_ACTIVATE;
-wxEventType wxEVT_CREATE;
-wxEventType wxEVT_DESTROY;
-wxEventType wxEVT_SHOW;
-wxEventType wxEVT_ICONIZE;
-wxEventType wxEVT_MAXIMIZE;
-wxEventType wxEVT_MOUSE_CAPTURE_CHANGED;
-wxEventType wxEVT_PAINT;
-wxEventType wxEVT_ERASE_BACKGROUND;
-wxEventType wxEVT_NC_PAINT;
-wxEventType wxEVT_PAINT_ICON;
-wxEventType wxEVT_MENU_CHAR;
-wxEventType wxEVT_MENU_INIT;
-wxEventType wxEVT_MENU_HIGHLIGHT;
-wxEventType wxEVT_POPUP_MENU_INIT;
-wxEventType wxEVT_CONTEXT_MENU;
-wxEventType wxEVT_SYS_COLOUR_CHANGED;
-wxEventType wxEVT_SETTING_CHANGED;
-wxEventType wxEVT_QUERY_NEW_PALETTE;
-wxEventType wxEVT_PALETTE_CHANGED;
-wxEventType wxEVT_JOY_BUTTON_DOWN;
-wxEventType wxEVT_JOY_BUTTON_UP;
-wxEventType wxEVT_JOY_MOVE;
-wxEventType wxEVT_JOY_ZMOVE;
-wxEventType wxEVT_DROP_FILES;
-wxEventType wxEVT_DRAW_ITEM;
-wxEventType wxEVT_MEASURE_ITEM;
-wxEventType wxEVT_COMPARE_ITEM;
-wxEventType wxEVT_INIT_DIALOG;
-wxEventType wxEVT_IDLE;
-wxEventType wxEVT_UPDATE_UI;
-
-// System misc.
-wxEventType wxEVT_END_PROCESS;
-
-// Dial up events
-wxEventType wxEVT_DIALUP_CONNECTED;
-wxEventType wxEVT_DIALUP_DISCONNECTED;
+DEFINE_EVENT_TYPE(wxEVT_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_CLOSE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE_APP)
+DEFINE_EVENT_TYPE(wxEVT_POWER)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE)
+DEFINE_EVENT_TYPE(wxEVT_CREATE)
+DEFINE_EVENT_TYPE(wxEVT_DESTROY)
+DEFINE_EVENT_TYPE(wxEVT_SHOW)
+DEFINE_EVENT_TYPE(wxEVT_ICONIZE)
+DEFINE_EVENT_TYPE(wxEVT_MAXIMIZE)
+DEFINE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_PAINT)
+DEFINE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND)
+DEFINE_EVENT_TYPE(wxEVT_NC_PAINT)
+DEFINE_EVENT_TYPE(wxEVT_PAINT_ICON)
+DEFINE_EVENT_TYPE(wxEVT_MENU_CHAR)
+DEFINE_EVENT_TYPE(wxEVT_MENU_INIT)
+DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT)
+DEFINE_EVENT_TYPE(wxEVT_POPUP_MENU_INIT)
+DEFINE_EVENT_TYPE(wxEVT_CONTEXT_MENU)
+DEFINE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_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_IDLE)
+DEFINE_EVENT_TYPE(wxEVT_UPDATE_UI)

 
 // Generic command events
 // Note: a click is a higher-level event than button down/up
 
 // Generic command events
 // Note: a click is a higher-level event than button down/up

-wxEventType wxEVT_COMMAND_LEFT_CLICK;
-wxEventType wxEVT_COMMAND_LEFT_DCLICK;
-wxEventType wxEVT_COMMAND_RIGHT_CLICK;
-wxEventType wxEVT_COMMAND_RIGHT_DCLICK;
-wxEventType wxEVT_COMMAND_SET_FOCUS;
-wxEventType wxEVT_COMMAND_KILL_FOCUS;
-wxEventType wxEVT_COMMAND_ENTER;
-
-// Tree control event types
-wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG;
-wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG;
-wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
-wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT;
-wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM;
-wxEventType wxEVT_COMMAND_TREE_GET_INFO;
-wxEventType wxEVT_COMMAND_TREE_SET_INFO;
-wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED;
-wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING;
-wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
-wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
-wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED;
-wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING;
-wxEventType wxEVT_COMMAND_TREE_KEY_DOWN;
-wxEventType wxEVT_COMMAND_TREE_ITEM_ACTIVATED;
-wxEventType wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
-wxEventType wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK;
-wxEventType wxEVT_COMMAND_TREE_END_DRAG;
-
-// List control event types
-wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG;
-wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG;
-wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT;
-wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT;
-wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM;
-wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS;
-wxEventType wxEVT_COMMAND_LIST_GET_INFO;
-wxEventType wxEVT_COMMAND_LIST_SET_INFO;
-wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED;
-wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED;
-wxEventType wxEVT_COMMAND_LIST_KEY_DOWN;
-wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM;
-wxEventType wxEVT_COMMAND_LIST_COL_CLICK;
-wxEventType wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK;
-wxEventType wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK;
-wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
-
-// Tab and notebook control event types
-wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED;
-wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING;
-wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED;
-wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING;
-
-// Splitter events
-wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED;
-wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING;
-wxEventType wxEVT_COMMAND_SPLITTER_DOUBLECLICKED;
-wxEventType wxEVT_COMMAND_SPLITTER_UNSPLIT;
-
-// Wizard events
-wxEventType wxEVT_WIZARD_PAGE_CHANGED;
-wxEventType wxEVT_WIZARD_PAGE_CHANGING;
-wxEventType wxEVT_WIZARD_CANCEL;
-
-// Calendar events
-wxEventType wxEVT_CALENDAR_SEL_CHANGED;
-wxEventType wxEVT_CALENDAR_DAY_CHANGED;
-wxEventType wxEVT_CALENDAR_MONTH_CHANGED;
-wxEventType wxEVT_CALENDAR_YEAR_CHANGED;
-wxEventType wxEVT_CALENDAR_DOUBLECLICKED;
-wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED;
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SET_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_KILL_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_ENTER)

 
 // Help events
 
 // Help events

-wxEventType wxEVT_HELP;
-wxEventType wxEVT_DETAILED_HELP;
+DEFINE_EVENT_TYPE(wxEVT_HELP)
+DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP)
+
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES

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


@@ -334,251 +270,17 @@ int wxNewEventType()
     // MT-FIXME
     static int s_lastUsedEventType = wxEVT_FIRST;
 
     // MT-FIXME
     static int s_lastUsedEventType = wxEVT_FIRST;
 

-    return s_lastUsedEventType++;
-}
-
-static void InitEvents()
-{
-#ifdef __WXDEBUG__
-    // this function is supposed to be called only once, as normally this
-    // should be always true we only do this check in debug mode
-    static bool s_inInitEvents = FALSE;
-    wxCHECK_RET( !s_inInitEvents, _T("InitEvents() reentrancy!") );
-
-    // note that we don't reset it to FALSE any more as we shouldn't be called
-    // again
-    s_inInitEvents = TRUE;
-#endif // __WXDEBUG__
-
-    wxEVT_COMMAND_BUTTON_CLICKED = wxNewEventType();
-    wxEVT_COMMAND_CHECKBOX_CLICKED = wxNewEventType();
-    wxEVT_COMMAND_CHOICE_SELECTED = wxNewEventType();
-    wxEVT_COMMAND_LISTBOX_SELECTED = wxNewEventType();
-    wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxNewEventType();
-    wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxNewEventType();
-    wxEVT_COMMAND_TEXT_UPDATED = wxNewEventType();
-    wxEVT_COMMAND_TEXT_ENTER = wxNewEventType();
-    wxEVT_COMMAND_MENU_SELECTED = wxNewEventType();
-    wxEVT_COMMAND_TOOL_CLICKED = wxNewEventType();
-    wxEVT_COMMAND_SLIDER_UPDATED = wxNewEventType();
-    wxEVT_COMMAND_RADIOBOX_SELECTED = wxNewEventType();
-    wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxNewEventType();
-    wxEVT_COMMAND_SCROLLBAR_UPDATED = wxNewEventType();
-    wxEVT_COMMAND_VLBOX_SELECTED = wxNewEventType();
-    wxEVT_COMMAND_COMBOBOX_SELECTED = wxNewEventType();
-    wxEVT_COMMAND_TOOL_RCLICKED = wxNewEventType();
-    wxEVT_COMMAND_TOOL_ENTER = wxNewEventType();
-    wxEVT_COMMAND_SPINCTRL_UPDATED = wxNewEventType();
-
-    // Sockets and timers send events, too
-    wxEVT_SOCKET = wxNewEventType();
-    wxEVT_TIMER = wxNewEventType();
-
-    // Mouse event types
-    wxEVT_LEFT_DOWN = wxNewEventType();
-    wxEVT_LEFT_UP = wxNewEventType();
-    wxEVT_MIDDLE_DOWN = wxNewEventType();
-    wxEVT_MIDDLE_UP = wxNewEventType();
-    wxEVT_RIGHT_DOWN = wxNewEventType();
-    wxEVT_RIGHT_UP = wxNewEventType();
-    wxEVT_MOTION = wxNewEventType();
-    wxEVT_ENTER_WINDOW = wxNewEventType();
-    wxEVT_LEAVE_WINDOW = wxNewEventType();
-    wxEVT_LEFT_DCLICK = wxNewEventType();
-    wxEVT_MIDDLE_DCLICK = wxNewEventType();
-    wxEVT_RIGHT_DCLICK = wxNewEventType();
-    wxEVT_SET_FOCUS = wxNewEventType();
-    wxEVT_KILL_FOCUS = wxNewEventType();
-
-    // Non-client mouse events
-    wxEVT_NC_LEFT_DOWN = wxNewEventType();
-    wxEVT_NC_LEFT_UP = wxNewEventType();
-    wxEVT_NC_MIDDLE_DOWN = wxNewEventType();
-    wxEVT_NC_MIDDLE_UP = wxNewEventType();
-    wxEVT_NC_RIGHT_DOWN = wxNewEventType();
-    wxEVT_NC_RIGHT_UP = wxNewEventType();
-    wxEVT_NC_MOTION = wxNewEventType();
-    wxEVT_NC_ENTER_WINDOW = wxNewEventType();
-    wxEVT_NC_LEAVE_WINDOW = wxNewEventType();
-    wxEVT_NC_LEFT_DCLICK = wxNewEventType();
-    wxEVT_NC_MIDDLE_DCLICK = wxNewEventType();
-    wxEVT_NC_RIGHT_DCLICK = wxNewEventType();
-
-    // Character input event type
-    wxEVT_CHAR = wxNewEventType();
-    wxEVT_CHAR_HOOK = wxNewEventType();
-    wxEVT_NAVIGATION_KEY = wxNewEventType();
-    wxEVT_KEY_DOWN = wxNewEventType();
-    wxEVT_KEY_UP = wxNewEventType();
-
-    // Set cursor event
-    wxEVT_SET_CURSOR = wxNewEventType();
-
-    // wxScrollbar and wxSlider event identifiers
-    wxEVT_SCROLL_TOP = wxNewEventType();
-    wxEVT_SCROLL_BOTTOM = wxNewEventType();
-    wxEVT_SCROLL_LINEUP = wxNewEventType();
-    wxEVT_SCROLL_LINEDOWN = wxNewEventType();
-    wxEVT_SCROLL_PAGEUP = wxNewEventType();
-    wxEVT_SCROLL_PAGEDOWN = wxNewEventType();
-    wxEVT_SCROLL_THUMBTRACK = wxNewEventType();
-    wxEVT_SCROLL_THUMBRELEASE = wxNewEventType();
-
-    // Scroll events from wxWindow
-    wxEVT_SCROLLWIN_TOP = wxNewEventType();
-    wxEVT_SCROLLWIN_BOTTOM = wxNewEventType();
-    wxEVT_SCROLLWIN_LINEUP = wxNewEventType();
-    wxEVT_SCROLLWIN_LINEDOWN = wxNewEventType();
-    wxEVT_SCROLLWIN_PAGEUP = wxNewEventType();
-    wxEVT_SCROLLWIN_PAGEDOWN = wxNewEventType();
-    wxEVT_SCROLLWIN_THUMBTRACK = wxNewEventType();
-    wxEVT_SCROLLWIN_THUMBRELEASE = wxNewEventType();
-
-    // System events
-    wxEVT_SIZE = wxNewEventType();
-    wxEVT_MOVE = wxNewEventType();
-    wxEVT_CLOSE_WINDOW = wxNewEventType();
-    wxEVT_END_SESSION = wxNewEventType();
-    wxEVT_QUERY_END_SESSION = wxNewEventType();
-    wxEVT_ACTIVATE_APP = wxNewEventType();
-    wxEVT_POWER = wxNewEventType();
-    wxEVT_ACTIVATE = wxNewEventType();
-    wxEVT_CREATE = wxNewEventType();
-    wxEVT_DESTROY = wxNewEventType();
-    wxEVT_SHOW = wxNewEventType();
-    wxEVT_ICONIZE = wxNewEventType();
-    wxEVT_MAXIMIZE = wxNewEventType();
-    wxEVT_MOUSE_CAPTURE_CHANGED = wxNewEventType();
-    wxEVT_PAINT = wxNewEventType();
-    wxEVT_ERASE_BACKGROUND = wxNewEventType();
-    wxEVT_NC_PAINT = wxNewEventType();
-    wxEVT_PAINT_ICON = wxNewEventType();
-    wxEVT_MENU_CHAR = wxNewEventType();
-    wxEVT_MENU_INIT = wxNewEventType();
-    wxEVT_MENU_HIGHLIGHT = wxNewEventType();
-    wxEVT_POPUP_MENU_INIT = wxNewEventType();
-    wxEVT_CONTEXT_MENU = wxNewEventType();
-    wxEVT_SYS_COLOUR_CHANGED = wxNewEventType();
-    wxEVT_SETTING_CHANGED = wxNewEventType();
-    wxEVT_QUERY_NEW_PALETTE = wxNewEventType();
-    wxEVT_PALETTE_CHANGED = wxNewEventType();
-    wxEVT_JOY_BUTTON_DOWN = wxNewEventType();
-    wxEVT_JOY_BUTTON_UP = wxNewEventType();
-    wxEVT_JOY_MOVE = wxNewEventType();
-    wxEVT_JOY_ZMOVE = wxNewEventType();
-    wxEVT_DROP_FILES = wxNewEventType();
-    wxEVT_DRAW_ITEM = wxNewEventType();
-    wxEVT_MEASURE_ITEM = wxNewEventType();
-    wxEVT_COMPARE_ITEM = wxNewEventType();
-    wxEVT_INIT_DIALOG = wxNewEventType();
-    wxEVT_IDLE = wxNewEventType();
-    wxEVT_UPDATE_UI = wxNewEventType();
-
-    // System misc.
-    wxEVT_END_PROCESS = wxNewEventType();
-
-    // Dial up events
-    wxEVT_DIALUP_CONNECTED = wxNewEventType();
-    wxEVT_DIALUP_DISCONNECTED = wxNewEventType();
-
-    // Generic command events
-    // Note: a click is a higher-level event than button down/up
-    wxEVT_COMMAND_LEFT_CLICK = wxNewEventType();
-    wxEVT_COMMAND_LEFT_DCLICK = wxNewEventType();
-    wxEVT_COMMAND_RIGHT_CLICK = wxNewEventType();
-    wxEVT_COMMAND_RIGHT_DCLICK = wxNewEventType();
-    wxEVT_COMMAND_SET_FOCUS = wxNewEventType();
-    wxEVT_COMMAND_KILL_FOCUS = wxNewEventType();
-    wxEVT_COMMAND_ENTER = wxNewEventType();
-
-    // Tree control event types
-    wxEVT_COMMAND_TREE_BEGIN_DRAG = wxNewEventType();
-    wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxNewEventType();
-    wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxNewEventType();
-    wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxNewEventType();
-    wxEVT_COMMAND_TREE_DELETE_ITEM = wxNewEventType();
-    wxEVT_COMMAND_TREE_GET_INFO = wxNewEventType();
-    wxEVT_COMMAND_TREE_SET_INFO = wxNewEventType();
-    wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxNewEventType();
-    wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxNewEventType();
-    wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxNewEventType();
-    wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxNewEventType();
-    wxEVT_COMMAND_TREE_SEL_CHANGED = wxNewEventType();
-    wxEVT_COMMAND_TREE_SEL_CHANGING = wxNewEventType();
-    wxEVT_COMMAND_TREE_KEY_DOWN = wxNewEventType();
-    wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxNewEventType();
-    wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxNewEventType();
-    wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxNewEventType();
-    wxEVT_COMMAND_TREE_END_DRAG = wxNewEventType();
-
-    // List control event types
-    wxEVT_COMMAND_LIST_BEGIN_DRAG = wxNewEventType();
-    wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxNewEventType();
-    wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxNewEventType();
-    wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxNewEventType();
-    wxEVT_COMMAND_LIST_DELETE_ITEM = wxNewEventType();
-    wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxNewEventType();
-    wxEVT_COMMAND_LIST_GET_INFO = wxNewEventType();
-    wxEVT_COMMAND_LIST_SET_INFO = wxNewEventType();
-    wxEVT_COMMAND_LIST_ITEM_SELECTED = wxNewEventType();
-    wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxNewEventType();
-    wxEVT_COMMAND_LIST_KEY_DOWN = wxNewEventType();
-    wxEVT_COMMAND_LIST_INSERT_ITEM = wxNewEventType();
-    wxEVT_COMMAND_LIST_COL_CLICK = wxNewEventType();
-    wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxNewEventType();
-    wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxNewEventType();
-    wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxNewEventType();
-
-    // Tab and notebook control event types
-    wxEVT_COMMAND_TAB_SEL_CHANGED = wxNewEventType();
-    wxEVT_COMMAND_TAB_SEL_CHANGING = wxNewEventType();
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxNewEventType();
-    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxNewEventType();
-
-    // Splitter events
-    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxNewEventType();
-    wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxNewEventType();
-    wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxNewEventType();
-    wxEVT_COMMAND_SPLITTER_UNSPLIT = wxNewEventType();
-
-    // Wizard events
-    wxEVT_WIZARD_PAGE_CHANGED = wxNewEventType();
-    wxEVT_WIZARD_PAGE_CHANGING = wxNewEventType();
-    wxEVT_WIZARD_CANCEL = wxNewEventType();
-
-    // Calendar events
-    wxEVT_CALENDAR_SEL_CHANGED = wxNewEventType();
-    wxEVT_CALENDAR_DAY_CHANGED = wxNewEventType();
-    wxEVT_CALENDAR_MONTH_CHANGED = wxNewEventType();
-    wxEVT_CALENDAR_YEAR_CHANGED = wxNewEventType();
-    wxEVT_CALENDAR_DOUBLECLICKED = wxNewEventType();
-    wxEVT_CALENDAR_WEEKDAY_CLICKED = wxNewEventType();
-
-    // Help events
-    wxEVT_HELP = wxNewEventType();
-    wxEVT_DETAILED_HELP = wxNewEventType();
-}
-
-// ----------------------------------------------------------------------------
-// wxEventTableEntry
-// ----------------------------------------------------------------------------
-
-wxEventTableEntry::wxEventTableEntry(int evType, int id, int idLast,
-                                     wxObjectEventFunction fn, wxObject *data)
-{
-    static bool s_initEventsDone = FALSE;
-    if ( !s_initEventsDone )
-    {
-        InitEvents();
+#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

 
 

-        s_initEventsDone = TRUE;
-    }
-
-    m_eventType = evType;
-    m_id = id;
-    m_lastId = idLast;
-    m_fn = fn;
-    m_callbackUserData = data;
+    return s_lastUsedEventType++;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -594,9 +296,9 @@ wxEventTableEntry::wxEventTableEntry(int evType, int id, int idLast,
  *
  */
 
  *
  */
 

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


@@ -605,18 +307,15 @@ wxEvent::wxEvent(int theId)
     m_isCommandEvent = FALSE;
 }
 
     m_isCommandEvent = FALSE;
 }
 

-void wxEvent::CopyObject(wxObject& object_dest) const
+wxEvent::wxEvent(const wxEvent &src)

 {
 {

-    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;
+    m_eventType = src.m_eventType;
+    m_eventObject = src.m_eventObject;
+    m_timeStamp = src.m_timeStamp;
+    m_id = src.m_id;
+    m_skipped = src.m_skipped;
+    m_callbackUserData = src.m_callbackUserData;
+    m_isCommandEvent = src.m_isCommandEvent;

 }
 
 #if wxUSE_GUI
 }
 
 #if wxUSE_GUI


@@ -627,43 +326,16 @@ 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_commandString = wxEmptyString;
     m_isCommandEvent = TRUE;
 }
 

-void wxCommandEvent::CopyObject(wxObject& obj_d) const
-{
-    wxCommandEvent *obj = (wxCommandEvent *)&obj_d;
-
-    wxEvent::CopyObject(obj_d);
-
-    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;
-}
-
-/*
- * Notify events
- */
-
-void wxNotifyEvent::CopyObject(wxObject& obj_d) const
-{
-    wxNotifyEvent *obj = (wxNotifyEvent *)&obj_d;
-
-    wxEvent::CopyObject(obj_d);
-
-    if (!m_bAllow) obj->Veto();
-}
-

 /*
  * Scroll events
  */
 /*
  * Scroll events
  */


@@ -691,16 +363,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
  *


@@ -718,23 +380,9 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
     m_middleDown = FALSE;
     m_x = 0;
     m_y = 0;
     m_middleDown = FALSE;
     m_x = 0;
     m_y = 0;

-}
-
-void wxMouseEvent::CopyObject(wxObject& obj_d) const
-{
-    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_wheelRotation = 0;
+    m_wheelDelta = 0;
+    m_linesPerAction = 0;

 }
 
 // True if was a button dclick event (1 = left, 2 = middle, 3 = right)
 }
 
 // True if was a button dclick event (1 = left, 2 = middle, 3 = right)


@@ -783,7 +431,8 @@ bool wxMouseEvent::ButtonDown(int but) const
 // or any button up event (but = -1)
 bool wxMouseEvent::ButtonUp(int but) const
 {
 // or any button up event (but = -1)
 bool wxMouseEvent::ButtonUp(int but) const
 {

-    switch (but) {
+    switch (but)
+    {

         case -1:
             return (LeftUp() || MiddleUp() || RightUp());
         case 1:
         case -1:
             return (LeftUp() || MiddleUp() || RightUp());
         case 1:


@@ -802,7 +451,8 @@ bool wxMouseEvent::ButtonUp(int but) const
 // True if the given button is currently changing state
 bool wxMouseEvent::Button(int but) const
 {
 // True if the given button is currently changing state
 bool wxMouseEvent::Button(int but) const
 {

-    switch (but) {
+    switch (but)
+    {

         case -1:
             return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1));
         case 1:
         case -1:
             return (ButtonUp(-1) || ButtonDown(-1) || ButtonDClick(-1));
         case 1:


@@ -820,7 +470,8 @@ bool wxMouseEvent::Button(int but) const
 
 bool wxMouseEvent::ButtonIsDown(int but) const
 {
 
 bool wxMouseEvent::ButtonIsDown(int but) const
 {

-    switch (but) {
+    switch (but)
+    {

         case -1:
             return (LeftIsDown() || MiddleIsDown() || RightIsDown());
         case 1:
         case -1:
             return (LeftIsDown() || MiddleIsDown() || RightIsDown());
         case 1:


@@ -836,6 +487,19 @@ bool wxMouseEvent::ButtonIsDown(int but) const
     return FALSE;
 }
 
     return FALSE;
 }
 

+int wxMouseEvent::GetButton() const
+{
+    for ( int i = 1; i <= 3; i++ )
+    {
+        if ( Button(i) )
+        {
+            return i;
+        }
+    }
+
+    return -1;
+}
+

 // Find the logical position of the event given the DC
 wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const
 {
 // Find the logical position of the event given the DC
 wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const
 {


@@ -845,7 +509,7 @@ wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const
 
 
 /*
 
 
 /*

- * Keyboard events
+ * Keyboard event

  *
  */
 
  *
  */
 


@@ -860,139 +524,6 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
     m_scanCode = 0;
 }
 
     m_scanCode = 0;
 }
 

-void wxKeyEvent::CopyObject(wxObject& obj_d) const
-{
-    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;
-}
-
-
-/*
- * Misc events
- */
-
-void wxSizeEvent::CopyObject(wxObject& obj_d) const
-{
-    wxSizeEvent *obj = (wxSizeEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_size = m_size;
-}
-
-void wxMoveEvent::CopyObject(wxObject& obj_d) const
-{
-    wxMoveEvent *obj = (wxMoveEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_pos = m_pos;
-}
-
-void wxEraseEvent::CopyObject(wxObject& obj_d) const
-{
-    wxEraseEvent *obj = (wxEraseEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_dc = m_dc;
-}
-
-void wxActivateEvent::CopyObject(wxObject& obj_d) const
-{
-    wxActivateEvent *obj = (wxActivateEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_active = m_active;
-}
-
-void wxMenuEvent::CopyObject(wxObject& obj_d) const
-{
-    wxMenuEvent *obj = (wxMenuEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_menuId = m_menuId;
-}
-
-void wxCloseEvent::CopyObject(wxObject& obj_d) const
-{
-    wxCloseEvent *obj = (wxCloseEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    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);
-
-    obj->m_show = m_show;
-}
-
-void wxJoystickEvent::CopyObject(wxObject& obj_d) const
-{
-    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;
-}
-
-void wxDropFilesEvent::CopyObject(wxObject& obj_d) const
-{
-    wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    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.
-}
-
-void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const
-{
-    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;
-}
-
-void wxPaletteChangedEvent::CopyObject(wxObject &obj_d) const
-{
-    wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_changedWindow = m_changedWindow;
-}
-
-void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const
-{
-    wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d;
-    wxEvent::CopyObject(obj_d);
-
-    obj->m_paletteRealized = m_paletteRealized;
-}

 
 wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
 {
 
 wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
 {


@@ -1006,16 +537,18 @@ wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
     SetEventObject(win);
 }
 
     SetEventObject(win);
 }
 

-#endif // wxUSE_GUI
-
-void wxIdleEvent::CopyObject(wxObject& obj_d) const
+wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
+                 : wxCommandEvent(wxEVT_CHILD_FOCUS)

 {
 {

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

 }
 
 }
 

+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// wxEvtHandler
+// ----------------------------------------------------------------------------
+

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


@@ -1033,6 +566,9 @@ wxEvtHandler::wxEvtHandler()
     m_eventsLocker = new wxCriticalSection;
 #  endif
 #endif
     m_eventsLocker = new wxCriticalSection;
 #  endif
 #endif

+    // no client data (yet)
+    m_clientData = NULL;
+    m_clientDataType = wxClientData_None;

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


@@ -1049,8 +585,14 @@ wxEvtHandler::~wxEvtHandler()
         wxNode *node = m_dynamicEvents->First();
         while (node)
         {
         wxNode *node = m_dynamicEvents->First();
         while (node)
         {

+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES

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

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

             delete entry;
             node = node->Next();
         }
             delete entry;
             node = node->Next();
         }


@@ -1064,6 +606,10 @@ wxEvtHandler::~wxEvtHandler()
     delete m_eventsLocker;
 #  endif
 #endif
     delete m_eventsLocker;
 #  endif
 #endif

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

 }
 
 #if wxUSE_THREADS
 }
 
 #if wxUSE_THREADS


@@ -1085,6 +631,13 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
 {
     // 1) Add event to list of pending events of this event handler
 
 {
     // 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


@@ -1094,9 +647,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);


@@ -1114,7 +665,7 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event)
     wxPendingEvents->Append(this);
 
     wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
     wxPendingEvents->Append(this);
 
     wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);

-    
+

     // 3) Inform the system that new pending events are somwehere,
     //    and that these should be processed in idle time.
     wxWakeUpIdle();
     // 3) Inform the system that new pending events are somwehere,
     //    and that these should be processed in idle time.
     wxWakeUpIdle();


@@ -1135,7 +686,7 @@ void wxEvtHandler::ProcessPendingEvents()
         delete node;
 
         // In ProcessEvent, new events might get added and
         delete node;
 
         // In ProcessEvent, new events might get added and

-           // we can safely leave the crtical section here.
+        // we can safely leave the crtical section here.

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


@@ -1166,14 +717,40 @@ void wxEvtHandler::ProcessPendingEvents()
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {
 #if wxUSE_GUI
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {
 #if wxUSE_GUI

+
+    // We have to use the actual window or processing events from
+    // wxWindowNative destructor won't work (we don't see the wxWindow class)
+#ifdef __WXDEBUG__

     // check that our flag corresponds to reality
     // check that our flag corresponds to reality

-    wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
+    wxClassInfo* info = NULL;
+#ifdef __WXUNIVERSAL__
+#  if defined(__WXMSW__)
+    info = CLASSINFO(wxWindowMSW);
+#  elif defined(__WXGTK__)
+    info = CLASSINFO(wxWindowGTK);
+#  elif defined(__WXMGL__)
+    info = CLASSINFO(wxWindowMGL);
+#  elif defined(__WXPM__)
+    info = CLASSINFO(wxWindowOS2);
+#  elif defined(__WXMAC__)
+    info = CLASSINFO(wxWindowMac);
+#  elif defined(__WXMOTIF__)
+    info = CLASSINFO(wxWindowMotif);
+#  endif
+#else
+    info = CLASSINFO(wxWindow);
+#endif
+
+    wxASSERT_MSG( m_isWindow == IsKindOf(info),
+                  wxString(GetClassInfo()->GetClassName()) + _T(" should [not] be a window but it is [not]") );
+#endif
+

 #endif // wxUSE_GUI
 
     // An event handler can be enabled or disabled
     if ( GetEvtHandlerEnabled() )
     {
 #endif // wxUSE_GUI
 
     // An event handler can be enabled or disabled
     if ( GetEvtHandlerEnabled() )
     {

-    
+

 #if 0
 /*
         What is this? When using GUI threads, a non main
 #if 0
 /*
         What is this? When using GUI threads, a non main


@@ -1236,15 +813,23 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
     }
 
 #if wxUSE_GUI
     }
 
 #if wxUSE_GUI

-    // Carry on up the parent-child hierarchy,
-    // but only if event is a command event: it wouldn't
-    // make sense for a parent to receive a child's size event, for example
+    // Carry on up the parent-child hierarchy, but only if event is a command
+    // event: it wouldn't make sense for a parent to receive a child's size
+    // event, for example

     if ( m_isWindow && event.IsCommandEvent() )
     {
         wxWindow *win = (wxWindow *)this;
     if ( m_isWindow && event.IsCommandEvent() )
     {
         wxWindow *win = (wxWindow *)this;

-        wxWindow *parent = win->GetParent();
-        if (parent && !parent->IsBeingDeleted())
-            return parent->GetEventHandler()->ProcessEvent(event);
+
+        // honour the requests to stop propagation at this window: this is
+        // used by the dialogs, for example, to prevent processing the events
+        // from the dialog controls in the parent frame which rarely, if ever,
+        // makes sense
+        if ( !(win->GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
+        {
+            wxWindow *parent = win->GetParent();
+            if ( parent && !parent->IsBeingDeleted() )
+                return parent->GetEventHandler()->ProcessEvent(event);
+        }

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


@@ -1313,8 +898,17 @@ void wxEvtHandler::Connect( int id, int lastId,
                             wxObjectEventFunction func,
                             wxObject *userData )
 {
                             wxObjectEventFunction func,
                             wxObject *userData )
 {

+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+    wxEventTableEntry *entry = new wxEventTableEntry;
+    entry->m_eventType = eventType;
+    entry->m_id = id;
+    entry->m_lastId = lastId;
+    entry->m_fn = func;
+    entry->m_callbackUserData = userData;
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES

     wxDynamicEventTableEntry *entry =
         new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
     wxDynamicEventTableEntry *entry =
         new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);

+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES

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


@@ -1332,14 +926,20 @@ bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
     wxNode *node = m_dynamicEvents->First();
     while (node)
     {
     wxNode *node = m_dynamicEvents->First();
     while (node)
     {

-        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+

         if ((entry->m_id == id) &&
             ((entry->m_lastId == lastId) || (lastId == -1)) &&
             ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
             ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
             ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
         {
         if ((entry->m_id == id) &&
             ((entry->m_lastId == lastId) || (lastId == -1)) &&
             ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
             ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
             ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
         {

-            if (entry->m_callbackUserData) delete entry->m_callbackUserData;
+            if (entry->m_callbackUserData)
+                delete entry->m_callbackUserData;

             m_dynamicEvents->DeleteNode( node );
             delete entry;
             return TRUE;
             m_dynamicEvents->DeleteNode( node );
             delete entry;
             return TRUE;


@@ -1359,7 +959,11 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
     wxNode *node = m_dynamicEvents->First();
     while (node)
     {
     wxNode *node = m_dynamicEvents->First();
     while (node)
     {

-        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->Data();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES

 
         if (entry->m_fn)
         {
 
         if (entry->m_fn)
         {


@@ -1386,6 +990,48 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
     return FALSE;
 };
 
     return FALSE;
 };
 

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

 #if WXWIN_COMPATIBILITY
 bool wxEvtHandler::OnClose()
 {
 #if WXWIN_COMPATIBILITY
 bool wxEvtHandler::OnClose()
 {