A few tweaks and cleanups

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 17636578447ba1444a8f7720c317e3d92989ba90..d4aa880a672b680962c36dafcf0049b739eebb3e 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();


@@ -222,26 +224,27 @@ BEGIN_DECLARE_EVENT_TYPES()
     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_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_OPEN, 420)
+    DECLARE_EVENT_TYPE(wxEVT_MENU_CLOSE, 421)

     DECLARE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT, 422)
     DECLARE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT, 422)

-    DECLARE_EVENT_TYPE(wxEVT_POPUP_MENU_INIT, 423)
+    // DECLARE_EVENT_TYPE(wxEVT_POPUP_MENU_INIT, 423) -- free slot

     DECLARE_EVENT_TYPE(wxEVT_CONTEXT_MENU, 424)
     DECLARE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED, 425)
     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)
+    DECLARE_EVENT_TYPE(wxEVT_DISPLAY_CHANGED, 426)
+    DECLARE_EVENT_TYPE(wxEVT_SETTING_CHANGED, 427)
+    DECLARE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE, 428)
+    DECLARE_EVENT_TYPE(wxEVT_PALETTE_CHANGED, 429)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_BUTTON_DOWN, 430)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_BUTTON_UP, 431)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_MOVE, 432)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_ZMOVE, 433)
+    DECLARE_EVENT_TYPE(wxEVT_DROP_FILES, 434)
+    DECLARE_EVENT_TYPE(wxEVT_DRAW_ITEM, 435)
+    DECLARE_EVENT_TYPE(wxEVT_MEASURE_ITEM, 436)
+    DECLARE_EVENT_TYPE(wxEVT_COMPARE_ITEM, 437)
+    DECLARE_EVENT_TYPE(wxEVT_INIT_DIALOG, 438)
+    DECLARE_EVENT_TYPE(wxEVT_IDLE, 439)
+    DECLARE_EVENT_TYPE(wxEVT_UPDATE_UI, 440)

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


@@ -331,11 +334,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; }


@@ -353,11 +356,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;


@@ -366,10 +372,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


@@ -395,16 +401,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; }


@@ -433,7 +431,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(); }


@@ -445,6 +443,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


@@ -464,13 +465,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)
 };
 


@@ -489,22 +489,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


@@ -525,23 +522,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)
 };
 


@@ -706,8 +699,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;


@@ -738,7 +730,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;
 


@@ -753,9 +745,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


@@ -769,8 +766,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);
 


@@ -788,6 +783,12 @@ public:
     // 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; }
 

+    // get the raw key code (platform-dependent)
+    wxUint32 GetRawKeyCode() const { return m_rawCode; }
+
+    // get the raw key flags (platform-dependent)
+    wxUint32 GetRawKeyFlags() const { return m_rawFlags; }
+

     // Find the position of the event
     void GetPosition(wxCoord *xpos, wxCoord *ypos) const
     {
     // Find the position of the event
     void GetPosition(wxCoord *xpos, wxCoord *ypos) const
     {


@@ -812,11 +813,31 @@ 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;
+        m_rawCode = evt.m_rawCode;
+        m_rawFlags = evt.m_rawFlags;
+
+        return *this;
+    }
+

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


@@ -827,6 +848,14 @@ public:
     bool          m_altDown;
     bool          m_metaDown;
     bool          m_scanCode;
     bool          m_altDown;
     bool          m_metaDown;
     bool          m_scanCode;

+
+    // these fields contain the platform-specific information about the pressed
+    // key
+    wxUint32      m_rawCode;
+    wxUint32      m_rawFlags;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxKeyEvent)

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


@@ -836,11 +865,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)


@@ -848,7 +873,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


@@ -859,11 +890,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)


@@ -871,7 +898,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


@@ -888,8 +920,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)
     {


@@ -908,6 +938,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


@@ -915,6 +950,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)
 };


@@ -926,16 +963,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


@@ -950,17 +989,18 @@ 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)
 };
 


@@ -973,6 +1013,9 @@ public:
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
 
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
 

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

     DECLARE_DYNAMIC_CLASS(wxChildFocusEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxChildFocusEvent)
 };
 


@@ -984,17 +1027,19 @@ public:
 
 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


@@ -1004,34 +1049,42 @@ 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
 /*

- wxEVT_MENU_CHAR,
- wxEVT_MENU_INIT,
+ wxEVT_MENU_OPEN,
+ wxEVT_MENU_CLOSE,

  wxEVT_MENU_HIGHLIGHT,
  wxEVT_MENU_HIGHLIGHT,

- wxEVT_POPUP_MENU_INIT,

 */
 
 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; }
+        : wxEvent(id, type)
+        { m_menuId = id; }

 
 

+    // only for wxEVT_MENU_HIGHLIGHT

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

-    void CopyObject(wxObject& obj) const;
+    // only for wxEVT_MENU_OPEN/CLOSE
+    bool IsPopup() const { return m_menuId == -1; }
+
+    virtual wxEvent *Clone() const { return new wxMenuEvent(*this); }
+

 private:
     int m_menuId;
 private:
     int m_menuId;

+
+    DECLARE_DYNAMIC_CLASS(wxMenuEvent)

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


@@ -1043,8 +1096,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)
     {


@@ -1082,7 +1133,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;


@@ -1091,6 +1142,10 @@ protected:
 #if WXWIN_COMPATIBILITY
     bool m_force;
 #endif
 #if WXWIN_COMPATIBILITY
     bool m_force;
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCloseEvent)
+

 };
 
 /*
 };
 
 /*


@@ -1106,11 +1161,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)
 };
 


@@ -1127,12 +1183,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
  */


@@ -1143,6 +1201,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)
 };
 


@@ -1167,8 +1228,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;


@@ -1226,7 +1285,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


@@ -1236,23 +1298,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


@@ -1262,8 +1342,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)
     {


@@ -1288,7 +1366,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;


@@ -1297,6 +1375,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)

 };
 
 /*
 };
 
 /*


@@ -1306,11 +1387,50 @@ 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)
+};
+
+/*
+ wxEVT_MOUSE_CAPTURE_CHANGED
+ The window losing the capture receives this message
+ (even if it released the capture itself).
+ */
+
+class WXDLLEXPORT wxMouseCaptureChangedEvent : public wxEvent
+{
+public:
+    wxMouseCaptureChangedEvent(wxWindowID id = 0, wxWindow* gainedCapture = NULL): wxEvent(id)
+        { m_eventType = wxEVT_MOUSE_CAPTURE_CHANGED; m_gainedCapture = gainedCapture; }
+
+    virtual wxEvent *Clone() const { return new wxMouseCaptureChangedEvent(*this); }
+
+    wxWindow* GetCapturedWindow() const { return m_gainedCapture; };
+
+private:
+    wxWindow* m_gainedCapture;
+    DECLARE_DYNAMIC_CLASS(wxMouseCaptureChangedEvent)
+};
+
+/*
+ wxEVT_DISPLAY_CHANGED
+ */
+class WXDLLEXPORT wxDisplayChangedEvent : public wxEvent
+{
+private:
+    DECLARE_DYNAMIC_CLASS(wxDisplayChangedEvent)
+
+public:
+    wxDisplayChangedEvent()
+        { m_eventType = wxEVT_DISPLAY_CHANGED; }
+
+    virtual wxEvent *Clone() const { return new wxDisplayChangedEvent(*this); }

 };
 
 /*
 };
 
 /*


@@ -1319,8 +1439,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)
     {


@@ -1331,10 +1449,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)

 };
 
 /*
 };
 
 /*


@@ -1344,8 +1465,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; }


@@ -1354,10 +1473,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)

 };
 
 /*
 };
 
 /*


@@ -1402,6 +1524,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
     {


@@ -1413,6 +1537,7 @@ private:
     long m_flags;
     wxWindow *m_focus;
 
     long m_flags;
     wxWindow *m_focus;
 

+private:

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


@@ -1428,22 +1553,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.


@@ -1476,6 +1607,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;


@@ -1509,6 +1642,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;
 


@@ -1523,8 +1658,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; }


@@ -1532,10 +1665,13 @@ 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
 };
 
 #endif // wxUSE_GUI


@@ -1551,6 +1687,7 @@ protected:
  wxEVT_COMPARE_ITEM
 */
 
  wxEVT_COMPARE_ITEM
 */
 

+

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


@@ -1700,6 +1837,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 );


@@ -1760,7 +1906,30 @@ 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:
 private:

+    DECLARE_NO_COPY_CLASS(wxEvtHandler)

     DECLARE_DYNAMIC_CLASS(wxEvtHandler)
 };
 
     DECLARE_DYNAMIC_CLASS(wxEvtHandler)
 };
 


@@ -1783,6 +1952,7 @@ typedef void (wxEvtHandler::*wxJoystickEventFunction)(wxJoystickEvent&);
 typedef void (wxEvtHandler::*wxDropFilesEventFunction)(wxDropFilesEvent&);
 typedef void (wxEvtHandler::*wxInitDialogEventFunction)(wxInitDialogEvent&);
 typedef void (wxEvtHandler::*wxSysColourChangedFunction)(wxSysColourChangedEvent&);
 typedef void (wxEvtHandler::*wxDropFilesEventFunction)(wxDropFilesEvent&);
 typedef void (wxEvtHandler::*wxInitDialogEventFunction)(wxInitDialogEvent&);
 typedef void (wxEvtHandler::*wxSysColourChangedFunction)(wxSysColourChangedEvent&);

+typedef void (wxEvtHandler::*wxDisplayChangedFunction)(wxDisplayChangedEvent&);

 typedef void (wxEvtHandler::*wxUpdateUIEventFunction)(wxUpdateUIEvent&);
 typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&);
 typedef void (wxEvtHandler::*wxCloseEventFunction)(wxCloseEvent&);
 typedef void (wxEvtHandler::*wxUpdateUIEventFunction)(wxUpdateUIEvent&);
 typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&);
 typedef void (wxEvtHandler::*wxCloseEventFunction)(wxCloseEvent&);


@@ -1798,6 +1968,7 @@ typedef void (wxEvtHandler::*wxSetCursorEventFunction)(wxSetCursorEvent&);
 typedef void (wxEvtHandler::*wxNotifyEventFunction)(wxNotifyEvent&);
 typedef void (wxEvtHandler::*wxHelpEventFunction)(wxHelpEvent&);
 typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);
 typedef void (wxEvtHandler::*wxNotifyEventFunction)(wxNotifyEvent&);
 typedef void (wxEvtHandler::*wxHelpEventFunction)(wxHelpEvent&);
 typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);

+typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureChangedEvent&);

 #endif // wxUSE_GUI
 
 // N.B. In GNU-WIN32, you *have* to take the address of a member function
 #endif // wxUSE_GUI
 
 // N.B. In GNU-WIN32, you *have* to take the address of a member function


@@ -1840,6 +2011,8 @@ typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);
 #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_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_OPEN(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_MENU_OPEN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, (wxObject *) NULL ),
+#define EVT_MENU_CLOSE(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_MENU_CLOSE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMenuEventFunction) & func, (wxObject *) 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_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 ),


@@ -1852,6 +2025,7 @@ typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);
 #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_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_DISPLAY_CHANGED(func)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_DISPLAY_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxDisplayChangedFunction) & 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_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 ),


@@ -1861,6 +2035,7 @@ typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);
 #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 ),
 #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 ),

+#define EVT_MOUSE_CAPTURE_CHANGED(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MOUSE_CAPTURE_CHANGED, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseCaptureChangedEventFunction) & func, (wxObject *) NULL ),

 
 // Mouse events
 #define EVT_LEFT_DOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),
 
 // Mouse events
 #define EVT_LEFT_DOWN(func) DECLARE_EVENT_TABLE_ENTRY( wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL ),