X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/086ab766229aa52184b4b41ce0a26142452f3932..e8332ccfe0cf1653b257d46d5c41339e2b2da438:/contrib/include/wx/gizmos/dynamicsash.h?ds=sidebyside diff --git a/contrib/include/wx/gizmos/dynamicsash.h b/contrib/include/wx/gizmos/dynamicsash.h index 1d1a355cbb..c94fc3ee2b 100644 --- a/contrib/include/wx/gizmos/dynamicsash.h +++ b/contrib/include/wx/gizmos/dynamicsash.h @@ -13,12 +13,7 @@ #ifndef _WX_DYNAMICSASH_H_ #define _WX_DYNAMICSASH_H_ -#ifdef GIZMOISDLL -#define GIZMODLLEXPORT WXDLLEXPORT -#else -#define GIZMODLLEXPORT -#endif - +#include "wx/gizmos/gizmos.h" /* @@ -102,7 +97,7 @@ class wxScrollBar; a child of the wxDynamicSashWindow. wxDynamicSashWindow will automatically reparent it to the proper place in its window hierarchy. */ -class GIZMODLLEXPORT wxDynamicSashSplitEvent : public wxCommandEvent { +class WXDLLIMPEXP_GIZMOS wxDynamicSashSplitEvent : public wxCommandEvent { public: wxDynamicSashSplitEvent(); wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { } @@ -124,7 +119,7 @@ private: the scrollbars' event handlers connected to your view's event handler class. */ -class GIZMODLLEXPORT wxDynamicSashUnifyEvent : public wxCommandEvent { +class WXDLLIMPEXP_GIZMOS wxDynamicSashUnifyEvent : public wxCommandEvent { public: wxDynamicSashUnifyEvent(); wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {} @@ -133,25 +128,30 @@ public: virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); } private: - DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent); + DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent) }; +typedef void (wxEvtHandler::*wxDynamicSashSplitEventFunction)(wxDynamicSashSplitEvent&); +typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashUnifyEvent&); + /* wxDynamicSashWindow. See above. */ -class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow { +WXDLLIMPEXP_GIZMOS extern const wxChar* wxDynamicSashWindowNameStr; + +class WXDLLIMPEXP_GIZMOS wxDynamicSashWindow : public wxWindow { public: wxDynamicSashWindow(); wxDynamicSashWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER, - const wxString& name = "dynamicSashWindow"); + const wxString& name = wxDynamicSashWindowNameStr); virtual ~wxDynamicSashWindow(); virtual bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER, - const wxString& name = "dynamicSashWindow"); + const wxString& name = wxDynamicSashWindowNameStr); virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const; virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;