X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907..c93f804a15ca3051acb83f9ee2e0eab929b2736c:/include/wx/event.h?ds=sidebyside diff --git a/include/wx/event.h b/include/wx/event.h index 451c03151b..c0de5f5774 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -606,9 +606,6 @@ enum class WXDLLEXPORT wxMouseEvent : public wxEvent { -private: - wxMouseEvent& operator=(const wxMouseEvent& event); - public: wxMouseEvent(wxEventType mouseType = wxEVT_NULL); wxMouseEvent(const wxMouseEvent& event) : wxEvent(event) @@ -746,6 +743,8 @@ public: virtual wxEvent *Clone() const { return new wxMouseEvent(*this); } + wxMouseEvent& operator=(const wxMouseEvent& event) { Assign(event); return *this; } + public: wxCoord m_x, m_y; @@ -2163,8 +2162,8 @@ typedef void (wxEvtHandler::*wxUpdateUIEventFunction)(wxUpdateUIEvent&); typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&); typedef void (wxEvtHandler::*wxCloseEventFunction)(wxCloseEvent&); typedef void (wxEvtHandler::*wxShowEventFunction)(wxShowEvent&); -typedef void (wxEvtHandler::*wxIconizeEventFunction)(wxShowEvent&); -typedef void (wxEvtHandler::*wxMaximizeEventFunction)(wxShowEvent&); +typedef void (wxEvtHandler::*wxIconizeEventFunction)(wxIconizeEvent&); +typedef void (wxEvtHandler::*wxMaximizeEventFunction)(wxMaximizeEvent&); typedef void (wxEvtHandler::*wxNavigationKeyEventFunction)(wxNavigationKeyEvent&); typedef void (wxEvtHandler::*wxPaletteChangedEventFunction)(wxPaletteChangedEvent&); typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEvent&);