add missing header for !wxUSE_PCH case

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 92f344d41ce15beae4a165c7ada443b1130cb99a..b96e4458be3fc4d61290c4460d83a8f0f1474218 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -18,6 +18,7 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"

+#include "wx/clntdata.h"

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


@@ -33,7 +34,6 @@
 class WXDLLEXPORT wxList;
 
 #if wxUSE_GUI
 class WXDLLEXPORT wxList;
 
 #if wxUSE_GUI

-    class WXDLLEXPORT wxClientData;

     class WXDLLEXPORT wxDC;
     class WXDLLEXPORT wxMenu;
     class WXDLLEXPORT wxWindow;
     class WXDLLEXPORT wxDC;
     class WXDLLEXPORT wxMenu;
     class WXDLLEXPORT wxWindow;


@@ -76,6 +76,7 @@ typedef int wxEventType;
 #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)
 #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)

+#define DEFINE_LOCAL_EVENT_TYPE(name)

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


@@ -89,6 +90,7 @@ typedef int wxEventType;
     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();
     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();

+#define DEFINE_LOCAL_EVENT_TYPE(name) const wxEventType name = wxNewEventType();

 
 // generate a new unique event type
 extern WXDLLEXPORT wxEventType wxNewEventType();
 
 // generate a new unique event type
 extern WXDLLEXPORT wxEventType wxNewEventType();


@@ -115,10 +117,13 @@ BEGIN_DECLARE_EVENT_TYPES()
     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_LISTBOX_SELECTED, 4)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 5)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 6)

-    /* now in wx/textctrl.h
+    // now they are in wx/textctrl.h
+#if WXWIN_COMPATIBILITY_EVENT_TYPES

     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED, 7)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER, 8)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED, 7)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER, 8)

-    */
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL, 13)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN, 14)
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES

     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_MENU_SELECTED, 9)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED, 10)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED, 11)


@@ -153,7 +158,8 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_RIGHT_DCLICK, 111)
     DECLARE_EVENT_TYPE(wxEVT_SET_FOCUS, 112)
     DECLARE_EVENT_TYPE(wxEVT_KILL_FOCUS, 113)
     DECLARE_EVENT_TYPE(wxEVT_RIGHT_DCLICK, 111)
     DECLARE_EVENT_TYPE(wxEVT_SET_FOCUS, 112)
     DECLARE_EVENT_TYPE(wxEVT_KILL_FOCUS, 113)

-    DECLARE_EVENT_TYPE(wxEVT_MOUSEWHEEL, 114)
+    DECLARE_EVENT_TYPE(wxEVT_CHILD_FOCUS, 114)
+    DECLARE_EVENT_TYPE(wxEVT_MOUSEWHEEL, 115)

 
         // Non-client mouse events
     DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN, 200)
 
         // Non-client mouse events
     DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN, 200)


@@ -258,7 +264,17 @@ END_DECLARE_EVENT_TYPES()
 // these 2 events are the same
 #define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED
 
 // these 2 events are the same
 #define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED
 

+// ----------------------------------------------------------------------------

 // Compatibility
 // Compatibility

+// ----------------------------------------------------------------------------
+
+// this event is also used by wxComboBox and wxSpinCtrl which don't include
+// wx/textctrl.h in all ports [yet], so declare it here as well
+//
+// still, any new code using it should include wx/textctrl.h explicitly
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+    extern const wxEventType WXDLLEXPORT wxEVT_COMMAND_TEXT_UPDATED;
+#endif

 
 #if WXWIN_COMPATIBILITY
 
 
 #if WXWIN_COMPATIBILITY
 


@@ -317,11 +333,11 @@ END_DECLARE_EVENT_TYPES()
 
 class WXDLLEXPORT wxEvent : public wxObject
 {
 
 class WXDLLEXPORT wxEvent : public wxObject
 {

-    DECLARE_ABSTRACT_CLASS(wxEvent)
+protected:
+    wxEvent(const wxEvent&);                   // for implementing Clone()

 
 public:
 
 public:

-    wxEvent(int id = 0);
-    ~wxEvent() {}
+    wxEvent(int id = 0, wxEventType commandType = wxEVT_NULL );

 
     void SetEventType(wxEventType typ) { m_eventType = typ; }
     wxEventType GetEventType() const { return m_eventType; }
 
     void SetEventType(wxEventType typ) { m_eventType = typ; }
     wxEventType GetEventType() const { return m_eventType; }


@@ -339,11 +355,14 @@ public:
     void Skip(bool skip = TRUE) { m_skipped = skip; }
     bool GetSkipped() const { return m_skipped; };
 
     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
+    // Implementation only: this test is explicitlty anti OO and this functions
+    // exists only for optimization purposes.

     bool IsCommandEvent() const { return m_isCommandEvent; }
 
     bool IsCommandEvent() const { return m_isCommandEvent; }
 

-    void CopyObject(wxObject& object_dest) const;
+    // this function is used to create a copy of the event polymorphically and
+    // all derived classes must implement it because otherwise wxPostEvent()
+    // for them wouldn't work (it needs to do a copy of the event)
+    virtual wxEvent *Clone() const = 0;

 
 public:
     wxObject*         m_eventObject;
 
 public:
     wxObject*         m_eventObject;


@@ -352,10 +371,10 @@ public:
     int               m_id;
     wxObject*         m_callbackUserData;
     bool              m_skipped;
     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;
     bool              m_isCommandEvent;

+
+private:
+    DECLARE_ABSTRACT_CLASS(wxEvent)

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -381,16 +400,8 @@ public:
 
 class WXDLLEXPORT wxCommandEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxCommandEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxCommandEvent)
-

 public:
     wxCommandEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 public:
     wxCommandEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

-    ~wxCommandEvent() {}
-
-    /*
-     * Accessors dependent on context
-     *
-     */

 
     // Set/Get client data from controls
     void SetClientData(void* clientData) { m_clientData = clientData; }
 
     // Set/Get client data from controls
     void SetClientData(void* clientData) { m_clientData = clientData; }


@@ -419,7 +430,7 @@ public:
     void SetInt(int i) { m_commandInt = i; }
     long GetInt() const { return m_commandInt ; }
 
     void SetInt(int i) { m_commandInt = i; }
     long GetInt() const { return m_commandInt ; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxCommandEvent(*this); }

 
 #if WXWIN_COMPATIBILITY_2
     bool Checked() const { return IsChecked(); }
 
 #if WXWIN_COMPATIBILITY_2
     bool Checked() const { return IsChecked(); }


@@ -431,6 +442,9 @@ public:
     long              m_extraLong;     // Additional information (e.g. select/deselect)
     void*             m_clientData;    // Arbitrary client data
     wxClientData*     m_clientObject;  // Arbitrary client object
     long              m_extraLong;     // Additional information (e.g. select/deselect)
     void*             m_clientData;    // Arbitrary client data
     wxClientData*     m_clientObject;  // Arbitrary client object

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCommandEvent)

 };
 
 // this class adds a possibility to react (from the user) code to a control
 };
 
 // this class adds a possibility to react (from the user) code to a control


@@ -450,13 +464,12 @@ public:
     // 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;
+    virtual wxEvent *Clone() const { return new wxNotifyEvent(*this); }

 
 private:
     bool m_bAllow;
 
 
 private:
     bool m_bAllow;
 

+private:

     DECLARE_DYNAMIC_CLASS(wxNotifyEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxNotifyEvent)
 };
 


@@ -475,22 +488,19 @@ private:
 
 class WXDLLEXPORT wxScrollEvent : public wxCommandEvent
 {
 
 class WXDLLEXPORT wxScrollEvent : public wxCommandEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxScrollEvent)
-

 public:
     wxScrollEvent(wxEventType commandType = wxEVT_NULL,
                   int id = 0, int pos = 0, int orient = 0);
 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; }
 
     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; }

+
+    virtual wxEvent *Clone() const { return new wxScrollEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxScrollEvent)

 };
 
 // ScrollWin event class, derived fom wxEvent. wxScrollWinEvents
 };
 
 // ScrollWin event class, derived fom wxEvent. wxScrollWinEvents


@@ -511,23 +521,19 @@ class WXDLLEXPORT wxScrollWinEvent : public wxEvent
 public:
     wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
                      int pos = 0, int orient = 0);
 public:
     wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
                      int pos = 0, int orient = 0);

-    ~wxScrollWinEvent() {}
-
-    /*
-     * 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; }
 
 
     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;
+    virtual wxEvent *Clone() const { return new wxScrollWinEvent(*this); }

 
 public:
 
 public:

-    int               m_commandInt;    // Additional information
+    int               m_commandInt;

     long              m_extraLong;
 
     long              m_extraLong;
 

+private:

     DECLARE_DYNAMIC_CLASS(wxScrollWinEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxScrollWinEvent)
 };
 


@@ -692,8 +698,7 @@ public:
     // wheel action.  Defaults to one.
     int GetLinesPerAction() const { return m_linesPerAction; }
 
     // wheel action.  Defaults to one.
     int GetLinesPerAction() const { return m_linesPerAction; }
 

-
-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxMouseEvent(*this); }

 
 public:
     wxCoord m_x, m_y;
 
 public:
     wxCoord m_x, m_y;


@@ -724,7 +729,7 @@ private:
 class WXDLLEXPORT wxSetCursorEvent : public wxEvent
 {
 public:
 class WXDLLEXPORT wxSetCursorEvent : public wxEvent
 {
 public:

-    wxSetCursorEvent(wxCoord x, wxCoord y)
+    wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0)

     {
         m_eventType = wxEVT_SET_CURSOR;
 
     {
         m_eventType = wxEVT_SET_CURSOR;
 


@@ -739,9 +744,14 @@ public:
     const wxCursor& GetCursor() const { return m_cursor; }
     bool HasCursor() const { return m_cursor.Ok(); }
 
     const wxCursor& GetCursor() const { return m_cursor; }
     bool HasCursor() const { return m_cursor.Ok(); }
 

+    virtual wxEvent *Clone() const { return new wxSetCursorEvent(*this); }
+

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

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSetCursorEvent)

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


@@ -755,8 +765,6 @@ private:
 
 class WXDLLEXPORT wxKeyEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxKeyEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxKeyEvent)
-

 public:
     wxKeyEvent(wxEventType keyType = wxEVT_NULL);
 
 public:
     wxKeyEvent(wxEventType keyType = wxEVT_NULL);
 


@@ -766,7 +774,10 @@ public:
     bool AltDown() const { return m_altDown; }
     bool ShiftDown() const { return m_shiftDown; }
 
     bool AltDown() const { return m_altDown; }
     bool ShiftDown() const { return m_shiftDown; }
 

-    bool HasModifiers() const { return ControlDown() || AltDown() || MetaDown(); }
+    // exclude MetaDown() from HasModifiers() because NumLock under X is often
+    // configured as mod2 modifier, yet the key events even when it is pressed
+    // should be processed normally, not like Ctrl- or Alt-key
+    bool HasModifiers() const { return ControlDown() || AltDown(); }

 
     // get the key code: an ASCII7 char or an element of wxKeyCode enum
     int GetKeyCode() const { return (int)m_keyCode; }
 
     // get the key code: an ASCII7 char or an element of wxKeyCode enum
     int GetKeyCode() const { return (int)m_keyCode; }


@@ -795,11 +806,29 @@ public:
     // Get Y position
     wxCoord GetY() const { return m_y; }
 
     // Get Y position
     wxCoord GetY() const { return m_y; }
 

-    void CopyObject(wxObject& obj) const;
-

     // deprecated
     long KeyCode() const { return m_keyCode; }
 
     // deprecated
     long KeyCode() const { return m_keyCode; }
 

+    virtual wxEvent *Clone() const { return new wxKeyEvent(*this); }
+
+    // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for
+    // example)
+    wxKeyEvent& operator=(const wxKeyEvent& evt)
+    {
+        m_x = evt.m_x;
+        m_y = evt.m_y;
+
+        m_keyCode = evt.m_keyCode;
+
+        m_controlDown = evt.m_controlDown;
+        m_shiftDown = evt.m_shiftDown;
+        m_altDown = evt.m_altDown;
+        m_metaDown = evt.m_metaDown;
+        m_scanCode = evt.m_scanCode;
+
+        return *this;
+    }
+

 public:
     wxCoord       m_x, m_y;
 
 public:
     wxCoord       m_x, m_y;
 


@@ -810,6 +839,9 @@ public:
     bool          m_altDown;
     bool          m_metaDown;
     bool          m_scanCode;
     bool          m_altDown;
     bool          m_metaDown;
     bool          m_scanCode;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxKeyEvent)

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


@@ -819,11 +851,7 @@ public:
 
 class WXDLLEXPORT wxSizeEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxSizeEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxSizeEvent)
-

 public:
 public:

-    wxSize m_size;
-

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


@@ -831,7 +859,13 @@ public:
 
     wxSize GetSize() const { return m_size; }
 
 
     wxSize GetSize() const { return m_size; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxSizeEvent(*this); }
+
+public:
+    wxSize m_size;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSizeEvent)

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


@@ -842,11 +876,7 @@ public:
 
 class WXDLLEXPORT wxMoveEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxMoveEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxMoveEvent)
-

 public:
 public:

-    wxPoint m_pos;
-

     wxMoveEvent() { m_eventType = wxEVT_MOVE; }
     wxMoveEvent(const wxPoint& pos, int id = 0)
         : m_pos(pos)
     wxMoveEvent() { m_eventType = wxEVT_MOVE; }
     wxMoveEvent(const wxPoint& pos, int id = 0)
         : m_pos(pos)


@@ -854,7 +884,12 @@ public:
 
     wxPoint GetPosition() const { return m_pos; }
 
 
     wxPoint GetPosition() const { return m_pos; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxMoveEvent(*this); }
+
+    wxPoint m_pos;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMoveEvent)

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


@@ -871,8 +906,6 @@ public:
 
 class WXDLLEXPORT wxPaintEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxPaintEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintEvent)
-

 public:
     wxPaintEvent(int Id = 0)
     {
 public:
     wxPaintEvent(int Id = 0)
     {


@@ -891,6 +924,11 @@ public:
         g_isPainting--;
     }
 #endif // debug
         g_isPainting--;
     }
 #endif // debug

+
+    virtual wxEvent *Clone() const { return new wxPaintEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintEvent)

 };
 
 class WXDLLEXPORT wxNcPaintEvent : public wxEvent
 };
 
 class WXDLLEXPORT wxNcPaintEvent : public wxEvent


@@ -898,6 +936,8 @@ class WXDLLEXPORT wxNcPaintEvent : public wxEvent
 public:
     wxNcPaintEvent(int id = 0) : wxEvent(id) { SetEventType(wxEVT_NC_PAINT); }
 
 public:
     wxNcPaintEvent(int id = 0) : wxEvent(id) { SetEventType(wxEVT_NC_PAINT); }
 

+    virtual wxEvent *Clone() const { return new wxNcPaintEvent(*this); }
+

 private:
     DECLARE_DYNAMIC_CLASS(wxNcPaintEvent)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxNcPaintEvent)
 };


@@ -909,16 +949,18 @@ private:
 
 class WXDLLEXPORT wxEraseEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxEraseEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxEraseEvent)
-

 public:
 public:

-    wxDC *m_dc;
-

     wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL)
         { m_eventType = wxEVT_ERASE_BACKGROUND; m_id = Id; m_dc = 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; }
 
     wxDC *GetDC() const { return m_dc; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxEraseEvent(*this); }
+
+    wxDC *m_dc;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxEraseEvent)

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


@@ -933,20 +975,36 @@ public:
     wxFocusEvent(wxEventType type = wxEVT_NULL, int id = 0)
         { m_eventType = type; m_id = id; m_win = NULL; }
 
     wxFocusEvent(wxEventType type = wxEVT_NULL, int id = 0)
         { m_eventType = type; m_id = id; m_win = NULL; }
 

-    // the window associated with this event is the window which had focus
+    // The window associated with this event is the window which had focus

     // before for SET event and the window which will have focus for the KILL
     // before for SET event and the window which will have focus for the KILL

-    // one
-    //
-    // NB: it may be NULL in both cases!
+    // one. NB: it may be NULL in both cases!

     wxWindow *GetWindow() const { return m_win; }
     void SetWindow(wxWindow *win) { m_win = win; }
 
     wxWindow *GetWindow() const { return m_win; }
     void SetWindow(wxWindow *win) { m_win = win; }
 

+    virtual wxEvent *Clone() const { return new wxFocusEvent(*this); }
+

 private:
     wxWindow *m_win;
 
 private:
     wxWindow *m_win;
 

+private:

     DECLARE_DYNAMIC_CLASS(wxFocusEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFocusEvent)
 };
 

+// wxChildFocusEvent notifies the parent that a child has got the focus: unlike
+// wxFocusEvent it is propgated upwards the window chain
+class WXDLLEXPORT wxChildFocusEvent : public wxCommandEvent
+{
+public:
+    wxChildFocusEvent(wxWindow *win = NULL);
+
+    wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
+
+    virtual wxEvent *Clone() const { return new wxChildFocusEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxChildFocusEvent)
+};
+

 // Activate event class
 /*
  wxEVT_ACTIVATE
 // Activate event class
 /*
  wxEVT_ACTIVATE


@@ -955,17 +1013,19 @@ private:
 
 class WXDLLEXPORT wxActivateEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxActivateEvent : public wxEvent
 {

-    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; }
 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; }
 
     bool GetActive() const { return m_active; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxActivateEvent(*this); }

 
 private:
     bool m_active;
 
 private:
     bool m_active;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxActivateEvent)

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


@@ -975,11 +1035,14 @@ private:
 
 class WXDLLEXPORT wxInitDialogEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxInitDialogEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxInitDialogEvent)
-

 public:
     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; }

+
+    virtual wxEvent *Clone() const { return new wxInitDialogEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxInitDialogEvent)

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


@@ -992,17 +1055,19 @@ public:
 
 class WXDLLEXPORT wxMenuEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxMenuEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxMenuEvent)
-

 public:
     wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0)
 public:
     wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0)

-      { m_eventType = type; m_menuId = id; }
+      { m_eventType = type; m_menuId = id; m_id = id; }

 
     int GetMenuId() const { return m_menuId; }
 
 
     int GetMenuId() const { return m_menuId; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxMenuEvent(*this); }
+

 private:
     int m_menuId;
 private:
     int m_menuId;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMenuEvent)

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


@@ -1014,8 +1079,6 @@ private:
 
 class WXDLLEXPORT wxCloseEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxCloseEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxCloseEvent)
-

 public:
     wxCloseEvent(wxEventType type = wxEVT_NULL, int id = 0)
     {
 public:
     wxCloseEvent(wxEventType type = wxEVT_NULL, int id = 0)
     {


@@ -1053,7 +1116,7 @@ public:
     bool GetForce() const { return m_force; }
 #endif
 
     bool GetForce() const { return m_force; }
 #endif
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxCloseEvent(*this); }

 
 protected:
     bool m_loggingOff;
 
 protected:
     bool m_loggingOff;


@@ -1062,6 +1125,10 @@ protected:
 #if WXWIN_COMPATIBILITY
     bool m_force;
 #endif
 #if WXWIN_COMPATIBILITY
     bool m_force;
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCloseEvent)
+

 };
 
 /*
 };
 
 /*


@@ -1077,11 +1144,12 @@ public:
     void SetShow(bool show) { m_show = show; }
     bool GetShow() const { return m_show; }
 
     void SetShow(bool show) { m_show = show; }
     bool GetShow() const { return m_show; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxShowEvent(*this); }

 
 protected:
     bool m_show;
 
 
 protected:
     bool m_show;
 

+private:

     DECLARE_DYNAMIC_CLASS(wxShowEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxShowEvent)
 };
 


@@ -1098,12 +1166,14 @@ public:
     // return true if the frame was iconized, false if restored
     bool Iconized() const { return m_iconized; }
 
     // return true if the frame was iconized, false if restored
     bool Iconized() const { return m_iconized; }
 

+    virtual wxEvent *Clone() const { return new wxIconizeEvent(*this); }
+

 protected:
     bool m_iconized;
 
 protected:
     bool m_iconized;
 

+private:

     DECLARE_DYNAMIC_CLASS(wxIconizeEvent)
 };
     DECLARE_DYNAMIC_CLASS(wxIconizeEvent)
 };

-

 /*
  wxEVT_MAXIMIZE
  */
 /*
  wxEVT_MAXIMIZE
  */


@@ -1114,6 +1184,9 @@ public:
     wxMaximizeEvent(int id = 0)
         { m_eventType = wxEVT_MAXIMIZE; m_id = id; }
 
     wxMaximizeEvent(int id = 0)
         { m_eventType = wxEVT_MAXIMIZE; m_id = id; }
 

+    virtual wxEvent *Clone() const { return new wxMaximizeEvent(*this); }
+
+private:

     DECLARE_DYNAMIC_CLASS(wxMaximizeEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMaximizeEvent)
 };
 


@@ -1138,8 +1211,6 @@ public:
 
 class WXDLLEXPORT wxJoystickEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxJoystickEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxJoystickEvent)
-

 public:
     wxPoint   m_pos;
     int       m_zPosition;
 public:
     wxPoint   m_pos;
     int       m_zPosition;


@@ -1197,7 +1268,10 @@ public:
     { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) ||
             ((m_buttonState & but) == but)); }
 
     { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) ||
             ((m_buttonState & but) == but)); }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxJoystickEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxJoystickEvent)

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


@@ -1207,23 +1281,41 @@ public:
 
 class WXDLLEXPORT wxDropFilesEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxDropFilesEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxDropFilesEvent)
-

 public:
     int       m_noFiles;
     wxPoint   m_pos;
 public:
     int       m_noFiles;
     wxPoint   m_pos;

-    wxString* m_files;        // Memory (de)allocated by code calling ProcessEvent
+    wxString* m_files;

 
     wxDropFilesEvent(wxEventType type = wxEVT_NULL,
                      int noFiles = 0,
                      wxString *files = (wxString *) NULL)
         { m_eventType = type; m_noFiles = noFiles; m_files = files; }
 
 
     wxDropFilesEvent(wxEventType type = wxEVT_NULL,
                      int noFiles = 0,
                      wxString *files = (wxString *) NULL)
         { m_eventType = type; m_noFiles = noFiles; m_files = files; }
 

+    // we need a copy ctor to avoid deleting m_files pointer twice
+    wxDropFilesEvent(const wxDropFilesEvent& other)
+        : m_pos(other.m_pos)
+    {
+        m_noFiles = other.m_noFiles;
+        m_files = new wxString[m_noFiles];
+        for ( int n = 0; n < m_noFiles; n++ )
+        {
+            m_files[n] = other.m_files[n];
+        }
+    }
+
+    virtual ~wxDropFilesEvent()
+    {
+        delete [] m_files;
+    }
+

     wxPoint GetPosition() const { return m_pos; }
     int GetNumberOfFiles() const { return m_noFiles; }
     wxString *GetFiles() const { return m_files; }
 
     wxPoint GetPosition() const { return m_pos; }
     int GetNumberOfFiles() const { return m_noFiles; }
     wxString *GetFiles() const { return m_files; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxDropFilesEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxDropFilesEvent)

 };
 
 // Update UI event
 };
 
 // Update UI event


@@ -1233,8 +1325,6 @@ public:
 
 class WXDLLEXPORT wxUpdateUIEvent : public wxCommandEvent
 {
 
 class WXDLLEXPORT wxUpdateUIEvent : public wxCommandEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)
-

 public:
     wxUpdateUIEvent(wxWindowID commandId = 0)
     {
 public:
     wxUpdateUIEvent(wxWindowID commandId = 0)
     {


@@ -1259,7 +1349,7 @@ public:
     void Enable(bool enable) { m_enabled = enable; m_setEnabled = TRUE; }
     void SetText(const wxString& text) { m_text = text; m_setText = 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;
+    virtual wxEvent *Clone() const { return new wxUpdateUIEvent(*this); }

 
 protected:
     bool          m_checked;
 
 protected:
     bool          m_checked;


@@ -1268,6 +1358,9 @@ protected:
     bool          m_setText;
     bool          m_setChecked;
     wxString      m_text;
     bool          m_setText;
     bool          m_setChecked;
     wxString      m_text;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxUpdateUIEvent)

 };
 
 /*
 };
 
 /*


@@ -1277,11 +1370,14 @@ protected:
 // TODO: shouldn't all events record the window ID?
 class WXDLLEXPORT wxSysColourChangedEvent : public wxEvent
 {
 // TODO: shouldn't all events record the window ID?
 class WXDLLEXPORT wxSysColourChangedEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxSysColourChangedEvent)
-

 public:
     wxSysColourChangedEvent()
         { m_eventType = wxEVT_SYS_COLOUR_CHANGED; }
 public:
     wxSysColourChangedEvent()
         { m_eventType = wxEVT_SYS_COLOUR_CHANGED; }

+
+    virtual wxEvent *Clone() const { return new wxSysColourChangedEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSysColourChangedEvent)

 };
 
 /*
 };
 
 /*


@@ -1290,8 +1386,6 @@ public:
 
 class WXDLLEXPORT wxPaletteChangedEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxPaletteChangedEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxPaletteChangedEvent)
-

 public:
     wxPaletteChangedEvent(wxWindowID id = 0) : wxEvent(id)
     {
 public:
     wxPaletteChangedEvent(wxWindowID id = 0) : wxEvent(id)
     {


@@ -1302,10 +1396,13 @@ public:
     void SetChangedWindow(wxWindow* win) { m_changedWindow = win; }
     wxWindow* GetChangedWindow() const { return m_changedWindow; }
 
     void SetChangedWindow(wxWindow* win) { m_changedWindow = win; }
     wxWindow* GetChangedWindow() const { return m_changedWindow; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxPaletteChangedEvent(*this); }

 
 protected:
     wxWindow*     m_changedWindow;
 
 protected:
     wxWindow*     m_changedWindow;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPaletteChangedEvent)

 };
 
 /*
 };
 
 /*


@@ -1315,8 +1412,6 @@ protected:
 
 class WXDLLEXPORT wxQueryNewPaletteEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxQueryNewPaletteEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxQueryNewPaletteEvent)
-

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


@@ -1325,10 +1420,13 @@ public:
     void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
     bool GetPaletteRealized() const { return m_paletteRealized; }
 
     void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
     bool GetPaletteRealized() const { return m_paletteRealized; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxQueryNewPaletteEvent(*this); }

 
 protected:
     bool m_paletteRealized;
 
 protected:
     bool m_paletteRealized;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxQueryNewPaletteEvent)

 };
 
 /*
 };
 
 /*


@@ -1373,6 +1471,8 @@ public:
     wxWindow* GetCurrentFocus() const { return m_focus; }
     void SetCurrentFocus(wxWindow *win) { m_focus = win; }
 
     wxWindow* GetCurrentFocus() const { return m_focus; }
     void SetCurrentFocus(wxWindow *win) { m_focus = win; }
 

+    virtual wxEvent *Clone() const { return new wxNavigationKeyEvent(*this); }
+

 private:
     enum
     {
 private:
     enum
     {


@@ -1384,6 +1484,7 @@ private:
     long m_flags;
     wxWindow *m_focus;
 
     long m_flags;
     wxWindow *m_focus;
 

+private:

     DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)
 };
 


@@ -1399,22 +1500,28 @@ private:
 
 class WXDLLEXPORT wxWindowCreateEvent : public wxCommandEvent
 {
 
 class WXDLLEXPORT wxWindowCreateEvent : public wxCommandEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowCreateEvent)
-

 public:
     wxWindowCreateEvent(wxWindow *win = NULL);
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
 public:
     wxWindowCreateEvent(wxWindow *win = NULL);
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }

+
+    virtual wxEvent *Clone() const { return new wxWindowCreateEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowCreateEvent)

 };
 
 class WXDLLEXPORT wxWindowDestroyEvent : public wxCommandEvent
 {
 };
 
 class WXDLLEXPORT wxWindowDestroyEvent : public wxCommandEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDestroyEvent)
-

 public:
     wxWindowDestroyEvent(wxWindow *win = NULL);
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
 public:
     wxWindowDestroyEvent(wxWindow *win = NULL);
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }

+
+    virtual wxEvent *Clone() const { return new wxWindowDestroyEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowDestroyEvent)

 };
 
 // A help event is sent when the user clicks on a window in context-help mode.
 };
 
 // A help event is sent when the user clicks on a window in context-help mode.


@@ -1447,6 +1554,8 @@ public:
     const wxString& GetTarget() const { return m_target; }
     void SetTarget(const wxString& target) { m_target = target; }
 
     const wxString& GetTarget() const { return m_target; }
     void SetTarget(const wxString& target) { m_target = target; }
 

+    virtual wxEvent *Clone() const { return new wxHelpEvent(*this); }
+

 protected:
     wxPoint   m_pos;
     wxString  m_target;
 protected:
     wxPoint   m_pos;
     wxString  m_target;


@@ -1480,6 +1589,8 @@ public:
     const wxPoint& GetPosition() const { return m_pos; }
     void SetPosition(const wxPoint& pos) { m_pos = pos; }
 
     const wxPoint& GetPosition() const { return m_pos; }
     void SetPosition(const wxPoint& pos) { m_pos = pos; }
 

+    virtual wxEvent *Clone() const { return new wxContextMenuEvent(*this); }
+

 protected:
     wxPoint   m_pos;
 
 protected:
     wxPoint   m_pos;
 


@@ -1487,8 +1598,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxContextMenuEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxContextMenuEvent)
 };
 

-#endif // wxUSE_GUI
-

 // Idle event
 /*
  wxEVT_IDLE
 // Idle event
 /*
  wxEVT_IDLE


@@ -1496,8 +1605,6 @@ private:
 
 class WXDLLEXPORT wxIdleEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxIdleEvent : public wxEvent
 {

-    DECLARE_DYNAMIC_CLASS(wxIdleEvent)
-

 public:
     wxIdleEvent()
         { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }
 public:
     wxIdleEvent()
         { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }


@@ -1505,12 +1612,17 @@ public:
     void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
     bool MoreRequested() const { return m_requestMore; }
 
     void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
     bool MoreRequested() const { return m_requestMore; }
 

-    void CopyObject(wxObject& obj) const;
+    virtual wxEvent *Clone() const { return new wxIdleEvent(*this); }

 
 protected:
     bool m_requestMore;
 
 protected:
     bool m_requestMore;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxIdleEvent)

 };
 
 };
 

+#endif // wxUSE_GUI
+

 /* TODO
  wxEVT_POWER,
  wxEVT_MOUSE_CAPTURE_CHANGED,
 /* TODO
  wxEVT_POWER,
  wxEVT_MOUSE_CAPTURE_CHANGED,


@@ -1522,6 +1634,7 @@ protected:
  wxEVT_COMPARE_ITEM
 */
 
  wxEVT_COMPARE_ITEM
 */
 

+

 // ============================================================================
 // event handler and related classes
 // ============================================================================
 // ============================================================================
 // event handler and related classes
 // ============================================================================


@@ -1671,6 +1784,15 @@ public:
                   wxObject *userData = (wxObject *) NULL )
         { return Disconnect(id, -1, eventType, func, userData); }
 
                   wxObject *userData = (wxObject *) NULL )
         { return Disconnect(id, -1, eventType, func, userData); }
 

+
+    // User data can be associated with each wxEvtHandler
+    void SetClientObject( wxClientData *data ) { DoSetClientObject(data); }
+    wxClientData *GetClientObject() const { return DoGetClientObject(); }
+
+    void SetClientData( void *data ) { DoSetClientData(data); }
+    void *GetClientData() const { return DoGetClientData(); }
+
+

     // implementation from now on
     virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
     bool SearchDynamicEventTable( wxEvent& event );
     // implementation from now on
     virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
     bool SearchDynamicEventTable( wxEvent& event );


@@ -1731,6 +1853,29 @@ protected:
     // Is event handler enabled?
     bool                m_enabled;
 
     // Is event handler enabled?
     bool                m_enabled;
 

+
+    // The user data: either an object which will be deleted by the container
+    // when it's deleted or some raw pointer which we do nothing with - only
+    // one type of data can be used with the given window (i.e. you cannot set
+    // the void data and then associate the container with wxClientData or vice
+    // versa)
+    union
+    {
+        wxClientData *m_clientObject;
+        void         *m_clientData;
+    };
+
+    // what kind of data do we have?
+    wxClientDataType m_clientDataType;
+
+    // client data accessors
+    virtual void DoSetClientObject( wxClientData *data );
+    virtual wxClientData *DoGetClientObject() const;
+
+    virtual void DoSetClientData( void *data );
+    virtual void *DoGetClientData() const;
+
+

 private:
     DECLARE_DYNAMIC_CLASS(wxEvtHandler)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxEvtHandler)
 };


@@ -1747,6 +1892,7 @@ typedef void (wxEvtHandler::*wxEraseEventFunction)(wxEraseEvent&);
 typedef void (wxEvtHandler::*wxMouseEventFunction)(wxMouseEvent&);
 typedef void (wxEvtHandler::*wxCharEventFunction)(wxKeyEvent&);
 typedef void (wxEvtHandler::*wxFocusEventFunction)(wxFocusEvent&);
 typedef void (wxEvtHandler::*wxMouseEventFunction)(wxMouseEvent&);
 typedef void (wxEvtHandler::*wxCharEventFunction)(wxKeyEvent&);
 typedef void (wxEvtHandler::*wxFocusEventFunction)(wxFocusEvent&);

+typedef void (wxEvtHandler::*wxChildFocusEventFunction)(wxChildFocusEvent&);

 typedef void (wxEvtHandler::*wxActivateEventFunction)(wxActivateEvent&);
 typedef void (wxEvtHandler::*wxMenuEventFunction)(wxMenuEvent&);
 typedef void (wxEvtHandler::*wxJoystickEventFunction)(wxJoystickEvent&);
 typedef void (wxEvtHandler::*wxActivateEventFunction)(wxActivateEvent&);
 typedef void (wxEvtHandler::*wxMenuEventFunction)(wxMenuEvent&);
 typedef void (wxEvtHandler::*wxJoystickEventFunction)(wxJoystickEvent&);


@@ -1814,6 +1960,7 @@ typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);
 #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_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_CHILD_FOCUS(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_CHILD_FOCUS, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxChildFocusEventFunction) & 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_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 ),