X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..30bfc425744ec3b797a956a9b78b902ff248bf3b:/contrib/include/wx/gizmos/splittree.h diff --git a/contrib/include/wx/gizmos/splittree.h b/contrib/include/wx/gizmos/splittree.h index 79ebb9c9a4..98bbea58d4 100644 --- a/contrib/include/wx/gizmos/splittree.h +++ b/contrib/include/wx/gizmos/splittree.h @@ -18,11 +18,7 @@ #pragma interface "splittree.h" #endif -#ifdef GIZMOISDLL -#define GIZMODLLEXPORT WXDLLEXPORT -#else -#define GIZMODLLEXPORT -#endif +#include "wx/gizmos/gizmos.h" // Set this to 1 to use generic tree control (doesn't yet work properly) #define USE_GENERIC_TREECTRL 0 @@ -52,7 +48,7 @@ class wxSplitterScrolledWindow; * It also updates the scrolled window vertical scrollbar as appropriate. */ -class GIZMODLLEXPORT wxRemotelyScrolledTreeCtrl: public wxTreeCtrl +class WXDLLIMPEXP_GIZMOS wxRemotelyScrolledTreeCtrl: public wxTreeCtrl { DECLARE_CLASS(wxRemotelyScrolledTreeCtrl) public: @@ -126,7 +122,7 @@ protected: * A window displaying values associated with tree control items. */ -class GIZMODLLEXPORT wxTreeCompanionWindow: public wxWindow +class WXDLLIMPEXP_GIZMOS wxTreeCompanionWindow: public wxWindow { public: DECLARE_CLASS(wxTreeCompanionWindow) @@ -165,7 +161,7 @@ protected: * than the usual one. */ -class GIZMODLLEXPORT wxThinSplitterWindow: public wxSplitterWindow +class WXDLLIMPEXP_GIZMOS wxThinSplitterWindow: public wxSplitterWindow { public: DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow) @@ -174,6 +170,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = wxSP_3D | wxCLIP_CHILDREN); + ~wxThinSplitterWindow(); //// Overrides @@ -193,6 +190,9 @@ public: //// Data members protected: + wxPen* m_facePen; + wxBrush* m_faceBrush; + DECLARE_EVENT_TABLE() }; @@ -205,7 +205,7 @@ protected: * scroll appropriately. */ -class GIZMODLLEXPORT wxSplitterScrolledWindow: public wxScrolledWindow +class WXDLLIMPEXP_GIZMOS wxSplitterScrolledWindow: public wxScrolledWindow { public: DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)