added wxCRITICAL_SECTION macro

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 49c7f58471e7559786b9db8462464d8cf230d220..17d965ceabf820ebbd8225ef1dc84db37dffa710 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -224,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


@@ -333,6 +334,9 @@ END_DECLARE_EVENT_TYPES()
 
 class WXDLLEXPORT wxEvent : public wxObject
 {
 
 class WXDLLEXPORT wxEvent : public wxObject
 {

+private:
+    wxEvent& operator=(const wxEvent&);
+

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


@@ -359,8 +363,10 @@ public:
     // exists only for optimization purposes.
     bool IsCommandEvent() const { return m_isCommandEvent; }
 
     // exists only for optimization purposes.
     bool IsCommandEvent() const { return m_isCommandEvent; }
 

-    // specialized clone function since it is done a lot
-    virtual wxEvent *Clone() const { return new wxEvent(*this); }
+    // 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;


@@ -372,9 +378,6 @@ public:
     bool              m_isCommandEvent;
 
 private:
     bool              m_isCommandEvent;
 
 private:

-    // normally copying the events is a bad idea, so disable this
-    wxEvent& operator=(const wxEvent&);
-

     DECLARE_ABSTRACT_CLASS(wxEvent)
 };
 
     DECLARE_ABSTRACT_CLASS(wxEvent)
 };
 


@@ -401,9 +404,21 @@ private:
 
 class WXDLLEXPORT wxCommandEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxCommandEvent : public wxEvent
 {

+private:
+    wxCommandEvent& operator=(const wxCommandEvent& event);
+

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

+    wxCommandEvent(const wxCommandEvent& event)
+        : wxEvent(event)
+        , m_commandString(event.m_commandString)
+        , m_commandInt(event.m_commandInt)
+        , m_extraLong(event.m_extraLong)
+        , m_clientData(event.m_clientData)
+        , m_clientObject(event.m_clientObject)
+        { }
+

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


@@ -454,7 +469,14 @@ class WXDLLEXPORT wxNotifyEvent  : public wxCommandEvent
 {
 public:
     wxNotifyEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
 {
 public:
     wxNotifyEvent(wxEventType commandType = wxEVT_NULL, int id = 0)

-                : wxCommandEvent(commandType, id) { m_bAllow = TRUE; }
+        : wxCommandEvent(commandType, id)
+        , m_bAllow(TRUE)
+        { }
+
+    wxNotifyEvent(const wxNotifyEvent& event)
+        : wxCommandEvent(event)
+        , m_bAllow(event.m_bAllow)
+        { }

 
     // veto the operation (usually it's allowed by default)
     void Veto() { m_bAllow = FALSE; }
 
     // veto the operation (usually it's allowed by default)
     void Veto() { m_bAllow = FALSE; }


@@ -571,6 +593,10 @@ class WXDLLEXPORT wxMouseEvent : public wxEvent
 {
 public:
     wxMouseEvent(wxEventType mouseType = wxEVT_NULL);
 {
 public:
     wxMouseEvent(wxEventType mouseType = wxEVT_NULL);

+    wxMouseEvent(const wxMouseEvent& event) { Assign(event); }
+
+    wxMouseEvent& operator=(const wxMouseEvent& event)
+        { Assign(event); return *this; }

 
     // Was it a button event? (*doesn't* mean: is any button *down*?)
     bool IsButton() const { return Button(-1); }
 
     // Was it a button event? (*doesn't* mean: is any button *down*?)
     bool IsButton() const { return Button(-1); }


@@ -717,6 +743,9 @@ public:
     int           m_wheelDelta;
     int           m_linesPerAction;
 
     int           m_wheelDelta;
     int           m_linesPerAction;
 

+protected:
+    void Assign(const wxMouseEvent& evt);
+

 private:
     DECLARE_DYNAMIC_CLASS(wxMouseEvent)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxMouseEvent)
 };


@@ -731,12 +760,9 @@ class WXDLLEXPORT wxSetCursorEvent : public wxEvent
 {
 public:
     wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0)
 {
 public:
     wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0)

-    {
-        m_eventType = wxEVT_SET_CURSOR;
-
-        m_x = x;
-        m_y = y;
-    }
+        : wxEvent(0, wxEVT_SET_CURSOR)
+        , m_x(x), m_y(y), m_cursor()
+        { }

 
     wxCoord GetX() const { return m_x; }
     wxCoord GetY() const { return m_y; }
 
     wxCoord GetX() const { return m_x; }
     wxCoord GetY() const { return m_y; }


@@ -783,6 +809,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
     {


@@ -826,6 +858,8 @@ public:
         m_altDown = evt.m_altDown;
         m_metaDown = evt.m_metaDown;
         m_scanCode = evt.m_scanCode;
         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;
     }
 
         return *this;
     }


@@ -841,6 +875,11 @@ public:
     bool          m_metaDown;
     bool          m_scanCode;
 
     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)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxKeyEvent)
 };


@@ -853,10 +892,14 @@ private:
 class WXDLLEXPORT wxSizeEvent : public wxEvent
 {
 public:
 class WXDLLEXPORT wxSizeEvent : public wxEvent
 {
 public:

-    wxSizeEvent() { m_eventType = wxEVT_SIZE; }
+    wxSizeEvent()
+        : wxEvent(0, wxEVT_SIZE)
+        , m_size()
+        { }

     wxSizeEvent(const wxSize& sz, int id = 0)
     wxSizeEvent(const wxSize& sz, int id = 0)

-        : m_size(sz)
-        { m_eventType = wxEVT_SIZE; m_id = id; }
+        : wxEvent(id, wxEVT_SIZE)
+        , m_size(sz)
+        { }

 
     wxSize GetSize() const { return m_size; }
 
 
     wxSize GetSize() const { return m_size; }
 


@@ -878,10 +921,14 @@ private:
 class WXDLLEXPORT wxMoveEvent : public wxEvent
 {
 public:
 class WXDLLEXPORT wxMoveEvent : public wxEvent
 {
 public:

-    wxMoveEvent() { m_eventType = wxEVT_MOVE; }
+    wxMoveEvent()
+        : wxEvent(0, wxEVT_MOVE)
+        , m_pos()
+        { }

     wxMoveEvent(const wxPoint& pos, int id = 0)
     wxMoveEvent(const wxPoint& pos, int id = 0)

-        : m_pos(pos)
-        { m_eventType = wxEVT_MOVE; m_id = id; }
+        : wxEvent(id, wxEVT_MOVE)
+        , m_pos(pos)
+        { }

 
     wxPoint GetPosition() const { return m_pos; }
 
 
     wxPoint GetPosition() const { return m_pos; }
 


@@ -909,10 +956,8 @@ class WXDLLEXPORT wxPaintEvent : public wxEvent
 {
 public:
     wxPaintEvent(int Id = 0)
 {
 public:
     wxPaintEvent(int Id = 0)

+        : wxEvent(Id, wxEVT_PAINT)

     {
     {

-        m_eventType = wxEVT_PAINT;
-        m_id = Id;
-

 #if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
         // set the internal flag for the duration of processing of WM_PAINT
         g_isPainting++;
 #if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
         // set the internal flag for the duration of processing of WM_PAINT
         g_isPainting++;


@@ -935,7 +980,9 @@ private:
 class WXDLLEXPORT wxNcPaintEvent : public wxEvent
 {
 public:
 class WXDLLEXPORT wxNcPaintEvent : public wxEvent
 {
 public:

-    wxNcPaintEvent(int id = 0) : wxEvent(id) { SetEventType(wxEVT_NC_PAINT); }
+    wxNcPaintEvent(int id = 0)
+        : wxEvent(id, wxEVT_NC_PAINT)
+        { }

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


@@ -950,9 +997,19 @@ private:
 
 class WXDLLEXPORT wxEraseEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxEraseEvent : public wxEvent
 {

+private:
+    wxEraseEvent& operator=(const wxEraseEvent& event);
+

 public:
     wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL)
 public:
     wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL)

-        { m_eventType = wxEVT_ERASE_BACKGROUND; m_id = Id; m_dc = dc; }
+        : wxEvent(Id, wxEVT_ERASE_BACKGROUND)
+        , m_dc(dc)
+        { }
+
+    wxEraseEvent(const wxEraseEvent& event)
+        : wxEvent(event)
+        , m_dc(event.m_dc)
+        { }

 
     wxDC *GetDC() const { return m_dc; }
 
 
     wxDC *GetDC() const { return m_dc; }
 


@@ -972,9 +1029,19 @@ private:
 
 class WXDLLEXPORT wxFocusEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxFocusEvent : public wxEvent
 {

+private:
+    wxFocusEvent& operator=(const wxFocusEvent& event);
+

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

-        { m_eventType = type; m_id = id; m_win = NULL; }
+        : wxEvent(id, type)
+        , m_win(NULL)
+        { }
+
+    wxFocusEvent(const wxFocusEvent& event)
+        : wxEvent(event)
+        , m_win(event.m_win)
+        { }

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


@@ -1016,7 +1083,9 @@ class WXDLLEXPORT wxActivateEvent : public wxEvent
 {
 public:
     wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = TRUE, int Id = 0)
 {
 public:
     wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = TRUE, int Id = 0)

-        { m_eventType = type; m_active = active; m_id = Id; }
+        : wxEvent(Id, type)
+        , m_active(active)
+        { }

 
     bool GetActive() const { return m_active; }
 
 
     bool GetActive() const { return m_active; }
 


@@ -1038,7 +1107,8 @@ class WXDLLEXPORT wxInitDialogEvent : public wxEvent
 {
 public:
     wxInitDialogEvent(int Id = 0)
 {
 public:
     wxInitDialogEvent(int Id = 0)

-        { m_eventType = wxEVT_INIT_DIALOG; m_id = Id; }
+        : wxEvent(Id, wxEVT_INIT_DIALOG)
+        { }

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


@@ -1048,26 +1118,30 @@ private:
 
 // 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
 {
 public:
     wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0)
 */
 
 class WXDLLEXPORT wxMenuEvent : public wxEvent
 {
 public:
     wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0)

-      { m_eventType = type; m_menuId = id; m_id = id; }
+        : wxEvent(id, type)
+        , m_menuId(id)
+        { }

 
 

+    // only for wxEVT_MENU_HIGHLIGHT

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

+    // 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;
 
     virtual wxEvent *Clone() const { return new wxMenuEvent(*this); }
 
 private:
     int m_menuId;
 

-private:

     DECLARE_DYNAMIC_CLASS(wxMenuEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMenuEvent)
 };
 


@@ -1082,16 +1156,14 @@ class WXDLLEXPORT wxCloseEvent : public wxEvent
 {
 public:
     wxCloseEvent(wxEventType type = wxEVT_NULL, int id = 0)
 {
 public:
     wxCloseEvent(wxEventType type = wxEVT_NULL, int id = 0)

-    {
-        m_eventType = type;
-        m_loggingOff = TRUE;
-        m_veto = FALSE;         // should be FALSE by default
-        m_id = id;
+        : wxEvent(id, type)
+        , m_loggingOff(TRUE)
+        , m_veto(FALSE)      // should be FALSE by default
+        , m_canVeto(TRUE)

 #if WXWIN_COMPATIBILITY
 #if WXWIN_COMPATIBILITY

-        m_force = FALSE;
+        , m_force(FALSE)

 #endif // WXWIN_COMPATIBILITY
 #endif // WXWIN_COMPATIBILITY

-        m_canVeto = TRUE;
-    }
+    { }

 
     void SetLoggingOff(bool logOff) { m_loggingOff = logOff; }
     bool GetLoggingOff() const { return m_loggingOff; }
 
     void SetLoggingOff(bool logOff) { m_loggingOff = logOff; }
     bool GetLoggingOff() const { return m_loggingOff; }


@@ -1140,7 +1212,9 @@ class WXDLLEXPORT wxShowEvent : public wxEvent
 {
 public:
     wxShowEvent(int id = 0, bool show = FALSE)
 {
 public:
     wxShowEvent(int id = 0, bool show = FALSE)

-        { m_eventType = wxEVT_SHOW; m_id = id; m_show = show; }
+        : wxEvent(id, wxEVT_SHOW)
+        , m_show(show)
+        { }

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


@@ -1162,7 +1236,9 @@ class WXDLLEXPORT wxIconizeEvent : public wxEvent
 {
 public:
     wxIconizeEvent(int id = 0, bool iconized = TRUE)
 {
 public:
     wxIconizeEvent(int id = 0, bool iconized = TRUE)

-        { m_eventType = wxEVT_ICONIZE; m_id = id; m_iconized = iconized; }
+        : wxEvent(id, wxEVT_ICONIZE)
+        , m_iconized(iconized)
+        { }

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


@@ -1183,7 +1259,8 @@ class WXDLLEXPORT wxMaximizeEvent : public wxEvent
 {
 public:
     wxMaximizeEvent(int id = 0)
 {
 public:
     wxMaximizeEvent(int id = 0)

-        { m_eventType = wxEVT_MAXIMIZE; m_id = id; }
+        : wxEvent(id, wxEVT_MAXIMIZE)
+        { }

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


@@ -1223,13 +1300,13 @@ public:
                     int state = 0,
                     int joystick = wxJOYSTICK1,
                     int change = 0)
                     int state = 0,
                     int joystick = wxJOYSTICK1,
                     int change = 0)

+        : wxEvent(0, type)
+        , m_pos(0, 0)
+        , m_zPosition(0)
+        , m_buttonChange(change)
+        , m_buttonState(state)
+        , m_joyStick(joystick)

     {
     {

-        m_eventType = type;
-        m_buttonState = state;
-        m_pos = wxPoint(0,0);
-        m_zPosition = 0;
-        m_joyStick = joystick;
-        m_buttonChange = change;

     }
 
     wxPoint GetPosition() const { return m_pos; }
     }
 
     wxPoint GetPosition() const { return m_pos; }


@@ -1282,21 +1359,47 @@ private:
 
 class WXDLLEXPORT wxDropFilesEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxDropFilesEvent : public wxEvent
 {

+private:
+    wxDropFilesEvent& operator=(const wxDropFilesEvent& event);
+

 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)
 
     wxDropFilesEvent(wxEventType type = wxEVT_NULL,
                      int noFiles = 0,
                      wxString *files = (wxString *) NULL)

-        { m_eventType = type; m_noFiles = noFiles; m_files = files; }
+        : wxEvent(0, type)
+        , m_noFiles(noFiles)
+        , m_pos()
+        , m_files(files)
+        { }
+
+    // we need a copy ctor to avoid deleting m_files pointer twice
+    wxDropFilesEvent(const wxDropFilesEvent& other)
+        : wxEvent(other)
+        , m_noFiles(other.m_noFiles)
+        , m_pos(other.m_pos)
+        , m_files(NULL)
+    {
+        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; }
 

-    virtual wxEvent *Clone() const { wxFAIL_MSG("error"); return NULL; }
+    virtual wxEvent *Clone() const { return new wxDropFilesEvent(*this); }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxDropFilesEvent)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDropFilesEvent)


@@ -1311,16 +1414,14 @@ class WXDLLEXPORT wxUpdateUIEvent : public wxCommandEvent
 {
 public:
     wxUpdateUIEvent(wxWindowID commandId = 0)
 {
 public:
     wxUpdateUIEvent(wxWindowID commandId = 0)

-    {
-        m_eventType = wxEVT_UPDATE_UI;
-        m_id = commandId;
-        m_checked = FALSE;
-        m_setChecked = FALSE;
-        m_enabled = FALSE;
-        m_setEnabled = FALSE;
-        m_setText = FALSE;
-        m_text = "";
-    }
+        : wxCommandEvent(wxEVT_UPDATE_UI, commandId)
+        , m_checked(FALSE)
+        , m_enabled(FALSE)
+        , m_setEnabled(FALSE)
+        , m_setText(FALSE)
+        , m_setChecked(FALSE)
+        , m_text("")
+        { }

 
     bool GetChecked() const { return m_checked; }
     bool GetEnabled() const { return m_enabled; }
 
     bool GetChecked() const { return m_checked; }
     bool GetEnabled() const { return m_enabled; }


@@ -1356,7 +1457,8 @@ class WXDLLEXPORT wxSysColourChangedEvent : public wxEvent
 {
 public:
     wxSysColourChangedEvent()
 {
 public:
     wxSysColourChangedEvent()

-        { m_eventType = wxEVT_SYS_COLOUR_CHANGED; }
+        : wxEvent(0, wxEVT_SYS_COLOUR_CHANGED)
+        { }

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


@@ -1364,18 +1466,72 @@ private:
     DECLARE_DYNAMIC_CLASS(wxSysColourChangedEvent)
 };
 
     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
+{
+private:
+    wxMouseCaptureChangedEvent operator=(const wxMouseCaptureChangedEvent& event);
+
+public:
+    wxMouseCaptureChangedEvent(wxWindowID id = 0, wxWindow* gainedCapture = NULL)
+        : wxEvent(id, wxEVT_MOUSE_CAPTURE_CHANGED)
+        , m_gainedCapture(gainedCapture)
+        { }
+
+    wxMouseCaptureChangedEvent(const wxMouseCaptureChangedEvent& event)
+        : wxEvent(event)
+        , m_gainedCapture(event.m_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()
+        : wxEvent(0, wxEVT_DISPLAY_CHANGED)
+        { }
+
+    virtual wxEvent *Clone() const { return new wxDisplayChangedEvent(*this); }
+};
+

 /*
  wxEVT_PALETTE_CHANGED
  */
 
 class WXDLLEXPORT wxPaletteChangedEvent : public wxEvent
 {
 /*
  wxEVT_PALETTE_CHANGED
  */
 
 class WXDLLEXPORT wxPaletteChangedEvent : public wxEvent
 {

+private:
+    wxPaletteChangedEvent& operator=(const wxPaletteChangedEvent& event);
+

 public:
 public:

-    wxPaletteChangedEvent(wxWindowID id = 0) : wxEvent(id)
-    {
-        m_eventType = wxEVT_PALETTE_CHANGED;
-        m_changedWindow = (wxWindow *) NULL;
-    }
+    wxPaletteChangedEvent(wxWindowID id = 0)
+        : wxEvent(id, wxEVT_PALETTE_CHANGED)
+        , m_changedWindow((wxWindow *) NULL)
+    { }
+
+    wxPaletteChangedEvent(const wxPaletteChangedEvent& event)
+        : wxEvent(event)
+        , m_changedWindow(event.m_changedWindow)
+        { }

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


@@ -1397,8 +1553,10 @@ private:
 class WXDLLEXPORT wxQueryNewPaletteEvent : public wxEvent
 {
 public:
 class WXDLLEXPORT wxQueryNewPaletteEvent : public wxEvent
 {
 public:

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

 
     // App sets this if it changes the palette.
     void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
 
     // App sets this if it changes the palette.
     void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }


@@ -1420,14 +1578,21 @@ private:
 // NB: don't derive from command event to avoid being propagated to the parent
 class WXDLLEXPORT wxNavigationKeyEvent : public wxEvent
 {
 // NB: don't derive from command event to avoid being propagated to the parent
 class WXDLLEXPORT wxNavigationKeyEvent : public wxEvent
 {

+private:
+    wxNavigationKeyEvent& operator=(const wxNavigationKeyEvent& event);
+

 public:
     wxNavigationKeyEvent()
 public:
     wxNavigationKeyEvent()

-    {
-        SetEventType(wxEVT_NAVIGATION_KEY);
+        : wxEvent(0, wxEVT_NAVIGATION_KEY)
+        , m_flags(IsForward | Propagate)    // defaults are for TAB
+        , m_focus((wxWindow *)NULL)
+        { }

 
 

-        m_flags = IsForward | Propagate;    // defaults are for TAB
-        m_focus = (wxWindow *)NULL;
-    }
+    wxNavigationKeyEvent(const wxNavigationKeyEvent& event)
+        : wxEvent(event)
+        , m_flags(event.m_flags)
+        , m_focus(event.m_focus)
+        { }

 
     // direction: forward (true) or backward (false)
     bool GetDirection() const
 
     // direction: forward (true) or backward (false)
     bool GetDirection() const


@@ -1520,11 +1685,9 @@ public:
     wxHelpEvent(wxEventType type = wxEVT_NULL,
                 wxWindowID id = 0,
                 const wxPoint& pt = wxDefaultPosition)
     wxHelpEvent(wxEventType type = wxEVT_NULL,
                 wxWindowID id = 0,
                 const wxPoint& pt = wxDefaultPosition)

-    {
-        m_eventType = type;
-        m_id = id;
-        m_pos = pt;
-    }
+        : wxCommandEvent(type, id)
+        , m_pos(pt), m_target(), m_link()
+    { }

 
     // Position of event (in screen coordinates)
     const wxPoint& GetPosition() const { return m_pos; }
 
     // Position of event (in screen coordinates)
     const wxPoint& GetPosition() const { return m_pos; }


@@ -1561,13 +1724,11 @@ class WXDLLEXPORT wxContextMenuEvent : public wxCommandEvent
 {
 public:
     wxContextMenuEvent(wxEventType type = wxEVT_NULL,
 {
 public:
     wxContextMenuEvent(wxEventType type = wxEVT_NULL,

-                wxWindowID id = 0,
-                const wxPoint& pt = wxDefaultPosition)
-    {
-        m_eventType = type;
-        m_id = id;
-        m_pos = pt;
-    }
+                       wxWindowID id = 0,
+                       const wxPoint& pt = wxDefaultPosition)
+        : wxCommandEvent(type, id)
+        , m_pos(pt)
+    { }

 
     // Position of event (in screen coordinates)
     const wxPoint& GetPosition() const { return m_pos; }
 
     // Position of event (in screen coordinates)
     const wxPoint& GetPosition() const { return m_pos; }


@@ -1591,7 +1752,9 @@ class WXDLLEXPORT wxIdleEvent : public wxEvent
 {
 public:
     wxIdleEvent()
 {
 public:
     wxIdleEvent()

-        { m_eventType = wxEVT_IDLE; m_requestMore = FALSE; }
+        : wxEvent(0, wxEVT_IDLE)
+        , m_requestMore(FALSE)
+        { }

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


@@ -1648,14 +1811,24 @@ struct WXDLLEXPORT wxEventTableEntry
 // entries
 struct WXDLLEXPORT wxEventTableEntryBase
 {
 // entries
 struct WXDLLEXPORT wxEventTableEntryBase
 {

+private:
+    wxEventTableEntryBase& operator=(const wxEventTableEntryBase& event);
+
+public:

     wxEventTableEntryBase(int id, int idLast,
                           wxObjectEventFunction fn, wxObject *data)
     wxEventTableEntryBase(int id, int idLast,
                           wxObjectEventFunction fn, wxObject *data)

-    {
-        m_id = id;
-        m_lastId = idLast;
-        m_fn = fn;
-        m_callbackUserData = data;
-    }
+        : m_id(id)
+        , m_lastId(idLast)
+        , m_fn(fn)
+        , m_callbackUserData(data)
+    { }
+
+    wxEventTableEntryBase(const wxEventTableEntryBase& event)
+        : m_id(event.m_id)
+        , m_lastId(event.m_lastId)
+        , m_fn(event.m_fn)
+        , m_callbackUserData(event.m_callbackUserData)
+    { }

 
     // the range of ids for this entry: if m_lastId == -1, the range consists
     // only of m_id, otherwise it is m_id..m_lastId inclusive
 
     // the range of ids for this entry: if m_lastId == -1, the range consists
     // only of m_id, otherwise it is m_id..m_lastId inclusive


@@ -1673,10 +1846,9 @@ struct WXDLLEXPORT wxEventTableEntry : public wxEventTableEntryBase
 {
     wxEventTableEntry(const int& evType, int id, int idLast,
                       wxObjectEventFunction fn, wxObject *data)
 {
     wxEventTableEntry(const int& evType, int id, int idLast,
                       wxObjectEventFunction fn, wxObject *data)

-                 : wxEventTableEntryBase(id, idLast, fn, data),
-                   m_eventType(evType)
-    {
-    }
+        : wxEventTableEntryBase(id, idLast, fn, data),
+        m_eventType(evType)
+    { }

 
     // the reference to event type: this allows us to not care about the
     // (undefined) order in which the event table entries and the event types
 
     // the reference to event type: this allows us to not care about the
     // (undefined) order in which the event table entries and the event types


@@ -1693,9 +1865,8 @@ struct WXDLLEXPORT wxDynamicEventTableEntry : public wxEventTableEntryBase
     wxDynamicEventTableEntry(int evType, int id, int idLast,
                              wxObjectEventFunction fn, wxObject *data)
         : wxEventTableEntryBase(id, idLast, fn, data)
     wxDynamicEventTableEntry(int evType, int id, int idLast,
                              wxObjectEventFunction fn, wxObject *data)
         : wxEventTableEntryBase(id, idLast, fn, data)

-    {
-        m_eventType = evType;
-    }
+        , m_eventType(evType)
+    { }

 
     // not a reference here as we can't keep a reference to a temporary int
     // created to wrap the constant value typically passed to Connect() - nor
 
     // not a reference here as we can't keep a reference to a temporary int
     // created to wrap the constant value typically passed to Connect() - nor


@@ -1859,8 +2030,8 @@ protected:
     virtual void DoSetClientData( void *data );
     virtual void *DoGetClientData() 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)
 };
 


@@ -1883,6 +2054,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&);


@@ -1898,6 +2070,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


@@ -1940,6 +2113,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 ),


@@ -1952,6 +2127,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 ),


@@ -1961,6 +2137,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 ),