add wxUSE_IMAGE to setup.h and GetHFONT to wxFont.

[wxWidgets.git] / include / wx / event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index a99125394e5f1c521a0909ad5f6baccf8a42f358..6dfc82a6ef00d81ea09ba3480d305fd0a9031042 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1,192 +1,259 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        event.h
+// Name:        wx/event.h

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

-// Copyright:   (c)
-// Licence:    wxWindows licence
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_EVENTH__
 #define _WX_EVENTH__
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_EVENTH__
 #define _WX_EVENTH__
 
 #ifdef __GNUG__

-#pragma interface "event.h"
+    #pragma interface "event.h"

 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"

-#include "wx/gdicmn.h"

 
 

-/*
- * Event types
- *
- */
+#if wxUSE_GUI
+    #include "wx/gdicmn.h"
+    #include "wx/cursor.h"
+#endif
+
+#include "wx/thread.h"
+
+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxList;
+
+#if wxUSE_GUI
+    class WXDLLEXPORT wxClientData;
+    class WXDLLEXPORT wxDC;
+    class WXDLLEXPORT wxMenu;
+    class WXDLLEXPORT wxWindow;
+#endif // wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// Event types
+// ----------------------------------------------------------------------------

 
 typedef int wxEventType;
 
 
 typedef int wxEventType;
 

-const wxEventType wxEVT_NULL = 0;
-const wxEventType wxEVT_FIRST = 10000;
-
-const wxEventType wxEVT_COMMAND_BUTTON_CLICKED =            wxEVT_FIRST + 1;
-const wxEventType wxEVT_COMMAND_CHECKBOX_CLICKED =          wxEVT_FIRST + 2;
-const wxEventType wxEVT_COMMAND_CHOICE_SELECTED =           wxEVT_FIRST + 3;
-const wxEventType wxEVT_COMMAND_LISTBOX_SELECTED =          wxEVT_FIRST + 4;
-const wxEventType wxEVT_COMMAND_LISTBOX_DOUBLECLICKED =     wxEVT_FIRST + 5;
-const wxEventType wxEVT_COMMAND_CHECKLISTBOX_TOGGLED =      wxEVT_FIRST + 6;
-const wxEventType wxEVT_COMMAND_TEXT_UPDATED =              wxEVT_FIRST + 7;
-const wxEventType wxEVT_COMMAND_TEXT_ENTER =                wxEVT_FIRST + 8;
-const wxEventType wxEVT_COMMAND_MENU_SELECTED =             wxEVT_FIRST + 9;
-const wxEventType wxEVT_COMMAND_TOOL_CLICKED =              wxEVT_COMMAND_MENU_SELECTED;
-const wxEventType wxEVT_COMMAND_SLIDER_UPDATED =            wxEVT_FIRST + 10;
-const wxEventType wxEVT_COMMAND_RADIOBOX_SELECTED =         wxEVT_FIRST + 11;
-const wxEventType wxEVT_COMMAND_RADIOBUTTON_SELECTED =      wxEVT_FIRST + 12;
-//const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use wxEVT_SCROLL... events
-const wxEventType wxEVT_COMMAND_SCROLLBAR_UPDATED =         wxEVT_FIRST + 13;
-const wxEventType wxEVT_COMMAND_VLBOX_SELECTED =            wxEVT_FIRST + 14;
-const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED =         wxEVT_FIRST + 15;
-const wxEventType wxEVT_COMMAND_TOOL_RCLICKED =             wxEVT_FIRST + 16;
-const wxEventType wxEVT_COMMAND_TOOL_ENTER =                wxEVT_FIRST + 17;
-
-/* Mouse event types */
-const wxEventType wxEVT_LEFT_DOWN =                         wxEVT_FIRST + 100;
-const wxEventType wxEVT_LEFT_UP =                           wxEVT_FIRST + 101;
-const wxEventType wxEVT_MIDDLE_DOWN =                       wxEVT_FIRST + 102;
-const wxEventType wxEVT_MIDDLE_UP =                         wxEVT_FIRST + 103;
-const wxEventType wxEVT_RIGHT_DOWN =                        wxEVT_FIRST + 104;
-const wxEventType wxEVT_RIGHT_UP =                          wxEVT_FIRST + 105;
-const wxEventType wxEVT_MOTION =                            wxEVT_FIRST + 106;
-const wxEventType wxEVT_ENTER_WINDOW =                      wxEVT_FIRST + 107;
-const wxEventType wxEVT_LEAVE_WINDOW =                      wxEVT_FIRST + 108;
-const wxEventType wxEVT_LEFT_DCLICK =                       wxEVT_FIRST + 109;
-const wxEventType wxEVT_MIDDLE_DCLICK =                     wxEVT_FIRST + 110;
-const wxEventType wxEVT_RIGHT_DCLICK =                      wxEVT_FIRST + 111;
-const wxEventType wxEVT_SET_FOCUS =                         wxEVT_FIRST + 112;
-const wxEventType wxEVT_KILL_FOCUS =                        wxEVT_FIRST + 113;
-
- // Non-client mouse events
-const wxEventType wxEVT_NC_LEFT_DOWN =                      wxEVT_FIRST + 200;
-const wxEventType wxEVT_NC_LEFT_UP =                        wxEVT_FIRST + 201;
-const wxEventType wxEVT_NC_MIDDLE_DOWN =                    wxEVT_FIRST + 202;
-const wxEventType wxEVT_NC_MIDDLE_UP =                      wxEVT_FIRST + 203;
-const wxEventType wxEVT_NC_RIGHT_DOWN =                     wxEVT_FIRST + 204;
-const wxEventType wxEVT_NC_RIGHT_UP =                       wxEVT_FIRST + 205;
-const wxEventType wxEVT_NC_MOTION =                         wxEVT_FIRST + 206;
-const wxEventType wxEVT_NC_ENTER_WINDOW =                   wxEVT_FIRST + 207;
-const wxEventType wxEVT_NC_LEAVE_WINDOW =                   wxEVT_FIRST + 208;
-const wxEventType wxEVT_NC_LEFT_DCLICK =                    wxEVT_FIRST + 209;
-const wxEventType wxEVT_NC_MIDDLE_DCLICK =                  wxEVT_FIRST + 210;
-const wxEventType wxEVT_NC_RIGHT_DCLICK =                   wxEVT_FIRST + 211;
-
-/* Character input event type  */
-const wxEventType wxEVT_CHAR =                              wxEVT_FIRST + 212;
-const wxEventType wxEVT_NAVIGATION_KEY =                    wxEVT_FIRST + 213;
-
- /*
-  * Scrollbar event identifiers
-  */
-const wxEventType wxEVT_SCROLL_TOP =                        wxEVT_FIRST + 300;
-const wxEventType wxEVT_SCROLL_BOTTOM =                     wxEVT_FIRST + 301;
-const wxEventType wxEVT_SCROLL_LINEUP =                     wxEVT_FIRST + 302;
-const wxEventType wxEVT_SCROLL_LINEDOWN =                   wxEVT_FIRST + 303;
-const wxEventType wxEVT_SCROLL_PAGEUP =                     wxEVT_FIRST + 304;
-const wxEventType wxEVT_SCROLL_PAGEDOWN =                   wxEVT_FIRST + 305;
-const wxEventType wxEVT_SCROLL_THUMBTRACK =                 wxEVT_FIRST + 306;
-
-const wxEventType wxEVT_SIZE =                              wxEVT_FIRST + 400;
-const wxEventType wxEVT_MOVE =                              wxEVT_FIRST + 401;
-const wxEventType wxEVT_CLOSE_WINDOW =                      wxEVT_FIRST + 402;
-const wxEventType wxEVT_END_SESSION =                       wxEVT_FIRST + 403;
-const wxEventType wxEVT_QUERY_END_SESSION =                 wxEVT_FIRST + 404;
-const wxEventType wxEVT_ACTIVATE_APP =                      wxEVT_FIRST + 405;
-const wxEventType wxEVT_POWER =                             wxEVT_FIRST + 406;
-const wxEventType wxEVT_CHAR_HOOK =                         wxEVT_FIRST + 407;
-const wxEventType wxEVT_KEY_UP =                            wxEVT_FIRST + 408;
-const wxEventType wxEVT_ACTIVATE =                          wxEVT_FIRST + 409;
-const wxEventType wxEVT_CREATE =                            wxEVT_FIRST + 410;
-const wxEventType wxEVT_DESTROY =                           wxEVT_FIRST + 411;
-const wxEventType wxEVT_SHOW =                              wxEVT_FIRST + 412;
-const wxEventType wxEVT_ICONIZE =                           wxEVT_FIRST + 413;
-const wxEventType wxEVT_MAXIMIZE =                          wxEVT_FIRST + 414;
-const wxEventType wxEVT_MOUSE_CAPTURE_CHANGED =             wxEVT_FIRST + 415;
-const wxEventType wxEVT_PAINT =                             wxEVT_FIRST + 416;
-const wxEventType wxEVT_ERASE_BACKGROUND =                  wxEVT_FIRST + 417;
-const wxEventType wxEVT_NC_PAINT =                          wxEVT_FIRST + 418;
-const wxEventType wxEVT_PAINT_ICON =                        wxEVT_FIRST + 419;
-const wxEventType wxEVT_MENU_CHAR =                         wxEVT_FIRST + 420;
-const wxEventType wxEVT_MENU_INIT =                         wxEVT_FIRST + 421;
-const wxEventType wxEVT_MENU_HIGHLIGHT =                    wxEVT_FIRST + 422;
-const wxEventType wxEVT_POPUP_MENU_INIT =                   wxEVT_FIRST + 423;
-const wxEventType wxEVT_CONTEXT_MENU =                      wxEVT_FIRST + 424;
-const wxEventType wxEVT_SYS_COLOUR_CHANGED =                wxEVT_FIRST + 425;
-const wxEventType wxEVT_SETTING_CHANGED =                   wxEVT_FIRST + 426;
-const wxEventType wxEVT_QUERY_NEW_PALETTE =                 wxEVT_FIRST + 427;
-const wxEventType wxEVT_PALETTE_CHANGED =                   wxEVT_FIRST + 428;
-const wxEventType wxEVT_JOY_BUTTON_DOWN =                   wxEVT_FIRST + 429;
-const wxEventType wxEVT_JOY_BUTTON_UP =                     wxEVT_FIRST + 430;
-const wxEventType wxEVT_JOY_MOVE =                          wxEVT_FIRST + 431;
-const wxEventType wxEVT_JOY_ZMOVE =                         wxEVT_FIRST + 432;
-const wxEventType wxEVT_DROP_FILES =                        wxEVT_FIRST + 433;
-const wxEventType wxEVT_DRAW_ITEM =                         wxEVT_FIRST + 434;
-const wxEventType wxEVT_MEASURE_ITEM =                      wxEVT_FIRST + 435;
-const wxEventType wxEVT_COMPARE_ITEM =                      wxEVT_FIRST + 436;
-const wxEventType wxEVT_INIT_DIALOG =                       wxEVT_FIRST + 437;
-const wxEventType wxEVT_IDLE =                              wxEVT_FIRST + 438;
-const wxEventType wxEVT_UPDATE_UI =                         wxEVT_FIRST + 439;
- /* System misc. */
-const wxEventType wxEVT_END_PROCESS =                       wxEVT_FIRST + 440;
-
- /* Generic command events */
- // Note: a click is a higher-level event
- // than button down/up
-const wxEventType wxEVT_COMMAND_LEFT_CLICK =                wxEVT_FIRST + 500;
-const wxEventType wxEVT_COMMAND_LEFT_DCLICK =               wxEVT_FIRST + 501;
-const wxEventType wxEVT_COMMAND_RIGHT_CLICK =               wxEVT_FIRST + 502;
-const wxEventType wxEVT_COMMAND_RIGHT_DCLICK =              wxEVT_FIRST + 503;
-const wxEventType wxEVT_COMMAND_SET_FOCUS =                 wxEVT_FIRST + 504;
-const wxEventType wxEVT_COMMAND_KILL_FOCUS =                wxEVT_FIRST + 505;
-const wxEventType wxEVT_COMMAND_ENTER =                     wxEVT_FIRST + 506;
-
- /* Tree control event types */
-const wxEventType wxEVT_COMMAND_TREE_BEGIN_DRAG =           wxEVT_FIRST + 600;
-const wxEventType wxEVT_COMMAND_TREE_BEGIN_RDRAG =          wxEVT_FIRST + 601;
-const wxEventType wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT =     wxEVT_FIRST + 602;
-const wxEventType wxEVT_COMMAND_TREE_END_LABEL_EDIT =       wxEVT_FIRST + 603;
-const wxEventType wxEVT_COMMAND_TREE_DELETE_ITEM =          wxEVT_FIRST + 604;
-const wxEventType wxEVT_COMMAND_TREE_GET_INFO =             wxEVT_FIRST + 605;
-const wxEventType wxEVT_COMMAND_TREE_SET_INFO =             wxEVT_FIRST + 606;
-const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDED =        wxEVT_FIRST + 607;
-const wxEventType wxEVT_COMMAND_TREE_ITEM_EXPANDING =       wxEVT_FIRST + 608;
-const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSED =       wxEVT_FIRST + 609;
-const wxEventType wxEVT_COMMAND_TREE_ITEM_COLLAPSING =      wxEVT_FIRST + 610;
-const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGED =          wxEVT_FIRST + 611;
-const wxEventType wxEVT_COMMAND_TREE_SEL_CHANGING =         wxEVT_FIRST + 612;
-const wxEventType wxEVT_COMMAND_TREE_KEY_DOWN =             wxEVT_FIRST + 613;
-
- /* List control event types */
-const wxEventType wxEVT_COMMAND_LIST_BEGIN_DRAG =           wxEVT_FIRST + 700;
-const wxEventType wxEVT_COMMAND_LIST_BEGIN_RDRAG =          wxEVT_FIRST + 701;
-const wxEventType wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT =     wxEVT_FIRST + 702;
-const wxEventType wxEVT_COMMAND_LIST_END_LABEL_EDIT =       wxEVT_FIRST + 703;
-const wxEventType wxEVT_COMMAND_LIST_DELETE_ITEM =          wxEVT_FIRST + 704;
-const wxEventType wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS =     wxEVT_FIRST + 705;
-const wxEventType wxEVT_COMMAND_LIST_GET_INFO =             wxEVT_FIRST + 706;
-const wxEventType wxEVT_COMMAND_LIST_SET_INFO =             wxEVT_FIRST + 707;
-const wxEventType wxEVT_COMMAND_LIST_ITEM_SELECTED =        wxEVT_FIRST + 708;
-const wxEventType wxEVT_COMMAND_LIST_ITEM_DESELECTED =      wxEVT_FIRST + 709;
-const wxEventType wxEVT_COMMAND_LIST_KEY_DOWN =             wxEVT_FIRST + 710;
-const wxEventType wxEVT_COMMAND_LIST_INSERT_ITEM =          wxEVT_FIRST + 711;
-const wxEventType wxEVT_COMMAND_LIST_COL_CLICK =            wxEVT_FIRST + 712;
-
- /* Tab and notebook control event types */
-const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED =           wxEVT_FIRST + 800;
-const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING =          wxEVT_FIRST + 801;
-const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED =     wxEVT_FIRST + 802;
-const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING =    wxEVT_FIRST + 803;
-
-const wxEventType wxEVT_USER_FIRST =                        wxEVT_FIRST + 2000;
+// in previous versions of wxWindows the event types used to be constants
+// which created difficulties with custom/user event types definition
+//
+// starting from wxWindows 2.4 the event types are now dynamically assigned
+// using wxNewEventType() which solves this problem, however at price of
+// several incompatibilities:
+//
+//  a) event table macros declaration changed, it now uses wxEventTableEntry
+//     ctor instead of initialisation from an agregate - the macro
+//     DECLARE_EVENT_TABLE_ENTRY may be used to write code which can compile
+//     with all versions of wxWindows
+//
+//  b) event types can't be used as switch() cases as they're not really
+//     constant any more - there is no magic solution here, you just have to
+//     change the switch()es to if()s
+//
+// if these are real problems for you, define WXWIN_COMPATIBILITY_EVENT_TYPES
+// to get 100% old behaviour, however you won't be able to use the libraries
+// using the new dynamic event type allocation in such case, so avoid it if
+// possible.
+
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+
+#define DECLARE_EVENT_TABLE_ENTRY(type, id, idLast, fn, obj) \
+    { type, id, idLast, fn, obj }
+
+#define BEGIN_DECLARE_EVENT_TYPES() enum {
+#define END_DECLARE_EVENT_TYPES() };
+#define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
+#define DECLARE_LOCAL_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
+#define DEFINE_EVENT_TYPE(name)
+
+
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+#define DECLARE_EVENT_TABLE_ENTRY(type, id, idLast, fn, obj) \
+    wxEventTableEntry(type, id, idLast, fn, obj)
+
+#define BEGIN_DECLARE_EVENT_TYPES()
+#define END_DECLARE_EVENT_TYPES()
+#define DECLARE_EVENT_TYPE(name, value) \
+    extern const wxEventType WXDLLEXPORT name;
+#define DECLARE_LOCAL_EVENT_TYPE(name, value) extern const wxEventType name;
+#define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
+
+// generate a new unique event type
+extern WXDLLEXPORT wxEventType wxNewEventType();
+
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+BEGIN_DECLARE_EVENT_TYPES()
+
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+    wxEVT_NULL = 0,
+    wxEVT_FIRST = 10000,
+    wxEVT_USER_FIRST = wxEVT_FIRST + 2000,
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+    // it is important to still have these as constants to avoid
+    // initialization order related problems
+       DECLARE_EVENT_TYPE(wxEVT_NULL,0);
+    const wxEventType wxEVT_FIRST = 10000;
+    const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED, 1)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED, 2)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED, 3)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_SELECTED, 4)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 5)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 6)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED, 7)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER, 8)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_MENU_SELECTED, 9)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED, 10)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED, 11)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_RADIOBUTTON_SELECTED, 12)
+
+    // wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use
+    // wxEVT_SCROLL... events
+
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SCROLLBAR_UPDATED, 13)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_VLBOX_SELECTED, 14)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED, 15)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED, 16)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER, 17)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED, 18)
+
+        // Sockets and timers send events, too
+    DECLARE_EVENT_TYPE(wxEVT_SOCKET, 50)
+    DECLARE_EVENT_TYPE(wxEVT_TIMER , 80)
+
+        // Mouse event types
+    DECLARE_EVENT_TYPE(wxEVT_LEFT_DOWN, 100)
+    DECLARE_EVENT_TYPE(wxEVT_LEFT_UP, 101)
+    DECLARE_EVENT_TYPE(wxEVT_MIDDLE_DOWN, 102)
+    DECLARE_EVENT_TYPE(wxEVT_MIDDLE_UP, 103)
+    DECLARE_EVENT_TYPE(wxEVT_RIGHT_DOWN, 104)
+    DECLARE_EVENT_TYPE(wxEVT_RIGHT_UP, 105)
+    DECLARE_EVENT_TYPE(wxEVT_MOTION, 106)
+    DECLARE_EVENT_TYPE(wxEVT_ENTER_WINDOW, 107)
+    DECLARE_EVENT_TYPE(wxEVT_LEAVE_WINDOW, 108)
+    DECLARE_EVENT_TYPE(wxEVT_LEFT_DCLICK, 109)
+    DECLARE_EVENT_TYPE(wxEVT_MIDDLE_DCLICK, 110)
+    DECLARE_EVENT_TYPE(wxEVT_RIGHT_DCLICK, 111)
+    DECLARE_EVENT_TYPE(wxEVT_SET_FOCUS, 112)
+    DECLARE_EVENT_TYPE(wxEVT_KILL_FOCUS, 113)
+
+        // Non-client mouse events
+    DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN, 200)
+    DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_UP, 201)
+    DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_DOWN, 202)
+    DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_UP, 203)
+    DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_DOWN, 204)
+    DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_UP, 205)
+    DECLARE_EVENT_TYPE(wxEVT_NC_MOTION, 206)
+    DECLARE_EVENT_TYPE(wxEVT_NC_ENTER_WINDOW, 207)
+    DECLARE_EVENT_TYPE(wxEVT_NC_LEAVE_WINDOW, 208)
+    DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_DCLICK, 209)
+    DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_DCLICK, 210)
+    DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_DCLICK, 211)
+
+        // Character input event type
+    DECLARE_EVENT_TYPE(wxEVT_CHAR, 212)
+    DECLARE_EVENT_TYPE(wxEVT_CHAR_HOOK, 213)
+    DECLARE_EVENT_TYPE(wxEVT_NAVIGATION_KEY, 214)
+    DECLARE_EVENT_TYPE(wxEVT_KEY_DOWN, 215)
+    DECLARE_EVENT_TYPE(wxEVT_KEY_UP, 216)
+
+        // Set cursor event
+    DECLARE_EVENT_TYPE(wxEVT_SET_CURSOR, 230)
+
+        // wxScrollbar and wxSlider event identifiers
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_TOP, 300)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_BOTTOM, 301)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_LINEUP, 302)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_LINEDOWN, 303)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP, 304)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN, 305)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK, 306)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE, 307)
+
+        // Scroll events from wxWindow
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP, 320)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM, 321)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEUP, 322)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEDOWN, 323)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEUP, 324)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEDOWN, 325)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBTRACK, 326)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE, 327)
+
+        // System events
+    DECLARE_EVENT_TYPE(wxEVT_SIZE, 400)
+    DECLARE_EVENT_TYPE(wxEVT_MOVE, 401)
+    DECLARE_EVENT_TYPE(wxEVT_CLOSE_WINDOW, 402)
+    DECLARE_EVENT_TYPE(wxEVT_END_SESSION, 403)
+    DECLARE_EVENT_TYPE(wxEVT_QUERY_END_SESSION, 404)
+    DECLARE_EVENT_TYPE(wxEVT_ACTIVATE_APP, 405)
+    DECLARE_EVENT_TYPE(wxEVT_POWER, 406)
+    DECLARE_EVENT_TYPE(wxEVT_ACTIVATE, 409)
+    DECLARE_EVENT_TYPE(wxEVT_CREATE, 410)
+    DECLARE_EVENT_TYPE(wxEVT_DESTROY, 411)
+    DECLARE_EVENT_TYPE(wxEVT_SHOW, 412)
+    DECLARE_EVENT_TYPE(wxEVT_ICONIZE, 413)
+    DECLARE_EVENT_TYPE(wxEVT_MAXIMIZE, 414)
+    DECLARE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_CHANGED, 415)
+    DECLARE_EVENT_TYPE(wxEVT_PAINT, 416)
+    DECLARE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND, 417)
+    DECLARE_EVENT_TYPE(wxEVT_NC_PAINT, 418)
+    DECLARE_EVENT_TYPE(wxEVT_PAINT_ICON, 419)
+    DECLARE_EVENT_TYPE(wxEVT_MENU_CHAR, 420)
+    DECLARE_EVENT_TYPE(wxEVT_MENU_INIT, 421)
+    DECLARE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT, 422)
+    DECLARE_EVENT_TYPE(wxEVT_POPUP_MENU_INIT, 423)
+    DECLARE_EVENT_TYPE(wxEVT_CONTEXT_MENU, 424)
+    DECLARE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED, 425)
+    DECLARE_EVENT_TYPE(wxEVT_SETTING_CHANGED, 426)
+    DECLARE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE, 427)
+    DECLARE_EVENT_TYPE(wxEVT_PALETTE_CHANGED, 428)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_BUTTON_DOWN, 429)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_BUTTON_UP, 430)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_MOVE, 431)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_ZMOVE, 432)
+    DECLARE_EVENT_TYPE(wxEVT_DROP_FILES, 433)
+    DECLARE_EVENT_TYPE(wxEVT_DRAW_ITEM, 434)
+    DECLARE_EVENT_TYPE(wxEVT_MEASURE_ITEM, 435)
+    DECLARE_EVENT_TYPE(wxEVT_COMPARE_ITEM, 436)
+    DECLARE_EVENT_TYPE(wxEVT_INIT_DIALOG, 437)
+    DECLARE_EVENT_TYPE(wxEVT_IDLE, 438)
+    DECLARE_EVENT_TYPE(wxEVT_UPDATE_UI, 439)
+
+        // Generic command events
+        // Note: a click is a higher-level event than button down/up
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LEFT_CLICK, 500)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LEFT_DCLICK, 501)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_CLICK, 502)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_DCLICK, 503)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SET_FOCUS, 504)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_KILL_FOCUS, 505)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_ENTER, 506)
+
+        // Help events
+    DECLARE_EVENT_TYPE(wxEVT_HELP, 1050)
+    DECLARE_EVENT_TYPE(wxEVT_DETAILED_HELP, 1051)
+
+END_DECLARE_EVENT_TYPES()
+
+// these 2 events are the same
+#define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED

 
 // Compatibility
 
 
 // Compatibility
 


@@ -231,7 +298,7 @@ const wxEventType wxEVT_USER_FIRST =                        wxEVT_FIRST + 2000;
 #define wxEVENT_TYPE_SCROLL_PAGEDOWN            wxEVT_SCROLL_PAGEDOWN
 #define wxEVENT_TYPE_SCROLL_THUMBTRACK          wxEVT_SCROLL_THUMBTRACK
 
 #define wxEVENT_TYPE_SCROLL_PAGEDOWN            wxEVT_SCROLL_PAGEDOWN
 #define wxEVENT_TYPE_SCROLL_THUMBTRACK          wxEVT_SCROLL_THUMBTRACK
 

-#endif
+#endif // WXWIN_COMPATIBILITY

 
 /*
  * wxWindows events, covering all interesting things that might happen
 
 /*
  * wxWindows events, covering all interesting things that might happen


@@ -245,39 +312,51 @@ const wxEventType wxEVT_USER_FIRST =                        wxEVT_FIRST + 2000;
  *
  */
 
  *
  */
 

-class WXDLLEXPORT wxEvent: public wxObject
+class WXDLLEXPORT wxEvent : public wxObject

 {
 {

-  DECLARE_ABSTRACT_CLASS(wxEvent)
+    DECLARE_ABSTRACT_CLASS(wxEvent)

 
 public:
 
 public:

-  wxEvent(int id = 0);
-  inline ~wxEvent(void) {}
-
-  inline void SetEventType(wxEventType typ) { m_eventType = typ; }
-  inline wxEventType GetEventType(void) const { return m_eventType; }
-  inline wxObject *GetEventObject(void) const { return m_eventObject; }
-  inline void SetEventObject(wxObject *obj) { m_eventObject = obj; }
-  inline long GetTimestamp(void) const { return m_timeStamp; }
-  inline void SetTimestamp(long ts = 0) { m_timeStamp = ts; }
-  inline int GetId() const { return m_id; }
-  inline void SetId(int Id) { m_id = Id; }
-
-  // Can instruct event processor that we wish to ignore this event
-  // (treat as if the event table entry had not been found)
-  inline void Skip(bool skip = TRUE) { m_skipped = skip; }
-  inline bool GetSkipped(void) const { return m_skipped; };
+    wxEvent(int id = 0);
+    ~wxEvent() {}
+
+    void SetEventType(wxEventType typ) { m_eventType = typ; }
+    wxEventType GetEventType() const { return m_eventType; }
+    wxObject *GetEventObject() const { return m_eventObject; }
+    void SetEventObject(wxObject *obj) { m_eventObject = obj; }
+    long GetTimestamp() const { return m_timeStamp; }
+    void SetTimestamp(long ts = 0) { m_timeStamp = ts; }
+    int GetId() const { return m_id; }
+    void SetId(int Id) { m_id = Id; }
+
+    // Can instruct event processor that we wish to ignore this event
+    // (treat as if the event table entry had not been found): this must be done
+    // to allow the event processing by the base classes (calling event.Skip()
+    // is the analog of calling the base class verstion of a virtual function)
+    void Skip(bool skip = TRUE) { m_skipped = skip; }
+    bool GetSkipped() const { return m_skipped; };
+
+    // implementation only: this test is explicitlty anti OO and this functions
+    // exists only for optimization purposes
+    bool IsCommandEvent() const { return m_isCommandEvent; }
+
+    void CopyObject(wxObject& object_dest) const;

 
 public:
 
 public:

-  bool              m_skipped;
-  wxObject*         m_eventObject;
-  char*             m_eventHandle;         // Handle of an underlying windowing system event
-  wxEventType            m_eventType;
-  long              m_timeStamp;
-  int               m_id;
-  wxObject*         m_callbackUserData;
-
+    wxObject*         m_eventObject;
+    wxEventType       m_eventType;
+    long              m_timeStamp;
+    int               m_id;
+    wxObject*         m_callbackUserData;
+    bool              m_skipped;
+
+    // optimization: instead of using costly IsKindOf() we keep a flag telling
+    // whether we're a command event (by far the most common case)
+    bool              m_isCommandEvent;

 };
 
 };
 

+#if wxUSE_GUI
+

 // Item or menu event class
 /*
  wxEVT_COMMAND_BUTTON_CLICKED
 // Item or menu event class
 /*
  wxEVT_COMMAND_BUTTON_CLICKED


@@ -294,78 +373,92 @@ public:
  wxEVT_COMMAND_SCROLLBAR_UPDATED
  wxEVT_COMMAND_VLBOX_SELECTED
  wxEVT_COMMAND_COMBOBOX_SELECTED
  wxEVT_COMMAND_SCROLLBAR_UPDATED
  wxEVT_COMMAND_VLBOX_SELECTED
  wxEVT_COMMAND_COMBOBOX_SELECTED

+ wxEVT_COMMAND_TOGGLEBUTTON_CLICKED

 */
 
 */
 

-class WXDLLEXPORT wxClientData;
-
-class WXDLLEXPORT wxCommandEvent: public wxEvent
+class WXDLLEXPORT wxCommandEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCommandEvent)
+    DECLARE_DYNAMIC_CLASS(wxCommandEvent)
+
+public:
+    wxCommandEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+    ~wxCommandEvent() {}
+
+    /*
+     * Accessors dependent on context
+     *
+     */

 
 

-  wxCommandEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
-  inline ~wxCommandEvent(void) {}
+    // Set/Get client data from controls
+    void SetClientData(void* clientData) { m_clientData = clientData; }
+    void *GetClientData() const { return m_clientData; }

 
 

-  /*
-   * Accessors dependent on context
-   *
-   */
+    // Set/Get client object from controls
+    void SetClientObject(wxClientData* clientObject) { m_clientObject = clientObject; }
+    void *GetClientObject() const { return m_clientObject; }

 
 

-  // Set/Get client data from controls
-  inline void SetClientData(void* clientData) { m_clientData = clientData; }
-  inline void *GetClientData() const { return m_clientData; }
+    // Get listbox selection if single-choice
+    int GetSelection() const { return m_commandInt; }

 
 

-  // Set/Get client object from controls
-  inline void SetClientObject(wxClientData* clientObject) { m_clientObject = clientObject; }
-  inline void *GetClientObject() const { return m_clientObject; }
+    // Set/Get listbox/choice selection string
+    void SetString(const wxString& s) { m_commandString = s; }
+    wxString GetString() const { return m_commandString; }

 
 

-  // Get listbox selection if single-choice
-  inline int GetSelection() const { return m_commandInt; }
+    // Get checkbox value
+    bool IsChecked() const { return m_commandInt != 0; }

 
 

-  // Set/Get listbox/choice selection string
-  inline void SetString(char* s) { m_commandString = s; }
-  inline char *GetString() const { return m_commandString; }
+    // TRUE if the listbox event was a selection.
+    bool IsSelection() const { return (m_extraLong != 0); }

 
 

-  // Get checkbox value
-  inline bool Checked() const { return (m_commandInt != 0); }
+    void SetExtraLong(long extraLong) { m_extraLong = extraLong; }
+    long GetExtraLong() const { return m_extraLong ; }

 
 

-  // TRUE if the listbox event was a selection.
-  inline bool IsSelection() const { return (m_extraLong != 0); }
+    void SetInt(int i) { m_commandInt = i; }
+    long GetInt() const { return m_commandInt ; }

 
 

-  inline void SetExtraLong(long extraLong) { m_extraLong = extraLong; }
-  inline long GetExtraLong(void) const { return m_extraLong ; }
+    void CopyObject(wxObject& obj) const;

 
 

-  inline void SetInt(int i) { m_commandInt = i; }
-  inline long GetInt(void) const { return m_commandInt ; }
+#ifdef WXWIN_COMPATIBILITY_2
+    bool Checked() const { return IsChecked(); }
+#endif // WXWIN_COMPATIBILITY_2

 
 

- public:
-  char*             m_commandString; // String event argument
-  int               m_commandInt;
-  long              m_extraLong;     // Additional information (e.g. select/deselect)
-  void*             m_clientData;    // Arbitrary client data
-  wxClientData*     m_clientObject;  // Arbitrary client object
+public:
+    wxString          m_commandString; // String event argument
+    int               m_commandInt;
+    long              m_extraLong;     // Additional information (e.g. select/deselect)
+    void*             m_clientData;    // Arbitrary client data
+    wxClientData*     m_clientObject;  // Arbitrary client object

 };
 
 // this class adds a possibility to react (from the user) code to a control
 // notification: allow or veto the operation being reported.
 };
 
 // this class adds a possibility to react (from the user) code to a control
 // notification: allow or veto the operation being reported.

-class WXDLLEXPORT wxNotifyEvent : public wxCommandEvent
+class WXDLLEXPORT wxNotifyEvent  : public wxCommandEvent

 {
 public:
     wxNotifyEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
                 : wxCommandEvent(commandType, id) { m_bAllow = TRUE; }
 
 {
 public:
     wxNotifyEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
                 : wxCommandEvent(commandType, id) { m_bAllow = TRUE; }
 

-    // veto the operation (by default it's allowed)
+    // veto the operation (usually it's allowed by default)

     void Veto() { m_bAllow = FALSE; }
 
     void Veto() { m_bAllow = FALSE; }
 

+    // allow the operation if it was disabled by default
+    void Allow() { m_bAllow = TRUE; }
+

     // for implementation code only: is the operation allowed?
     bool IsAllowed() const { return m_bAllow; }
 
     // for implementation code only: is the operation allowed?
     bool IsAllowed() const { return m_bAllow; }
 

+    // probably useless: CopyObject() is used for deferred event
+    // handling but wxNotifyEvent must be processed immediately
+    void CopyObject(wxObject& obj) const;
+

 private:
     bool m_bAllow;
 
 private:
     bool m_bAllow;
 

-    DECLARE_DYNAMIC_CLASS(wxCommandEvent)
+    DECLARE_DYNAMIC_CLASS(wxNotifyEvent)

 };
 
 };
 

-// Scroll event class
+// Scroll event class, derived form wxCommandEvent. wxScrollEvents are
+// sent by wxSlider and wxScrollbar.

 /*
  wxEVT_SCROLL_TOP
  wxEVT_SCROLL_BOTTOM
 /*
  wxEVT_SCROLL_TOP
  wxEVT_SCROLL_BOTTOM


@@ -374,25 +467,64 @@ private:
  wxEVT_SCROLL_PAGEUP
  wxEVT_SCROLL_PAGEDOWN
  wxEVT_SCROLL_THUMBTRACK
  wxEVT_SCROLL_PAGEUP
  wxEVT_SCROLL_PAGEDOWN
  wxEVT_SCROLL_THUMBTRACK

+ wxEVT_SCROLL_THUMBRELEASE
+*/
+
+class WXDLLEXPORT wxScrollEvent : public wxCommandEvent
+{
+    DECLARE_DYNAMIC_CLASS(wxScrollEvent)
+
+public:
+    wxScrollEvent(wxEventType commandType = wxEVT_NULL,
+                  int id = 0, int pos = 0, int orient = 0);
+    ~wxScrollEvent() {}
+
+    /*
+     * Accessors
+     *
+     */
+
+    int GetOrientation() const { return (int) m_extraLong ; }
+    int GetPosition() const { return m_commandInt ; }
+    void SetOrientation(int orient) { m_extraLong = (long) orient; }
+    void SetPosition(int pos) { m_commandInt = pos; }
+};
+
+// ScrollWin event class, derived fom wxEvent. wxScrollWinEvents
+// are sent by wxWindow.
+/*
+ wxEVT_SCROLLWIN_TOP
+ wxEVT_SCROLLWIN_BOTTOM
+ wxEVT_SCROLLWIN_LINEUP
+ wxEVT_SCROLLWIN_LINEDOWN
+ wxEVT_SCROLLWIN_PAGEUP
+ wxEVT_SCROLLWIN_PAGEDOWN
+ wxEVT_SCROLLWIN_THUMBTRACK
+ wxEVT_SCROLLWIN_THUMBRELEASE

 */
 
 */
 

-class WXDLLEXPORT wxScrollEvent: public wxCommandEvent
+class WXDLLEXPORT wxScrollWinEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxScrollEvent)
+    DECLARE_DYNAMIC_CLASS(wxScrollWinEvent)

 
 

- public:
-  wxScrollEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int pos = 0, int orient = 0);
-  inline ~wxScrollEvent(void) {}
+public:
+    wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
+                     int pos = 0, int orient = 0);
+    ~wxScrollWinEvent() {}

 
 

-  /*
-   * Accessors
-   *
-   */
+    /*
+     * Accessors
+     */

 
 

-  inline int GetOrientation(void) const { return (int) m_extraLong ; }
-  inline int GetPosition(void) const { return m_commandInt ; }
-  inline void SetOrientation(int orient) { m_extraLong = (long) orient; }
-  inline void SetPosition(int pos) { m_commandInt = pos; }
+    int GetOrientation() const { return (int) m_extraLong ; }
+    int GetPosition() const { return m_commandInt ; }
+    void SetOrientation(int orient) { m_extraLong = (long) orient; }
+    void SetPosition(int pos) { m_commandInt = pos; }
+
+    void CopyObject(wxObject& object_dest) const;
+public:
+    int               m_commandInt;    // Additional information
+    long              m_extraLong;

 };
 
 // Mouse event class
 };
 
 // Mouse event class


@@ -424,99 +556,161 @@ class WXDLLEXPORT wxScrollEvent: public wxCommandEvent
  wxEVT_NC_RIGHT_DCLICK,
 */
 
  wxEVT_NC_RIGHT_DCLICK,
 */
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxMouseEvent: public wxEvent
+class WXDLLEXPORT wxMouseEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMouseEvent)
-
- public:
-  wxMouseEvent(wxEventType mouseType = wxEVT_NULL);
-
-  // Was it a button event? (*doesn't* mean: is any button *down*?)
-  inline bool IsButton(void) const { return Button(-1); }
-
-  // Was it a down event from button 1, 2 or 3 or any?
-  bool ButtonDown(int but = -1) const;
-
-  // Was it a dclick event from button 1, 2 or 3 or any?
-  bool ButtonDClick(int but = -1) const;
-
-  // Was it a up event from button 1, 2 or 3 or any?
-  bool ButtonUp(int but = -1) const;
-
-  // Was the given button 1,2,3 or any changing state?
-  bool Button(int but) const;
-
-  // Was the given button 1,2,3 or any in Down state?
-  bool ButtonIsDown(int but) const;
+    DECLARE_DYNAMIC_CLASS(wxMouseEvent)

 
 

-  // Find state of shift/control keys
-  inline bool ControlDown(void) const { return m_controlDown; }
-  inline bool MetaDown(void) const { return m_metaDown; }
-  inline bool AltDown(void) const { return m_altDown; }
-  inline bool ShiftDown(void) const { return m_shiftDown; }
+public:
+    wxMouseEvent(wxEventType mouseType = wxEVT_NULL);
+
+    // Was it a button event? (*doesn't* mean: is any button *down*?)
+    bool IsButton() const { return Button(-1); }
+
+    // Was it a down event from button 1, 2 or 3 or any?
+    bool ButtonDown(int but = -1) const;
+
+    // Was it a dclick event from button 1, 2 or 3 or any?
+    bool ButtonDClick(int but = -1) const;
+
+    // Was it a up event from button 1, 2 or 3 or any?
+    bool ButtonUp(int but = -1) const;
+
+    // Was the given button 1,2,3 or any changing state?
+    bool Button(int but) const;
+
+    // Was the given button 1,2,3 or any in Down state?
+    bool ButtonIsDown(int but) const;
+
+    // Find state of shift/control keys
+    bool ControlDown() const { return m_controlDown; }
+    bool MetaDown() const { return m_metaDown; }
+    bool AltDown() const { return m_altDown; }
+    bool ShiftDown() const { return m_shiftDown; }
+
+    // Find which event was just generated
+    bool LeftDown() const { return (m_eventType == wxEVT_LEFT_DOWN); }
+    bool MiddleDown() const { return (m_eventType == wxEVT_MIDDLE_DOWN); }
+    bool RightDown() const { return (m_eventType == wxEVT_RIGHT_DOWN); }
+
+    bool LeftUp() const { return (m_eventType == wxEVT_LEFT_UP); }
+    bool MiddleUp() const { return (m_eventType == wxEVT_MIDDLE_UP); }
+    bool RightUp() const { return (m_eventType == wxEVT_RIGHT_UP); }
+
+    bool LeftDClick() const { return (m_eventType == wxEVT_LEFT_DCLICK); }
+    bool MiddleDClick() const { return (m_eventType == wxEVT_MIDDLE_DCLICK); }
+    bool RightDClick() const { return (m_eventType == wxEVT_RIGHT_DCLICK); }
+
+    // Find the current state of the mouse buttons (regardless
+    // of current event type)
+    bool LeftIsDown() const { return m_leftDown; }
+    bool MiddleIsDown() const { return m_middleDown; }
+    bool RightIsDown() const { return m_rightDown; }
+
+    // True if a button is down and the mouse is moving
+    bool Dragging() const
+    {
+        return ((m_eventType == wxEVT_MOTION) &&
+                (LeftIsDown() || MiddleIsDown() || RightIsDown()));
+    }
+
+    // True if the mouse is moving, and no button is down
+    bool Moving() const { return (m_eventType == wxEVT_MOTION); }
+
+    // True if the mouse is just entering the window
+    bool Entering() const { return (m_eventType == wxEVT_ENTER_WINDOW); }
+
+    // True if the mouse is just leaving the window
+    bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
+
+    // Find the position of the event
+    void GetPosition(wxCoord *xpos, wxCoord *ypos) const
+    {
+        if (xpos)
+            *xpos = m_x;
+        if (ypos)
+            *ypos = m_y;
+    }
+
+#ifndef __WIN16__
+    void GetPosition(long *xpos, long *ypos) const
+    {
+        if (xpos)
+            *xpos = (long)m_x;
+        if (ypos)
+            *ypos = (long)m_y;
+    }
+#endif

 
 

-  // Find which event was just generated
-  inline bool LeftDown(void) const { return (m_eventType == wxEVT_LEFT_DOWN); }
-  inline bool MiddleDown(void) const { return (m_eventType == wxEVT_MIDDLE_DOWN); }
-  inline bool RightDown(void) const { return (m_eventType == wxEVT_RIGHT_DOWN); }
+    // Find the position of the event
+    wxPoint GetPosition() const { return wxPoint(m_x, m_y); }

 
 

-  inline bool LeftUp(void) const { return (m_eventType == wxEVT_LEFT_UP); }
-  inline bool MiddleUp(void) const { return (m_eventType == wxEVT_MIDDLE_UP); }
-  inline bool RightUp(void) const { return (m_eventType == wxEVT_RIGHT_UP); }
+    // Find the logical position of the event given the DC
+    wxPoint GetLogicalPosition(const wxDC& dc) const ;

 
 

-  inline bool LeftDClick(void) const { return (m_eventType == wxEVT_LEFT_DCLICK); }
-  inline bool MiddleDClick(void) const { return (m_eventType == wxEVT_MIDDLE_DCLICK); }
-  inline bool RightDClick(void) const { return (m_eventType == wxEVT_RIGHT_DCLICK); }
+    // Compatibility
+#if WXWIN_COMPATIBILITY
+    void Position(long *xpos, long *ypos) const
+    {
+        if (xpos)
+            *xpos = (long)m_x;
+        if (ypos)
+            *ypos = (long)m_y;
+    }

 
 

-  // Find the current state of the mouse buttons (regardless
-  // of current event type)
-  inline bool LeftIsDown(void) const { return m_leftDown; }
-  inline bool MiddleIsDown(void) const { return m_middleDown; }
-  inline bool RightIsDown(void) const { return m_rightDown; }
+    void Position(float *xpos, float *ypos) const
+    {
+        *xpos = (float) m_x; *ypos = (float) m_y;
+    }
+#endif // WXWIN_COMPATIBILITY

 
 

-  // True if a button is down and the mouse is moving
-  inline bool Dragging(void) const { return ((m_eventType == wxEVT_MOTION) && (LeftIsDown() || MiddleIsDown() || RightIsDown())); }
+    // Get X position
+    wxCoord GetX() const { return m_x; }

 
 

-  // True if the mouse is moving, and no button is down
-  inline bool Moving(void) const { return (m_eventType == wxEVT_MOTION); }
+    // Get Y position
+    wxCoord GetY() const { return m_y; }

 
 

-  // True if the mouse is just entering the window
-  inline bool Entering(void) const { return (m_eventType == wxEVT_ENTER_WINDOW); }
+    void CopyObject(wxObject& obj) const;

 
 

-  // True if the mouse is just leaving the window
-  inline bool Leaving(void) const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
+public:
+    wxCoord m_x, m_y;

 
 

-  // Find the position of the event
-  inline void Position(long *xpos, long *ypos) const { *xpos = m_x; *ypos = m_y; }
+    bool          m_leftDown;
+    bool          m_middleDown;
+    bool          m_rightDown;

 
 

-  // Find the position of the event
-  inline wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
+    bool          m_controlDown;
+    bool          m_shiftDown;
+    bool          m_altDown;
+    bool          m_metaDown;
+};

 
 

-  // Find the logical position of the event given the DC
-  wxPoint GetLogicalPosition(const wxDC& dc) const ;
+// Cursor set event

 
 

-  // Compatibility
-  inline void Position(float *xpos, float *ypos) const { *xpos = (float) m_x; *ypos = (float) m_y; }
+/*
+   wxEVT_SET_CURSOR
+ */

 
 

-  // Get X position
-  inline long GetX(void) const { return m_x; }
+class WXDLLEXPORT wxSetCursorEvent : public wxEvent
+{
+public:
+    wxSetCursorEvent(wxCoord x, wxCoord y)
+    {
+        m_eventType = wxEVT_SET_CURSOR;

 
 

-  // Get Y position
-  inline long GetY(void) const { return m_y; }
+        m_x = x;
+        m_y = y;
+    }

 
 

-public:
-  long          m_x;
-  long          m_y;
-  bool          m_leftDown;
-  bool          m_middleDown;
-  bool          m_rightDown;
+    wxCoord GetX() const { return m_x; }
+    wxCoord GetY() const { return m_y; }

 
 

-  bool          m_controlDown;
-  bool          m_shiftDown;
-  bool          m_altDown;
-  bool          m_metaDown;
+    void SetCursor(const wxCursor& cursor) { m_cursor = cursor; }
+    const wxCursor& GetCursor() const { return m_cursor; }
+    bool HasCursor() const { return m_cursor.Ok(); }

 
 

+private:
+    wxCoord  m_x, m_y;
+    wxCursor m_cursor;

 };
 
 // Keyboard input event class
 };
 
 // Keyboard input event class


@@ -524,41 +718,67 @@ public:
 /*
  wxEVT_CHAR
  wxEVT_CHAR_HOOK
 /*
  wxEVT_CHAR
  wxEVT_CHAR_HOOK

+ wxEVT_KEY_DOWN

  wxEVT_KEY_UP
  */
 
  wxEVT_KEY_UP
  */
 

-class WXDLLEXPORT wxKeyEvent: public wxEvent
+class WXDLLEXPORT wxKeyEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxKeyEvent)
+    DECLARE_DYNAMIC_CLASS(wxKeyEvent)

 
 public:
 
 public:

-  wxKeyEvent(wxEventType keyType = wxEVT_NULL);
+    wxKeyEvent(wxEventType keyType = wxEVT_NULL);
+
+    // Find state of shift/control keys
+    bool ControlDown() const { return m_controlDown; }
+    bool MetaDown() const { return m_metaDown; }
+    bool AltDown() const { return m_altDown; }
+    bool ShiftDown() const { return m_shiftDown; }
+
+    bool HasModifiers() const { return ControlDown() || AltDown() || MetaDown(); }
+
+    // get the key code: an ASCII7 char or an element of wxKeyCode enum
+    int GetKeyCode() const { return (int)m_keyCode; }
+
+    // Find the position of the event
+    void GetPosition(wxCoord *xpos, wxCoord *ypos) const
+    {
+        if (xpos) *xpos = m_x;
+        if (ypos) *ypos = m_y;
+    }
+
+#ifndef __WIN16__
+    void GetPosition(long *xpos, long *ypos) const
+    {
+        if (xpos) *xpos = (long)m_x;
+        if (ypos) *ypos = (long)m_y;
+    }
+#endif
+
+    wxPoint GetPosition() const
+        { return wxPoint(m_x, m_y); }

 
 

-  // Find state of shift/control keys
-  inline bool ControlDown(void) const { return m_controlDown; }
-  inline bool MetaDown(void) const { return m_metaDown; }
-  inline bool AltDown(void) const { return m_altDown; }
-  inline bool ShiftDown(void) const { return m_shiftDown; }
-  inline long KeyCode(void) const { return m_keyCode; }
+    // Get X position
+    wxCoord GetX() const { return m_x; }

 
 

-  // Find the position of the event
-  inline void Position(float *xpos, float *ypos) const { *xpos = m_x; *ypos = m_y; }
+    // Get Y position
+    wxCoord GetY() const { return m_y; }

 
 

-  // Get X position
-  inline float GetX(void) const { return m_x; }
+    void CopyObject(wxObject& obj) const;

 
 

-  // Get Y position
-  inline float GetY(void) const { return m_y; }
+    // deprecated
+    long KeyCode() const { return m_keyCode; }

 
 public:
 
 public:

-  float         m_x ;
-  float         m_y ;
-  long          m_keyCode;
-  bool          m_controlDown;
-  bool          m_shiftDown;
-  bool          m_altDown;
-  bool          m_metaDown;
+    wxCoord       m_x, m_y;

 
 

+    long          m_keyCode;
+
+    bool          m_controlDown;
+    bool          m_shiftDown;
+    bool          m_altDown;
+    bool          m_metaDown;
+    bool          m_scanCode;

 };
 
 // Size event class
 };
 
 // Size event class


@@ -566,18 +786,21 @@ public:
  wxEVT_SIZE
  */
 
  wxEVT_SIZE
  */
 

-class WXDLLEXPORT wxSizeEvent: public wxEvent
+class WXDLLEXPORT wxSizeEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxSizeEvent)
+    DECLARE_DYNAMIC_CLASS(wxSizeEvent)
+
+public:
+    wxSize m_size;

 
 

- public:
-  wxSize m_size;
+    wxSizeEvent() { m_eventType = wxEVT_SIZE; }
+    wxSizeEvent(const wxSize& sz, int id = 0)
+        : m_size(sz)
+        { m_eventType = wxEVT_SIZE; m_id = id; }

 
 

-  inline wxSizeEvent(void) { m_eventType = wxEVT_SIZE; }
-  inline wxSizeEvent(const wxSize& sz, int id = 0)
-     { m_eventType = wxEVT_SIZE; m_size.x = sz.x; m_size.y = sz.y; m_id = id; }
+    wxSize GetSize() const { return m_size; }

 
 

-  inline wxSize GetSize(void) const { return m_size; }
+    void CopyObject(wxObject& obj) const;

 };
 
 // Move event class
 };
 
 // Move event class


@@ -586,18 +809,21 @@ class WXDLLEXPORT wxSizeEvent: public wxEvent
  wxEVT_MOVE
  */
 
  wxEVT_MOVE
  */
 

-class WXDLLEXPORT wxMoveEvent: public wxEvent
+class WXDLLEXPORT wxMoveEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMoveEvent)
+    DECLARE_DYNAMIC_CLASS(wxMoveEvent)

 
 

- public:
-  wxPoint m_pos;
+public:
+    wxPoint m_pos;

 
 

-  inline wxMoveEvent(void) { m_eventType = wxEVT_MOVE; }
-  inline wxMoveEvent(const wxPoint& pos, int id = 0)
-     { m_eventType = wxEVT_MOVE; m_pos.x = pos.x; m_pos.y = pos.y; m_id = id; }
+    wxMoveEvent() { m_eventType = wxEVT_MOVE; }
+    wxMoveEvent(const wxPoint& pos, int id = 0)
+        : m_pos(pos)
+        { m_eventType = wxEVT_MOVE; m_id = id; }

 
 

-  inline wxPoint GetPosition(void) const { return m_pos; }
+    wxPoint GetPosition() const { return m_pos; }
+
+    void CopyObject(wxObject& obj) const;

 };
 
 // Paint event class
 };
 
 // Paint event class


@@ -607,12 +833,33 @@ class WXDLLEXPORT wxMoveEvent: public wxEvent
  wxEVT_PAINT_ICON
  */
 
  wxEVT_PAINT_ICON
  */
 

-class WXDLLEXPORT wxPaintEvent: public wxEvent
+#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
+    // see comments in src/msw|os2/dcclient.cpp where g_isPainting is defined
+    extern WXDLLEXPORT int g_isPainting;
+#endif // debug
+
+class WXDLLEXPORT wxPaintEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPaintEvent)
+    DECLARE_DYNAMIC_CLASS(wxPaintEvent)

 
 

- public:
-  inline wxPaintEvent(int Id = 0) { m_eventType = wxEVT_PAINT; m_id = Id; }
+public:
+    wxPaintEvent(int Id = 0)
+    {
+        m_eventType = wxEVT_PAINT;
+        m_id = Id;
+
+#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
+        // set the internal flag for the duration of processing of WM_PAINT
+        g_isPainting++;
+#endif // debug
+    }
+
+#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
+    ~wxPaintEvent()
+    {
+        g_isPainting--;
+    }
+#endif // debug

 };
 
 // Erase background event class
 };
 
 // Erase background event class


@@ -620,14 +867,18 @@ class WXDLLEXPORT wxPaintEvent: public wxEvent
  wxEVT_ERASE_BACKGROUND
  */
 
  wxEVT_ERASE_BACKGROUND
  */
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxEraseEvent: public wxEvent
+class WXDLLEXPORT wxEraseEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxEraseEvent)
- public:
-  wxDC *m_dc ;
-  inline wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL) { m_eventType = wxEVT_ERASE_BACKGROUND; m_id = Id; m_dc = dc; }
-  inline wxDC *GetDC() const { return m_dc; }
+    DECLARE_DYNAMIC_CLASS(wxEraseEvent)
+
+public:
+    wxDC *m_dc;
+
+    wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL)
+        { m_eventType = wxEVT_ERASE_BACKGROUND; m_id = Id; m_dc = dc; }
+    wxDC *GetDC() const { return m_dc; }
+
+    void CopyObject(wxObject& obj) const;

 };
 
 // Focus event class
 };
 
 // Focus event class


@@ -636,12 +887,13 @@ class WXDLLEXPORT wxEraseEvent: public wxEvent
  wxEVT_KILL_FOCUS
  */
 
  wxEVT_KILL_FOCUS
  */
 

-class WXDLLEXPORT wxFocusEvent: public wxEvent
+class WXDLLEXPORT wxFocusEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxFocusEvent)
+    DECLARE_DYNAMIC_CLASS(wxFocusEvent)

 
 

- public:
-  inline wxFocusEvent(wxEventType type = wxEVT_NULL, int Id = 0) { m_eventType = type; m_id = Id; }
+public:
+    wxFocusEvent(wxEventType type = wxEVT_NULL, int Id = 0)
+        { m_eventType = type; m_id = Id; }

 };
 
 // Activate event class
 };
 
 // Activate event class


@@ -650,14 +902,19 @@ class WXDLLEXPORT wxFocusEvent: public wxEvent
  wxEVT_ACTIVATE_APP
  */
 
  wxEVT_ACTIVATE_APP
  */
 

-class WXDLLEXPORT wxActivateEvent: public wxEvent
+class WXDLLEXPORT wxActivateEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxActivateEvent)
+    DECLARE_DYNAMIC_CLASS(wxActivateEvent)
+
+public:
+    wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = TRUE, int Id = 0)
+        { m_eventType = type; m_active = active; m_id = Id; }
+    bool GetActive() const { return m_active; }
+
+    void CopyObject(wxObject& obj) const;

 
 

- public:
-  bool m_active;
-  inline wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = TRUE, int Id = 0) { m_eventType = type; m_active = active; m_id = Id; }
-  inline bool GetActive(void) const { return m_active; }
+private:
+    bool m_active;

 };
 
 // InitDialog event class
 };
 
 // InitDialog event class


@@ -665,12 +922,13 @@ class WXDLLEXPORT wxActivateEvent: public wxEvent
  wxEVT_INIT_DIALOG
  */
 
  wxEVT_INIT_DIALOG
  */
 

-class WXDLLEXPORT wxInitDialogEvent: public wxEvent
+class WXDLLEXPORT wxInitDialogEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxInitDialogEvent)
+    DECLARE_DYNAMIC_CLASS(wxInitDialogEvent)

 
 

- public:
-  inline wxInitDialogEvent(int Id = 0) { m_eventType = wxEVT_INIT_DIALOG; m_id = Id; }
+public:
+    wxInitDialogEvent(int Id = 0)
+        { m_eventType = wxEVT_INIT_DIALOG; m_id = Id; }

 };
 
 // Miscellaneous menu event class
 };
 
 // Miscellaneous menu event class


@@ -682,16 +940,19 @@ class WXDLLEXPORT wxInitDialogEvent: public wxEvent
  wxEVT_CONTEXT_MENU,
 */
 
  wxEVT_CONTEXT_MENU,
 */
 

-class WXDLLEXPORT wxMenuEvent: public wxEvent
+class WXDLLEXPORT wxMenuEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMenuEvent)
+    DECLARE_DYNAMIC_CLASS(wxMenuEvent)

 
 public:
 
 public:

-  int m_menuId;
+    wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0)
+      { m_eventType = type; m_menuId = id; }

 
 

-  inline wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0) { m_eventType = type; m_menuId = id; }
+    int GetMenuId() const { return m_menuId; }

 
 

-  inline int GetMenuId(void) const { return m_menuId; }
+    void CopyObject(wxObject& obj) const;
+private:
+    int m_menuId;

 };
 
 // Window close or session close event class
 };
 
 // Window close or session close event class


@@ -701,78 +962,104 @@ public:
  wxEVT_QUERY_END_SESSION
  */
 
  wxEVT_QUERY_END_SESSION
  */
 

-class WXDLLEXPORT wxCloseEvent: public wxEvent
+class WXDLLEXPORT wxCloseEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCloseEvent)
+    DECLARE_DYNAMIC_CLASS(wxCloseEvent)
+

 public:
 public:

+    wxCloseEvent(wxEventType type = wxEVT_NULL, int id = 0)
+    {
+        m_eventType = type;
+        m_loggingOff = TRUE;
+        m_veto = FALSE;         // should be FALSE by default
+        m_id = id;
+#if WXWIN_COMPATIBILITY
+        m_force = FALSE;
+#endif // WXWIN_COMPATIBILITY
+        m_canVeto = TRUE;
+    }
+
+    void SetLoggingOff(bool logOff) { m_loggingOff = logOff; }
+    bool GetLoggingOff() const { return m_loggingOff; }
+
+    void Veto(bool veto = TRUE)
+    {
+        // GetVeto() will return FALSE anyhow...
+        wxCHECK_RET( m_canVeto,
+                     wxT("call to Veto() ignored (can't veto this event)") );
+
+        m_veto = veto;
+    }
+    void SetCanVeto(bool canVeto) { m_canVeto = canVeto; }
+    // No more asserts here please, the one you put here was wrong.
+    bool CanVeto() const { return m_canVeto; }
+    bool GetVeto() const { return m_canVeto && m_veto; }
+
+#if WXWIN_COMPATIBILITY
+    // This is probably obsolete now, since we use CanVeto instead, in
+    // both OnCloseWindow and OnQueryEndSession.
+    // m_force == ! m_canVeto i.e., can't veto means we must force it to close.
+    void SetForce(bool force) { m_force = force; }
+    bool GetForce() const { return m_force; }
+#endif
+
+    void CopyObject(wxObject& obj) const;
+
+protected:
+    bool m_loggingOff;
+    bool m_veto, m_canVeto;

 
 

-  inline wxCloseEvent(wxEventType type = wxEVT_NULL, int id = 0)
-     { m_eventType = type; m_loggingOff = TRUE; m_veto = FALSE;
-       m_id = id; m_force = FALSE; m_canVeto = FALSE; }
-
-  inline void SetLoggingOff(bool logOff) { m_loggingOff = logOff; }
-  inline bool GetLoggingOff(void) const { return m_loggingOff; }
-  inline void Veto(bool veto = TRUE) { m_veto = veto; }
-  inline void SetCanVeto(bool canVeto) { m_canVeto = canVeto; }
-  inline bool CanVeto() const { return m_canVeto; }
-  inline bool GetVeto(void) const { return m_veto; }
-
-  // This is probably obsolete now, since we use CanVeto instead, in
-  // both OnCloseWindow and OnQueryEndSession.
-  // m_force == ! m_canVeto i.e., can't veto means we must force it to close.
-  inline void SetForce(bool force) { m_force = force; }
-  inline bool GetForce(void) const { return m_force; }
-
- protected:
-  bool m_loggingOff;
-  bool m_veto;
-  bool m_force;
-  bool m_canVeto;
+#if WXWIN_COMPATIBILITY
+    bool m_force;
+#endif

 };
 
 /*
  wxEVT_SHOW
  */
 
 };
 
 /*
  wxEVT_SHOW
  */
 

-class WXDLLEXPORT wxShowEvent: public wxEvent
+class WXDLLEXPORT wxShowEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxShowEvent)
+    DECLARE_DYNAMIC_CLASS(wxShowEvent)
+

 public:
 
 public:
 

-  inline wxShowEvent(int id = 0, bool show = FALSE)
-  { m_eventType = wxEVT_SHOW; m_id = id; m_show = show; }
+    wxShowEvent(int id = 0, bool show = FALSE)
+        { m_eventType = wxEVT_SHOW; m_id = id; m_show = show; }
+
+    void SetShow(bool show) { m_show = show; }
+    bool GetShow() const { return m_show; }

 
 

-  inline void SetShow(bool show) { m_show = show; }
-  inline bool GetShow(void) const { return m_show; }
+    void CopyObject(wxObject& obj) const;

 
 protected:
 
 protected:

-  bool m_show;
+    bool m_show;

 };
 
 /*
  wxEVT_ICONIZE
  */
 
 };
 
 /*
  wxEVT_ICONIZE
  */
 

-class WXDLLEXPORT wxIconizeEvent: public wxEvent
+class WXDLLEXPORT wxIconizeEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxIconizeEvent)
-public:
+    DECLARE_DYNAMIC_CLASS(wxIconizeEvent)

 
 

-  inline wxIconizeEvent(int id = 0)
-  { m_eventType = wxEVT_ICONIZE; m_id = id; }
+public:
+    wxIconizeEvent(int id = 0)
+        { m_eventType = wxEVT_ICONIZE; m_id = id; }

 };
 
 /*
  wxEVT_MAXIMIZE
  */
 
 };
 
 /*
  wxEVT_MAXIMIZE
  */
 

-class WXDLLEXPORT wxMaximizeEvent: public wxEvent
+class WXDLLEXPORT wxMaximizeEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMaximizeEvent)
-public:
+    DECLARE_DYNAMIC_CLASS(wxMaximizeEvent)

 
 

-  inline wxMaximizeEvent(int id = 0)
-  { m_eventType = wxEVT_MAXIMIZE; m_id = id; }
+public:
+  wxMaximizeEvent(int id = 0)
+      { m_eventType = wxEVT_MAXIMIZE; m_id = id; }

 };
 
 // Joystick event class
 };
 
 // Joystick event class


@@ -794,57 +1081,68 @@ public:
 #define wxJOY_BUTTON4   8
 #define wxJOY_BUTTON_ANY -1
 
 #define wxJOY_BUTTON4   8
 #define wxJOY_BUTTON_ANY -1
 

-class WXDLLEXPORT wxJoystickEvent: public wxEvent
+class WXDLLEXPORT wxJoystickEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxJoystickEvent)
-
- public:
-  wxPoint   m_pos;
-  int       m_zPosition;
-  int       m_buttonChange; // Which button changed?
-  int       m_buttonState; // Which buttons are down?
-  int       m_joyStick; // Which joystick?
-
-  inline wxJoystickEvent(wxEventType type = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0)
-     { m_eventType = type; m_buttonState = state; m_pos = wxPoint(0,0); m_zPosition = 0;
-       m_joyStick = joystick; m_buttonChange = change; }
-
-  inline wxPoint GetPosition(void) const { return m_pos; }
-  inline int GetZPosition(void) const { return m_zPosition; }
-  inline int GetButtonState(void) const { return m_buttonState; }
-  inline int GetButtonChange(void) const { return m_buttonChange; }
-  inline int GetJoystick(void) const { return m_joyStick; }
-
-  inline void SetJoystick(int stick) { m_joyStick = stick; }
-  inline void SetButtonState(int state) { m_buttonState = state; }
-  inline void SetButtonChange(int change) { m_buttonChange = change; }
-  inline void SetPosition(const wxPoint& pos) { m_pos = pos; }
-  inline void SetZPosition(int zPos) { m_zPosition = zPos; }
-
-  // Was it a button event? (*doesn't* mean: is any button *down*?)
-  inline bool IsButton(void) const { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) ||
-    (GetEventType() == wxEVT_JOY_BUTTON_DOWN)); }
-
-  // Was it a move event?
-  inline bool IsMove(void) const { return (GetEventType() == wxEVT_JOY_MOVE) ; }
-
-  // Was it a zmove event?
-  inline bool IsZMove(void) const { return (GetEventType() == wxEVT_JOY_ZMOVE) ; }
-
-  // Was it a down event from button 1, 2, 3, 4 or any?
-  inline bool ButtonDown(int but = wxJOY_BUTTON_ANY) const
+    DECLARE_DYNAMIC_CLASS(wxJoystickEvent)
+
+public:
+    wxPoint   m_pos;
+    int       m_zPosition;
+    int       m_buttonChange; // Which button changed?
+    int       m_buttonState; // Which buttons are down?
+    int       m_joyStick; // Which joystick?
+
+    wxJoystickEvent(wxEventType type = wxEVT_NULL,
+                    int state = 0,
+                    int joystick = wxJOYSTICK1,
+                    int change = 0)
+    {
+        m_eventType = type;
+        m_buttonState = state;
+        m_pos = wxPoint(0,0);
+        m_zPosition = 0;
+        m_joyStick = joystick;
+        m_buttonChange = change;
+    }
+
+    wxPoint GetPosition() const { return m_pos; }
+    int GetZPosition() const { return m_zPosition; }
+    int GetButtonState() const { return m_buttonState; }
+    int GetButtonChange() const { return m_buttonChange; }
+    int GetJoystick() const { return m_joyStick; }
+
+    void SetJoystick(int stick) { m_joyStick = stick; }
+    void SetButtonState(int state) { m_buttonState = state; }
+    void SetButtonChange(int change) { m_buttonChange = change; }
+    void SetPosition(const wxPoint& pos) { m_pos = pos; }
+    void SetZPosition(int zPos) { m_zPosition = zPos; }
+
+    // Was it a button event? (*doesn't* mean: is any button *down*?)
+    bool IsButton() const { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) ||
+            (GetEventType() == wxEVT_JOY_BUTTON_UP)); }
+
+    // Was it a move event?
+    bool IsMove() const { return (GetEventType() == wxEVT_JOY_MOVE) ; }
+
+    // Was it a zmove event?
+    bool IsZMove() const { return (GetEventType() == wxEVT_JOY_ZMOVE) ; }
+
+    // Was it a down event from button 1, 2, 3, 4 or any?
+    bool ButtonDown(int but = wxJOY_BUTTON_ANY) const

     { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) &&
     { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) &&

-              ((but == wxJOY_BUTTON_ANY) || (but == m_buttonChange))); }
+            ((but == wxJOY_BUTTON_ANY) || (but == m_buttonChange))); }

 
 

-  // Was it a up event from button 1, 2, 3 or any?
-  inline bool ButtonUp(int but = wxJOY_BUTTON_ANY) const
+    // Was it a up event from button 1, 2, 3 or any?
+    bool ButtonUp(int but = wxJOY_BUTTON_ANY) const

     { return ((GetEventType() == wxEVT_JOY_BUTTON_UP) &&
     { return ((GetEventType() == wxEVT_JOY_BUTTON_UP) &&

-                ((but == wxJOY_BUTTON_ANY) || (but == m_buttonChange))); }
+            ((but == wxJOY_BUTTON_ANY) || (but == m_buttonChange))); }

 
 

-  // Was the given button 1,2,3,4 or any in Down state?
-  inline bool ButtonIsDown(int but =  wxJOY_BUTTON_ANY) const
+    // Was the given button 1,2,3,4 or any in Down state?
+    bool ButtonIsDown(int but =  wxJOY_BUTTON_ANY) const

     { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) ||
     { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) ||

-              ((m_buttonState & but) == but)); }
+            ((m_buttonState & but) == but)); }
+
+    void CopyObject(wxObject& obj) const;

 };
 
 // Drop files event class
 };
 
 // Drop files event class


@@ -852,167 +1150,283 @@ class WXDLLEXPORT wxJoystickEvent: public wxEvent
  wxEVT_DROP_FILES
  */
 
  wxEVT_DROP_FILES
  */
 

-class WXDLLEXPORT wxDropFilesEvent: public wxEvent
+class WXDLLEXPORT wxDropFilesEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxDropFilesEvent)
+    DECLARE_DYNAMIC_CLASS(wxDropFilesEvent)
+
+public:
+    int       m_noFiles;
+    wxPoint   m_pos;
+    wxString* m_files;        // Memory (de)allocated by code calling ProcessEvent

 
 

- public:
-  int       m_noFiles;
-  wxPoint   m_pos;
-  wxString* m_files;        // Memory (de)allocated by code calling ProcessEvent
+    wxDropFilesEvent(wxEventType type = wxEVT_NULL,
+                     int noFiles = 0,
+                     wxString *files = (wxString *) NULL)
+        { m_eventType = type; m_noFiles = noFiles; m_files = files; }

 
 

-  inline wxDropFilesEvent(wxEventType type = wxEVT_NULL, int noFiles = 0, wxString *files = (wxString *) NULL)
-     { m_eventType = type; m_noFiles = noFiles; m_files = files; }
+    wxPoint GetPosition() const { return m_pos; }
+    int GetNumberOfFiles() const { return m_noFiles; }
+    wxString *GetFiles() const { return m_files; }

 
 

-  inline wxPoint GetPosition(void) const { return m_pos; }
-  inline int GetNumberOfFiles(void) const { return m_noFiles; }
-  inline wxString *GetFiles(void) const { return m_files; }
+    void CopyObject(wxObject& obj) const;

 };
 
 };
 

-// Idle event
+// Update UI event

 /*
 /*

- wxEVT_IDLE
+ wxEVT_UPDATE_UI

  */
 
  */
 

-class WXDLLEXPORT wxIdleEvent: public wxEvent
+class WXDLLEXPORT wxUpdateUIEvent : public wxCommandEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxIdleEvent)
+    DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)

 
 public:
 
 public:

-  inline wxIdleEvent(void)
-     { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }
-
-  inline void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
-  inline bool MoreRequested(void) const { return m_requestMore; }
+    wxUpdateUIEvent(wxWindowID commandId = 0)
+    {
+        m_eventType = wxEVT_UPDATE_UI;
+        m_id = commandId;
+        m_checked = FALSE;
+        m_setChecked = FALSE;
+        m_enabled = FALSE;
+        m_setEnabled = FALSE;
+        m_setText = FALSE;
+        m_text = "";
+    }
+
+    bool GetChecked() const { return m_checked; }
+    bool GetEnabled() const { return m_enabled; }
+    wxString GetText() const { return m_text; }
+    bool GetSetText() const { return m_setText; }
+    bool GetSetChecked() const { return m_setChecked; }
+    bool GetSetEnabled() const { return m_setEnabled; }
+
+    void Check(bool check) { m_checked = check; m_setChecked = TRUE; }
+    void Enable(bool enable) { m_enabled = enable; m_setEnabled = TRUE; }
+    void SetText(const wxString& text) { m_text = text; m_setText = TRUE; }
+
+    void CopyObject(wxObject& obj) const;

 
 protected:
 
 protected:

-  bool m_requestMore;
+    bool          m_checked;
+    bool          m_enabled;
+    bool          m_setEnabled;
+    bool          m_setText;
+    bool          m_setChecked;
+    wxString      m_text;

 };
 
 };
 

-// Update UI event

 /*
 /*

- wxEVT_UPDATE_UI
+ wxEVT_SYS_COLOUR_CHANGED

  */
 
  */
 

-class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxWindow;
-
-class WXDLLEXPORT wxUpdateUIEvent: public wxCommandEvent
+// TODO: shouldn't all events record the window ID?
+class WXDLLEXPORT wxSysColourChangedEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)
+    DECLARE_DYNAMIC_CLASS(wxSysColourChangedEvent)
+
+public:
+    wxSysColourChangedEvent()
+        { m_eventType = wxEVT_SYS_COLOUR_CHANGED; }
+};

 
 

-  inline wxUpdateUIEvent(wxWindowID commandId = 0)
-     { m_eventType = wxEVT_UPDATE_UI; m_id = commandId;
-       m_checked = FALSE; m_setChecked = FALSE; m_enabled = FALSE; m_setEnabled = FALSE;
-       m_setText = FALSE; m_text = ""; }
+/*
+ wxEVT_PALETTE_CHANGED
+ */

 
 

-  inline bool GetChecked(void) const { return m_checked; }
-  inline bool GetEnabled(void) const { return m_enabled; }
-  inline wxString GetText(void) const { return m_text; }
-  inline bool GetSetText(void) const { return m_setText; }
-  inline bool GetSetChecked(void) const { return m_setChecked; }
-  inline bool GetSetEnabled(void) const { return m_setEnabled; }
+class WXDLLEXPORT wxPaletteChangedEvent : public wxEvent
+{
+    DECLARE_DYNAMIC_CLASS(wxPaletteChangedEvent)

 
 

-  inline void Check(bool check) { m_checked = check; m_setChecked = TRUE; }
-  inline void Enable(bool enable) { m_enabled = enable; m_setEnabled = TRUE; }
-  inline void SetText(const wxString& text) { m_text = text; m_setText = TRUE; }
+public:
+    wxPaletteChangedEvent(wxWindowID id = 0) : wxEvent(id)
+    {
+        m_eventType = wxEVT_PALETTE_CHANGED;
+        m_changedWindow = (wxWindow *) NULL;
+    }

 
 

- protected:
+    void SetChangedWindow(wxWindow* win) { m_changedWindow = win; }
+    wxWindow* GetChangedWindow() const { return m_changedWindow; }

 
 

-  bool          m_checked;
-  bool          m_enabled;
-  bool          m_setEnabled;
-  bool          m_setText;
-  bool          m_setChecked;
-  wxString      m_text;
+    void CopyObject(wxObject& obj) const;

 
 

+protected:
+    wxWindow*     m_changedWindow;

 };
 
 /*
 };
 
 /*

- wxEVT_SYS_COLOUR_CHANGED
+ wxEVT_QUERY_NEW_PALETTE
+ Indicates the window is getting keyboard focus and should re-do its palette.

  */
 
  */
 

-// TODO: shouldn't all events record the window ID?
-class WXDLLEXPORT wxSysColourChangedEvent: public wxEvent
+class WXDLLEXPORT wxQueryNewPaletteEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxSysColourChangedEvent)
+    DECLARE_DYNAMIC_CLASS(wxQueryNewPaletteEvent)
+
+public:
+    wxQueryNewPaletteEvent(wxWindowID id = 0): wxEvent(id)
+        { m_eventType = wxEVT_QUERY_NEW_PALETTE; m_paletteRealized = FALSE; }

 
 

- public:
-  inline wxSysColourChangedEvent(void)
-     { m_eventType = wxEVT_SYS_COLOUR_CHANGED; }
+    // App sets this if it changes the palette.
+    void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
+    bool GetPaletteRealized() const { return m_paletteRealized; }
+
+    void CopyObject(wxObject& obj) const;
+
+protected:
+    bool m_paletteRealized;

 };
 
 /*
 };
 
 /*

- wxEVT_PALETTE_CHANGED
+ Event generated by dialog navigation keys
+ wxEVT_NAVIGATION_KEY

  */
  */

-
-class WXDLLEXPORT wxPaletteChangedEvent: public wxEvent
+// NB: don't derive from command event to avoid being propagated to the parent
+class WXDLLEXPORT wxNavigationKeyEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPaletteChangedEvent)
-

 public:
 public:

-  inline wxPaletteChangedEvent(wxWindowID id = 0): wxEvent(id)
-     { m_eventType = wxEVT_PALETTE_CHANGED; m_changedWindow = (wxWindow *) NULL; }
+    wxNavigationKeyEvent()
+    {
+        SetEventType(wxEVT_NAVIGATION_KEY);
+
+        m_flags = IsForward | Propagate;    // defaults are for TAB
+        m_focus = (wxWindow *)NULL;
+    }
+
+    // direction: forward (true) or backward (false)
+    bool GetDirection() const
+        { return (m_flags & IsForward) != 0; }
+    void SetDirection(bool bForward)
+        { if ( bForward ) m_flags |= IsForward; else m_flags &= ~IsForward; }
+
+    // it may be a window change event (MDI, notebook pages...) or a control
+    // change event
+    bool IsWindowChange() const
+        { return (m_flags & WinChange) != 0; }
+    void SetWindowChange(bool bIs)
+        { if ( bIs ) m_flags |= WinChange; else m_flags &= ~WinChange; }
+
+    // some navigation events are meant to be propagated upwards (Windows
+    // convention is to do this for TAB events) while others should always
+    // cycle inside the panel/radiobox/whatever we're current inside
+    bool ShouldPropagate() const
+        { return (m_flags & Propagate) != 0; }
+    void SetPropagate(bool bDoIt)
+        { if ( bDoIt ) m_flags |= Propagate; else m_flags &= ~Propagate; }
+
+    // the child which has the focus currently (may be NULL - use
+    // wxWindow::FindFocus then)
+    wxWindow* GetCurrentFocus() const { return m_focus; }
+    void SetCurrentFocus(wxWindow *win) { m_focus = win; }

 
 

-  inline void SetChangedWindow(wxWindow* win) { m_changedWindow = win; }
-  inline wxWindow* GetChangedWindow() const { return m_changedWindow; }
+private:
+    enum
+    {
+        IsForward = 0x0001,
+        WinChange = 0x0002,
+        Propagate = 0x0004
+    };

 
 

-protected:
-  wxWindow*     m_changedWindow;
+    long m_flags;
+    wxWindow *m_focus;
+
+    DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)

 };
 
 };
 

+// Window creation/destruction events: the first is sent as soon as window is
+// created (i.e. the underlying GUI object exists), but when the C++ object is
+// fully initialized (so virtual functions may be called). The second,
+// wxEVT_DESTROY, is sent right before the window is destroyed - again, it's
+// still safe to call virtual functions at this moment

 /*
 /*

- wxEVT_QUERY_NEW_PALETTE
- Indicates the window is getting keyboard focus and should re-do its palette.
+ wxEVT_CREATE
+ wxEVT_DESTROY

  */
 
  */
 

-class WXDLLEXPORT wxQueryNewPaletteEvent: public wxEvent
+class WXDLLEXPORT wxWindowCreateEvent : public wxCommandEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxQueryNewPaletteEvent)
+    DECLARE_DYNAMIC_CLASS(wxWindowCreateEvent)

 
 public:
 
 public:

-  inline wxQueryNewPaletteEvent(wxWindowID id = 0): wxEvent(id)
-     { m_eventType = wxEVT_QUERY_NEW_PALETTE; m_paletteRealized = FALSE; }
+    wxWindowCreateEvent(wxWindow *win = NULL);

 
 

-  // App sets this if it changes the palette.
-  inline void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
-  inline bool GetPaletteRealized() const { return m_paletteRealized; }
+    wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
+};
+
+class WXDLLEXPORT wxWindowDestroyEvent : public wxCommandEvent
+{
+    DECLARE_DYNAMIC_CLASS(wxWindowDestroyEvent)
+
+public:
+    wxWindowDestroyEvent(wxWindow *win = NULL);
+
+    wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
+};
+
+// A help event is sent when the user clicks on a window in context-help mode.
+/*
+ wxEVT_HELP
+ wxEVT_DETAILED_HELP
+*/
+
+class WXDLLEXPORT wxHelpEvent : public wxCommandEvent
+{
+public:
+    wxHelpEvent(wxEventType type = wxEVT_NULL,
+                wxWindowID id = 0,
+                const wxPoint& pt = wxDefaultPosition)
+    {
+        m_eventType = type;
+        m_id = id;
+        m_pos = pt;
+    }
+
+    // Position of event (in screen coordinates)
+    const wxPoint& GetPosition() const { return m_pos; }
+    void SetPosition(const wxPoint& pos) { m_pos = pos; }
+
+    // Optional link to further help
+    const wxString& GetLink() const { return m_link; }
+    void SetLink(const wxString& link) { m_link = link; }
+
+    // Optional target to display help in. E.g. a window specification
+    const wxString& GetTarget() const { return m_target; }
+    void SetTarget(const wxString& target) { m_target = target; }

 
 protected:
 
 protected:

-  bool      m_paletteRealized;
+    wxPoint   m_pos;
+    wxString  m_target;
+    wxString  m_link;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxHelpEvent)

 };
 
 };
 

+#endif // wxUSE_GUI
+
+// Idle event

 /*
 /*

- Event generated by dialog navigation keys
- wxEVT_NAVIGATION_KEY
+ wxEVT_IDLE

  */
  */

-// must derive from command event to be propagated to the parent
-class WXDLLEXPORT wxNavigationKeyEvent : public wxCommandEvent
+
+class WXDLLEXPORT wxIdleEvent : public wxEvent

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)
+    DECLARE_DYNAMIC_CLASS(wxIdleEvent)

 
 public:
 
 public:

-  wxNavigationKeyEvent() : wxCommandEvent(wxEVT_NAVIGATION_KEY) { }
+    wxIdleEvent()
+        { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }

 
 

-  // direction: forward (true) or backward (false)
-  bool GetDirection() const        { return m_commandInt == 1; }
-  void SetDirection(bool bForward) { m_commandInt = bForward;  }
+    void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
+    bool MoreRequested() const { return m_requestMore; }

 
 

-  // it may be a window change event (MDI, notebook pages...) or a control
-  // change event
-  bool IsWindowChange() const    { return m_extraLong == 1; }
-  void SetWindowChange(bool bIs) { m_extraLong = bIs; }
+    void CopyObject(wxObject& obj) const;

 
 

-  // the child which has the focus currently (may be NULL - use 
-  // wxWindow::FindFocus then)
-  wxWindow* GetCurrentFocus() const { return (wxWindow *)m_clientData; }
-  void SetCurrentFocus(wxWindow *win) { m_clientData = (void *)win; }
+protected:
+    bool m_requestMore;

 };
 
 /* TODO
  wxEVT_POWER,
 };
 
 /* TODO
  wxEVT_POWER,

- wxEVT_CREATE,
- wxEVT_DESTROY,

  wxEVT_MOUSE_CAPTURE_CHANGED,
  wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
 // wxEVT_FONT_CHANGED,  // WM_FONTCHANGE: roll into wxEVT_SETTING_CHANGED, but remember to propagate
  wxEVT_MOUSE_CAPTURE_CHANGED,
  wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
 // wxEVT_FONT_CHANGED,  // WM_FONTCHANGE: roll into wxEVT_SETTING_CHANGED, but remember to propagate


@@ -1022,79 +1436,224 @@ public:
  wxEVT_COMPARE_ITEM
 */
 
  wxEVT_COMPARE_ITEM
 */
 

-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxControl;
-
-// struct WXDLLEXPORT wxEventTableEntry;
+// ============================================================================
+// event handler and related classes
+// ============================================================================

 
 typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 
 
 typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 

+// we can't have ctors nor base struct in backwards compatibility mode or
+// otherwise we won't be able to initialize the objects with an agregate, so
+// we have to keep both versions
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+

 struct WXDLLEXPORT wxEventTableEntry
 {
     // For some reason, this can't be wxEventType, or VC++ complains.
 struct WXDLLEXPORT wxEventTableEntry
 {
     // For some reason, this can't be wxEventType, or VC++ complains.

-       int                     m_eventType;            // main event type
-       int                             m_id;                       // control/menu/toolbar id
-       int                             m_lastId;                       // used for ranges of ids
-       wxObjectEventFunction   m_fn;   // function to call: not wxEventFunction, because
-                                                   // of dependency problems
-       wxObject*       m_callbackUserData;
+    int m_eventType;            // main event type
+    int m_id;                   // control/menu/toolbar id
+    int m_lastId;               // used for ranges of ids
+    wxObjectEventFunction m_fn; // function to call: not wxEventFunction,
+                                // because of dependency problems
+
+    wxObject* m_callbackUserData;

 };
 
 };
 

+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+// struct containing the members common to static and dynamic event tables
+// entries
+struct WXDLLEXPORT wxEventTableEntryBase
+{
+    wxEventTableEntryBase(int id, int idLast,
+                          wxObjectEventFunction fn, wxObject *data)
+    {
+        m_id = id;
+        m_lastId = idLast;
+        m_fn = fn;
+        m_callbackUserData = data;
+    }
+
+    // the range of ids for this entry: if m_lastId == -1, the range consists
+    // only of m_id, otherwise it is m_id..m_lastId inclusive
+    int m_id, m_lastId;
+
+    // function to call: not wxEventFunction, because of dependency problems
+    wxObjectEventFunction m_fn;
+
+    // arbitrary user data asosciated with the callback
+    wxObject* m_callbackUserData;
+};
+
+// an entry from a static event table
+struct WXDLLEXPORT wxEventTableEntry : public wxEventTableEntryBase
+{
+    wxEventTableEntry(const int& evType, int id, int idLast,
+                      wxObjectEventFunction fn, wxObject *data)
+                 : wxEventTableEntryBase(id, idLast, fn, data),
+                   m_eventType(evType)
+    {
+    }
+
+    // the reference to event type: this allows us to not care about the
+    // (undefined) order in which the event table entries and the event types
+    // are initialized: initially the value of this reference might be
+    // invalid, but by the time it is used for the first time, all global
+    // objects will have been initialized (including the event type constants)
+    // and so it will have the correct value when it is needed
+    const int& m_eventType;
+};
+
+// an entry used in dynamic event table managed by wxEvtHandler::Connect()
+struct WXDLLEXPORT wxDynamicEventTableEntry : public wxEventTableEntryBase
+{
+    wxDynamicEventTableEntry(int evType, int id, int idLast,
+                             wxObjectEventFunction fn, wxObject *data)
+        : wxEventTableEntryBase(id, idLast, fn, data)
+    {
+        m_eventType = evType;
+    }
+
+    // not a reference here as we can't keep a reference to a temporary int
+    // created to wrap the constant value typically passed to Connect() - nor
+    // do we need it
+    int m_eventType;
+};
+
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+// ----------------------------------------------------------------------------
+// wxEventTable: an array of event entries terminated with {0, 0, 0, 0, 0}
+// ----------------------------------------------------------------------------

 struct WXDLLEXPORT wxEventTable
 {
 struct WXDLLEXPORT wxEventTable
 {

-    const wxEventTable *baseTable;     // Points to base event table (next in chain)
-    const wxEventTableEntry *entries;  // Points to bottom of entry array
+    const wxEventTable *baseTable;    // base event table (next in chain)
+    const wxEventTableEntry *entries; // bottom of entry array

 };
 
 };
 

-class WXDLLEXPORT wxEvtHandler: public wxObject
+// ----------------------------------------------------------------------------
+// wxEvtHandler: the base class for all objects handling wxWindows events
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxEvtHandler : public wxObject

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxEvtHandler)
- public:
-  wxEvtHandler(void);
-  ~wxEvtHandler(void);
-
-  inline wxEvtHandler *GetNextHandler(void) const { return m_nextHandler; }
-  inline wxEvtHandler *GetPreviousHandler(void) const { return m_previousHandler; }
-  inline void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; }
-  inline void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; }
-
-  inline void SetEvtHandlerEnabled(bool en) { m_enabled = en; }
-  inline bool GetEvtHandlerEnabled(void) const { return m_enabled; }
-
-  inline virtual void OnCommand(wxWindow& WXUNUSED(win), wxCommandEvent& WXUNUSED(event)) {};
-                                                 // Called if child control has no
-                                                 // callback function
-  // Default behaviour
-  virtual long Default(void) { if (GetNextHandler()) return GetNextHandler()->Default(); else return 0; };
-
-  virtual bool OnClose(void);
-
-  virtual bool ProcessEvent(wxEvent& event);
-  virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
-  
-  void Connect( int id, int lastId,
-                int eventType,
-               wxObjectEventFunction func,
-               wxObject *userData = (wxObject *) NULL );
-               
-  bool SearchDynamicEventTable( wxEvent& event );
+public:
+    wxEvtHandler();
+    virtual ~wxEvtHandler();
+
+    wxEvtHandler *GetNextHandler() const { return m_nextHandler; }
+    wxEvtHandler *GetPreviousHandler() const { return m_previousHandler; }
+    void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; }
+    void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; }
+
+    void SetEvtHandlerEnabled(bool enabled) { m_enabled = enabled; }
+    bool GetEvtHandlerEnabled() const { return m_enabled; }
+
+    // process an event right now
+    virtual bool ProcessEvent(wxEvent& event);
+
+    // add an event to be processed later
+    void AddPendingEvent(wxEvent& event);
+
+    // process all pending events
+    void ProcessPendingEvents();
+
+    // add a
+#if wxUSE_THREADS
+    bool ProcessThreadEvent(wxEvent& event);
+#endif
+
+    // Dynamic association of a member function handler with the event handler,
+    // id and event type
+    void Connect( int id, int lastId, int eventType,
+                  wxObjectEventFunction func,
+                  wxObject *userData = (wxObject *) NULL );
+
+    // Convenience function: take just one id
+    void Connect( int id, int eventType,
+                  wxObjectEventFunction func,
+                  wxObject *userData = (wxObject *) NULL )
+        { Connect(id, -1, eventType, func, userData); }
+
+    bool Disconnect( int id, int lastId = -1, wxEventType eventType = wxEVT_NULL,
+                  wxObjectEventFunction func = NULL,
+                  wxObject *userData = (wxObject *) NULL );
+
+    // Convenience function: take just one id
+    bool Disconnect( int id, wxEventType eventType = wxEVT_NULL,
+                  wxObjectEventFunction func = NULL,
+                  wxObject *userData = (wxObject *) NULL )
+        { return Disconnect(id, -1, eventType, func, userData); }
+
+    // implementation from now on
+    virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
+    bool SearchDynamicEventTable( wxEvent& event );
+
+#if wxUSE_THREADS
+    void ClearEventLocker()
+   {
+#  if !defined(__VISAGECPP__)
+      delete m_eventsLocker;
+      m_eventsLocker = NULL;
+#endif
+   };
+#endif
+
+    // old stuff
+
+#if WXWIN_COMPATIBILITY_2
+    virtual void OnCommand(wxWindow& WXUNUSED(win),
+                           wxCommandEvent& WXUNUSED(event))
+    {
+        wxFAIL_MSG(wxT("shouldn't be called any more"));
+    }
+
+    // Called if child control has no callback function
+    virtual long Default()
+        { return GetNextHandler() ? GetNextHandler()->Default() : 0; };
+#endif // WXWIN_COMPATIBILITY_2
+
+#if WXWIN_COMPATIBILITY
+    virtual bool OnClose();
+#endif

 
 private:
 
 private:

-       static const wxEventTableEntry  sm_eventTableEntries[];
-protected:
-    static const wxEventTable  sm_eventTable;
-       virtual const wxEventTable*     GetEventTable() const;
+    static const wxEventTableEntry sm_eventTableEntries[];
+

 protected:
 protected:

-    wxEvtHandler*     m_nextHandler;
-    wxEvtHandler*     m_previousHandler;
-    bool              m_enabled;                      // Is event handler enabled?
-    wxList*           m_dynamicEvents;
+    static const wxEventTable sm_eventTable;

 
 

+    virtual const wxEventTable *GetEventTable() const;
+
+    wxEvtHandler*       m_nextHandler;
+    wxEvtHandler*       m_previousHandler;
+    wxList*             m_dynamicEvents;
+    wxList*             m_pendingEvents;
+
+#if wxUSE_THREADS
+#if defined (__VISAGECPP__)
+    wxCriticalSection   m_eventsLocker;
+#  else
+    wxCriticalSection*  m_eventsLocker;
+#  endif
+#endif
+
+    // optimization: instead of using costly IsKindOf() to decide whether we're
+    // a window (which is true in 99% of cases), use this flag
+    bool                m_isWindow;
+
+    // Is event handler enabled?
+    bool                m_enabled;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxEvtHandler)

 };
 
 typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
 };
 
 typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);

+#if wxUSE_GUI

 typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&);
 typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&);
 typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&);
 typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&);

+typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&);

 typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&);
 typedef void (wxEvtHandler::*wxMoveEventFunction)(wxMoveEvent&);
 typedef void (wxEvtHandler::*wxPaintEventFunction)(wxPaintEvent&);
 typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&);
 typedef void (wxEvtHandler::*wxMoveEventFunction)(wxMoveEvent&);
 typedef void (wxEvtHandler::*wxPaintEventFunction)(wxPaintEvent&);


@@ -1117,188 +1676,261 @@ typedef void (wxEvtHandler::*wxMaximizeEventFunction)(wxShowEvent&);
 typedef void (wxEvtHandler::*wxNavigationKeyEventFunction)(wxNavigationKeyEvent&);
 typedef void (wxEvtHandler::*wxPaletteChangedEventFunction)(wxPaletteChangedEvent&);
 typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEvent&);
 typedef void (wxEvtHandler::*wxNavigationKeyEventFunction)(wxNavigationKeyEvent&);
 typedef void (wxEvtHandler::*wxPaletteChangedEventFunction)(wxPaletteChangedEvent&);
 typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEvent&);

+typedef void (wxEvtHandler::*wxWindowCreateEventFunction)(wxWindowCreateEvent&);
+typedef void (wxEvtHandler::*wxWindowDestroyEventFunction)(wxWindowDestroyEvent&);
+typedef void (wxEvtHandler::*wxSetCursorEventFunction)(wxSetCursorEvent&);
+typedef void (wxEvtHandler::*wxNotifyEventFunction)(wxNotifyEvent&);
+typedef void (wxEvtHandler::*wxHelpEventFunction)(wxHelpEvent&);
+#endif // wxUSE_GUI

 
 // N.B. In GNU-WIN32, you *have* to take the address of a member function
 // (use &) or the compiler crashes...
 
 #define DECLARE_EVENT_TABLE() \
 
 // N.B. In GNU-WIN32, you *have* to take the address of a member function
 // (use &) or the compiler crashes...
 
 #define DECLARE_EVENT_TABLE() \

-private:\
-       static const wxEventTableEntry  sm_eventTableEntries[];\
-protected:\
-       static const wxEventTable       sm_eventTable;\
-       virtual const wxEventTable*     GetEventTable() const;
+    private: \
+        static const wxEventTableEntry sm_eventTableEntries[]; \
+    protected: \
+        static const wxEventTable        sm_eventTable; \
+        virtual const wxEventTable*        GetEventTable() const;

 
 #define BEGIN_EVENT_TABLE(theClass, baseClass) \
 
 #define BEGIN_EVENT_TABLE(theClass, baseClass) \

-const wxEventTable *theClass::GetEventTable() const { return &theClass::sm_eventTable; }\
-const wxEventTable theClass::sm_eventTable =\
-       { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] };\
-const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
-
-#define END_EVENT_TABLE() \
- { 0, 0, 0, 0, 0 } };
- 
+    const wxEventTable *theClass::GetEventTable() const \
+        { return &theClass::sm_eventTable; } \
+    const wxEventTable theClass::sm_eventTable = \
+        { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \
+    const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
+
+#define END_EVENT_TABLE() DECLARE_EVENT_TABLE_ENTRY( wxEVT_NULL, 0, 0, 0, 0 ) };
+

 /*
  * Event table macros
  */
 
 // Generic events
 /*
  * Event table macros
  */
 
 // Generic events

-#define EVT_CUSTOM(event, id, func) { event, id, -1, (wxObjectEventFunction) (wxEventFunction) & func, (wxObject *) NULL },
-#define EVT_CUSTOM_RANGE(event, id1, id2, func) { event, id1, id2, (wxObjectEventFunction) (wxEventFunction) & func, (wxObject *) NULL },
+#define EVT_CUSTOM(event, id, func) DECLARE_EVENT_TABLE_ENTRY( event, id, -1, (wxObjectEventFunction) (wxEventFunction) & func, (wxObject *) NULL ),
+#define EVT_CUSTOM_RANGE(event, id1, id2, func) DECLARE_EVENT_TABLE_ENTRY( event, id1, id2, (wxObjectEventFunction) (wxEventFunction) & func, (wxObject *) NULL ),

 
 // Miscellaneous
 
 // Miscellaneous

-#define EVT_SIZE(func)  { wxEVT_SIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSizeEventFunction) & func, (wxObject *) NULL },
-#define EVT_MOVE(func)  { wxEVT_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMoveEventFunction) & func, (wxObject *) NULL },
-#define EVT_CLOSE(func)  { wxEVT_CLOSE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL },
-#define EVT_END_SESSION(func)  { wxEVT_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL },
-#define EVT_QUERY_END_SESSION(func)  { wxEVT_QUERY_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL },
-#define EVT_PAINT(func)  { wxEVT_PAINT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaintEventFunction) & func, (wxObject *) NULL },
-#define EVT_ERASE_BACKGROUND(func)  { wxEVT_ERASE_BACKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxEraseEventFunction) & func, (wxObject *) NULL },
-#define EVT_CHAR(func)  { wxEVT_CHAR, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL },
-#define EVT_CHAR_HOOK(func)  { wxEVT_CHAR_HOOK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, NULL },
-#define EVT_MENU_HIGHLIGHT(id, func)  { wxEVT_MENU_HIGHLIGHT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, (wxObject *) NULL },
-#define EVT_MENU_HIGHLIGHT_ALL(func)  { wxEVT_MENU_HIGHLIGHT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, (wxObject *) NULL },
-#define EVT_SET_FOCUS(func)  { wxEVT_SET_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxFocusEventFunction) & func, (wxObject *) NULL },
-#define EVT_KILL_FOCUS(func)  { wxEVT_KILL_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxFocusEventFunction) & func, (wxObject *) NULL },
-#define EVT_ACTIVATE(func)  { wxEVT_ACTIVATE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxActivateEventFunction) & func, (wxObject *) NULL },
-#define EVT_ACTIVATE_APP(func)  { wxEVT_ACTIVATE_APP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxActivateEventFunction) & func, (wxObject *) NULL },
-#define EVT_END_SESSION(func)  { wxEVT_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL },
-#define EVT_QUERY_END_SESSION(func)  { wxEVT_QUERY_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL },
-#define EVT_DROP_FILES(func)  { wxEVT_DROP_FILES, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDropFilesEventFunction) & func, (wxObject *) NULL },
-#define EVT_INIT_DIALOG(func)  { wxEVT_INIT_DIALOG, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxInitDialogEventFunction) & func, (wxObject *) NULL },
-#define EVT_SYS_COLOUR_CHANGED(func)  { wxEVT_SYS_COLOUR_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSysColourChangedFunction) & func, (wxObject *) NULL },
-#define EVT_SHOW(func) { wxEVT_SHOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxShowEventFunction) & func, (wxObject *) NULL },
-#define EVT_MAXIMIZE(func) { wxEVT_MAXIMIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMaximizeEventFunction) & func, (wxObject *) NULL },
-#define EVT_ICONIZE(func) { wxEVT_ICONIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIconizeEventFunction) & func, (wxObject *) NULL },
-#define EVT_NAVIGATION_KEY(func) { wxEVT_NAVIGATION_KEY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNavigationKeyEventFunction) & func, (wxObject *) NULL },
-#define EVT_PALETTE_CHANGED(func) { wxEVT_PALETTE_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaletteChangedEventFunction) & func, (wxObject *) NULL },
-#define EVT_QUERY_NEW_PALETTE(func) { wxEVT_QUERY_NEW_PALETTE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL },
+#define EVT_SIZE(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSizeEventFunction) & func, (wxObject *) NULL ),
+#define EVT_MOVE(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMoveEventFunction) & func, (wxObject *) NULL ),
+#define EVT_CLOSE(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_CLOSE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_END_SESSION(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_QUERY_END_SESSION(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_PAINT(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_PAINT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaintEventFunction) & func, (wxObject *) NULL ),
+#define EVT_ERASE_BACKGROUND(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_ERASE_BACKGROUND, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxEraseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_CHAR(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_CHAR, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL ),
+#define EVT_KEY_DOWN(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_KEY_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL ),
+#define EVT_KEY_UP(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_KEY_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, (wxObject *) NULL ),
+#define EVT_CHAR_HOOK(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_CHAR_HOOK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCharEventFunction) & func, NULL ),
+#define EVT_MENU_HIGHLIGHT(id, func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_MENU_HIGHLIGHT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, (wxObject *) NULL ),
+#define EVT_MENU_HIGHLIGHT_ALL(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_MENU_HIGHLIGHT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SET_FOCUS(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SET_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxFocusEventFunction) & func, (wxObject *) NULL ),
+#define EVT_KILL_FOCUS(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_KILL_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxFocusEventFunction) & func, (wxObject *) NULL ),
+#define EVT_ACTIVATE(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_ACTIVATE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxActivateEventFunction) & func, (wxObject *) NULL ),
+#define EVT_ACTIVATE_APP(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_ACTIVATE_APP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxActivateEventFunction) & func, (wxObject *) NULL ),
+#define EVT_END_SESSION(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_QUERY_END_SESSION(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_END_SESSION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCloseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_DROP_FILES(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_DROP_FILES, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDropFilesEventFunction) & func, (wxObject *) NULL ),
+#define EVT_INIT_DIALOG(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_INIT_DIALOG, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxInitDialogEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SYS_COLOUR_CHANGED(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SYS_COLOUR_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSysColourChangedFunction) & func, (wxObject *) NULL ),
+#define EVT_SHOW(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SHOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxShowEventFunction) & func, (wxObject *) NULL ),
+#define EVT_MAXIMIZE(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MAXIMIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMaximizeEventFunction) & func, (wxObject *) NULL ),
+#define EVT_ICONIZE(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_ICONIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIconizeEventFunction) & func, (wxObject *) NULL ),
+#define EVT_NAVIGATION_KEY(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_NAVIGATION_KEY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNavigationKeyEventFunction) & func, (wxObject *) NULL ),
+#define EVT_PALETTE_CHANGED(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_PALETTE_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxPaletteChangedEventFunction) & func, (wxObject *) NULL ),
+#define EVT_QUERY_NEW_PALETTE(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_QUERY_NEW_PALETTE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxQueryNewPaletteEventFunction) & func, (wxObject *) NULL ),
+#define EVT_WINDOW_CREATE(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_CREATE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxWindowCreateEventFunction) & func, (wxObject *) NULL ),
+#define EVT_WINDOW_DESTROY(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_DESTROY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxWindowDestroyEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SET_CURSOR(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SET_CURSOR, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxSetCursorEventFunction) & func, (wxObject *) NULL ),

 
 // Mouse events
 
 // Mouse events

-#define EVT_LEFT_DOWN(func) { wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_LEFT_UP(func) { wxEVT_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_MIDDLE_DOWN(func) { wxEVT_MIDDLE_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_MIDDLE_UP(func) { wxEVT_MIDDLE_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_RIGHT_DOWN(func) { wxEVT_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_RIGHT_UP(func) { wxEVT_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_MOTION(func) { wxEVT_MOTION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_LEFT_DCLICK(func) { wxEVT_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_MIDDLE_DCLICK(func) { wxEVT_MIDDLE_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_RIGHT_DCLICK(func) { wxEVT_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_LEAVE_WINDOW(func) { wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
-#define EVT_ENTER_WINDOW(func) { wxEVT_ENTER_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
+#define EVT_LEFT_DOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_LEFT_UP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_MIDDLE_DOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MIDDLE_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_MIDDLE_UP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MIDDLE_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_RIGHT_DOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_RIGHT_UP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_MOTION(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOTION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_LEFT_DCLICK(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_MIDDLE_DCLICK(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MIDDLE_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_RIGHT_DCLICK(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_LEAVE_WINDOW(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
+#define EVT_ENTER_WINDOW(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_ENTER_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),

 
 // All mouse events
 #define EVT_MOUSE_EVENTS(func) \
 
 // All mouse events
 #define EVT_MOUSE_EVENTS(func) \

- { wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_MIDDLE_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_MIDDLE_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_MOTION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_MIDDLE_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_ENTER_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEFT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MIDDLE_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MIDDLE_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_RIGHT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_RIGHT_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOTION, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEFT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_MIDDLE_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_RIGHT_DCLICK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_ENTER_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),

 
 // EVT_COMMAND
 
 // EVT_COMMAND

-#define EVT_COMMAND(id, cmd, fn)  { cmd, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMMAND_RANGE(id1, id2, cmd, fn)  { cmd, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-
-// Scrolling
+#define EVT_COMMAND(id, event, fn)  DECLARE_EVENT_TABLE_ENTRY( event, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_COMMAND_RANGE(id1, id2, event, fn)  DECLARE_EVENT_TABLE_ENTRY( event, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+
+// Scrolling from wxWindow (sent to wxScrolledWindow)
+#define EVT_SCROLLWIN(func) \
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_THUMBRELEASE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+
+#define EVT_SCROLLWIN_TOP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLLWIN_BOTTOM(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLLWIN_LINEUP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLLWIN_LINEDOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLLWIN_PAGEUP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLLWIN_PAGEDOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLLWIN_THUMBTRACK(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLLWIN_THUMBRELEASE(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLLWIN_THUMBRELEASE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollWinEventFunction) & func, (wxObject *) NULL ),
+
+// Scrolling from wxSlider and wxScrollBar

 #define EVT_SCROLL(func) \
 #define EVT_SCROLL(func) \

-  { wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-
-#define EVT_SCROLL_TOP(func) { wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_SCROLL_BOTTOM(func) { wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_SCROLL_LINEUP(func) { wxEVT_SCROLL_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_SCROLL_LINEDOWN(func) { wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_SCROLL_PAGEUP(func) { wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_SCROLL_PAGEDOWN(func) { wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_SCROLL_THUMBTRACK(func) { wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-
-// Scrolling, with an id
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBRELEASE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+
+#define EVT_SCROLL_TOP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_TOP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLL_BOTTOM(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_BOTTOM, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLL_LINEUP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLL_LINEDOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLL_PAGEUP(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_PAGEUP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLL_PAGEDOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_PAGEDOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLL_THUMBTRACK(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_SCROLL_THUMBRELEASE(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBRELEASE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+
+// Scrolling from wxSlider and wxScrollBar, with an id

 #define EVT_COMMAND_SCROLL(id, func) \
 #define EVT_COMMAND_SCROLL(id, func) \

-  { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },\
-  { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-
-#define EVT_COMMAND_SCROLL_TOP(id, func) { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_COMMAND_SCROLL_BOTTOM(id, func) { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_COMMAND_SCROLL_LINEUP(id, func) { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_COMMAND_SCROLL_LINEDOWN(id, func) { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_COMMAND_SCROLL_PAGEUP(id, func) { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_COMMAND_SCROLL_PAGEDOWN(id, func) { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
-#define EVT_COMMAND_SCROLL_THUMBTRACK(id, func) { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL },
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),\
+  DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBRELEASE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+
+#define EVT_COMMAND_SCROLL_TOP(id, func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_COMMAND_SCROLL_BOTTOM(id, func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_COMMAND_SCROLL_LINEUP(id, func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_COMMAND_SCROLL_LINEDOWN(id, func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_COMMAND_SCROLL_PAGEUP(id, func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_COMMAND_SCROLL_PAGEDOWN(id, func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_COMMAND_SCROLL_THUMBTRACK(id, func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),
+#define EVT_COMMAND_SCROLL_THUMBRELEASE(id, func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBRELEASE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxScrollEventFunction) & func, (wxObject *) NULL ),

 
 // Convenience macros for commonly-used commands
 
 // Convenience macros for commonly-used commands

-#define EVT_BUTTON(id, fn) { wxEVT_COMMAND_BUTTON_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_CHECKBOX(id, fn) { wxEVT_COMMAND_CHECKBOX_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_CHOICE(id, fn) { wxEVT_COMMAND_CHOICE_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_LISTBOX(id, fn) { wxEVT_COMMAND_LISTBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_LISTBOX_DCLICK(id, fn) { wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_TEXT(id, fn) { wxEVT_COMMAND_TEXT_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_TEXT_ENTER(id, fn) { wxEVT_COMMAND_TEXT_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_MENU(id, fn) { wxEVT_COMMAND_MENU_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_MENU_RANGE(id1, id2, fn) { wxEVT_COMMAND_MENU_SELECTED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_SLIDER(id, fn) { wxEVT_COMMAND_SLIDER_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_RADIOBOX(id, fn) { wxEVT_COMMAND_RADIOBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_RADIOBUTTON(id, fn) { wxEVT_COMMAND_RADIOBUTTON_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
+#define EVT_BUTTON(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_BUTTON_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_CHECKBOX(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_CHECKBOX_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_CHOICE(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_CHOICE_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_LISTBOX(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LISTBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_LISTBOX_DCLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_TEXT(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TEXT_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_TEXT_ENTER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TEXT_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_MENU(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_MENU_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_MENU_RANGE(id1, id2, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_MENU_SELECTED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_SLIDER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SLIDER_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_RADIOBOX(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RADIOBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_RADIOBUTTON(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RADIOBUTTON_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),

 // EVT_SCROLLBAR is now obsolete since we use EVT_COMMAND_SCROLL... events
 // EVT_SCROLLBAR is now obsolete since we use EVT_COMMAND_SCROLL... events

-#define EVT_SCROLLBAR(id, fn) { wxEVT_COMMAND_SCROLLBAR_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_VLBOX(id, fn) { wxEVT_COMMAND_VLBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMBOBOX(id, fn) { wxEVT_COMMAND_COMBOBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_TOOL(id, fn) { wxEVT_COMMAND_TOOL_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_TOOL_RANGE(id1, id2, fn) { wxEVT_COMMAND_TOOL_CLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_TOOL_RCLICKED(id, fn) { wxEVT_COMMAND_TOOL_RCLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_TOOL_RCLICKED_RANGE(id1, id2, fn) { wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_TOOL_ENTER(id, fn) { wxEVT_COMMAND_TOOL_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_CHECKLISTBOX(id, fn) { wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
+#define EVT_SCROLLBAR(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SCROLLBAR_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_VLBOX(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_VLBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_COMBOBOX(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_COMBOBOX_SELECTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_TOOL(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TOOL_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_TOOL_RANGE(id1, id2, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TOOL_CLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_TOOL_RCLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TOOL_RCLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_TOOL_RCLICKED_RANGE(id1, id2, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_TOOL_ENTER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_TOOL_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_CHECKLISTBOX(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),

 
 // Generic command events
 
 // Generic command events

-#define EVT_COMMAND_LEFT_CLICK(id, fn) { wxEVT_COMMAND_LEFT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMMAND_LEFT_DCLICK(id, fn) { wxEVT_COMMAND_LEFT_DCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMMAND_RIGHT_CLICK(id, fn) { wxEVT_COMMAND_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMMAND_RIGHT_DCLICK(id, fn) { wxEVT_COMMAND_RIGHT_DCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMMAND_SET_FOCUS(id, fn) { wxEVT_COMMAND_SET_FOCUS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMMAND_KILL_FOCUS(id, fn) { wxEVT_COMMAND_KILL_FOCUS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
-#define EVT_COMMAND_ENTER(id, fn) { wxEVT_COMMAND_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
+#define EVT_COMMAND_LEFT_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LEFT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_COMMAND_LEFT_DCLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_LEFT_DCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_COMMAND_RIGHT_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RIGHT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_COMMAND_RIGHT_DCLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_RIGHT_DCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_COMMAND_SET_FOCUS(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SET_FOCUS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_COMMAND_KILL_FOCUS(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_KILL_FOCUS, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_COMMAND_ENTER(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL ),

 
 // Joystick events
 #define EVT_JOY_DOWN(func) \
 
 // Joystick events
 #define EVT_JOY_DOWN(func) \

- { wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL ),

 #define EVT_JOY_UP(func) \
 #define EVT_JOY_UP(func) \

- { wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL ),

 #define EVT_JOY_MOVE(func) \
 #define EVT_JOY_MOVE(func) \

- { wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL ),

 #define EVT_JOY_ZMOVE(func) \
 #define EVT_JOY_ZMOVE(func) \

- { wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL ),

 
 // All joystick events
 #define EVT_JOYSTICK_EVENTS(func) \
 
 // All joystick events
 #define EVT_JOYSTICK_EVENTS(func) \

- { wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
- { wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL },\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_JOY_BUTTON_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_JOY_BUTTON_UP, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_JOY_MOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL ),\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_JOY_ZMOVE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxJoystickEventFunction) & func, (wxObject *) NULL ),

 
 // Idle event
 #define EVT_IDLE(func) \
 
 // Idle event
 #define EVT_IDLE(func) \

- { wxEVT_IDLE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) & func, (wxObject *) NULL },\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_IDLE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) & func, (wxObject *) NULL ),

 
 // Update UI event
 #define EVT_UPDATE_UI(id, func) \
 
 // Update UI event
 #define EVT_UPDATE_UI(id, func) \

- { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },\
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL ),
+#define EVT_UPDATE_UI_RANGE(id1, id2, func) \
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_UPDATE_UI, id1, id2, (wxObjectEventFunction)(wxEventFunction)(wxUpdateUIEventFunction)&func, (wxObject *) NULL ),
+
+// Help events
+#define EVT_HELP(id, func) \
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_HELP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxHelpEventFunction) & func, (wxObject *) NULL ),
+
+#define EVT_HELP_RANGE(id1, id2, func) \
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_HELP, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxHelpEventFunction) & func, (wxObject *) NULL ),
+
+#define EVT_DETAILED_HELP(id, func) \
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_DETAILED_HELP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxHelpEventFunction) & func, (wxObject *) NULL ),
+
+#define EVT_DETAILED_HELP_RANGE(id1, id2, func) \
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_DETAILED_HELP, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxHelpEventFunction) & func, (wxObject *) NULL ),
+
+// ----------------------------------------------------------------------------
+// Global data
+// ----------------------------------------------------------------------------
+
+// for pending event processing - notice that there is intentionally no
+// WXDLLEXPORT here
+extern wxList *wxPendingEvents;
+#if wxUSE_THREADS
+    extern wxCriticalSection *wxPendingEventsLocker;
+#endif
+
+// ----------------------------------------------------------------------------
+// Helper functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI
+
+// Find a window with the focus, that is also a descendant of the given window.
+// This is used to determine the window to initially send commands to.
+wxWindow* wxFindFocusDescendant(wxWindow* ancestor);
+
+#endif // wxUSE_GUI

 
 #endif
 
 #endif

-       // _WX_EVENTH__
+        // _WX_EVENTH__