X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c058cafa56179e79df02ad370bdeafd725ff2478..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/generic/sashwin.h?ds=sidebyside diff --git a/include/wx/generic/sashwin.h b/include/wx/generic/sashwin.h index b89fe8159a..88af9589e9 100644 --- a/include/wx/generic/sashwin.h +++ b/include/wx/generic/sashwin.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sashwin.h +// Name: wx/generic/sashwin.h // Purpose: wxSashWindow implementation. A sash window has an optional // sash on each edge, allowing it to be dragged. An event // is generated when the sash is released. @@ -200,10 +200,12 @@ private: private: DECLARE_DYNAMIC_CLASS(wxSashWindow) DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxSashWindow) + wxDECLARE_NO_COPY_CLASS(wxSashWindow); }; -extern WXDLLIMPEXP_ADV const wxEventType wxEVT_SASH_DRAGGED; +class WXDLLIMPEXP_FWD_ADV wxSashEvent; + +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_SASH_DRAGGED, wxSashEvent ); enum wxSashDragStatus { @@ -221,6 +223,12 @@ public: m_edge = edge; } + wxSashEvent(const wxSashEvent& event) + : wxCommandEvent(event), + m_edge(event.m_edge), + m_dragRect(event.m_dragRect), + m_dragStatus(event.m_dragStatus) { } + void SetEdge(wxSashEdgePosition edge) { m_edge = edge; } wxSashEdgePosition GetEdge() const { return m_edge; } @@ -233,19 +241,21 @@ public: void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; } wxSashDragStatus GetDragStatus() const { return m_dragStatus; } + virtual wxEvent *Clone() const { return new wxSashEvent(*this); } + private: wxSashEdgePosition m_edge; wxRect m_dragRect; wxSashDragStatus m_dragStatus; private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxSashEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSashEvent) }; typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&); #define wxSashEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSashEventFunction, &func) + wxEVENT_HANDLER_CAST(wxSashEventFunction, func) #define EVT_SASH_DRAGGED(id, fn) \ wx__DECLARE_EVT1(wxEVT_SASH_DRAGGED, id, wxSashEventHandler(fn))