X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c11420034872e991007a53f351fc24e49cc0519e..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/scrolbar.h diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index be108b18f9..21f2d75a8a 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -1,11 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.h +// Name: wx/scrolbar.h // Purpose: wxScrollBar base header // Author: Julian Smart // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -18,18 +17,21 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const wxChar) 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 +39,7 @@ public: long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr); + */ // accessors virtual int GetThumbPosition() const = 0; @@ -56,7 +59,7 @@ public: bool IsNeeded() const { return GetRange() > GetThumbSize(); } private: - DECLARE_NO_COPY_CLASS(wxScrollBarBase) + wxDECLARE_NO_COPY_CLASS(wxScrollBarBase); }; #if defined(__WXUNIVERSAL__) @@ -70,7 +73,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__)