X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/scrolbar.h?ds=inline diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index fc46906736..f63573c0cb 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.h +// Name: wx/scrolbar.h // Purpose: wxScrollBar base header // Author: Julian Smart // Modified by: @@ -18,18 +18,21 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxScrollBarNameStr[]; // ---------------------------------------------------------------------------- // wxScrollBar: a scroll bar control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollBarBase : public wxControl +class WXDLLIMPEXP_CORE wxScrollBarBase : public wxControl { public: wxScrollBarBase() { } - // scrollbar construction + /* + Derived classes should provide the following method and ctor with the + same parameters: + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -37,6 +40,7 @@ public: long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr); + */ // accessors virtual int GetThumbPosition() const = 0; @@ -56,7 +60,7 @@ public: bool IsNeeded() const { return GetRange() > GetThumbSize(); } private: - DECLARE_NO_COPY_CLASS(wxScrollBarBase) + wxDECLARE_NO_COPY_CLASS(wxScrollBarBase); }; #if defined(__WXUNIVERSAL__) @@ -70,7 +74,7 @@ private: #elif defined(__WXGTK__) #include "wx/gtk1/scrolbar.h" #elif defined(__WXMAC__) - #include "wx/mac/scrolbar.h" + #include "wx/osx/scrolbar.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/scrolbar.h" #elif defined(__WXPM__)