X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/scrolbar.h diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index f995c03e5a..6cdf392a26 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -1,11 +1,24 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: scrolbar.h +// Purpose: wxScrollBar base header +// Author: Julian Smart +// Modified by: +// Created: +// Copyright: (c) Julian Smart +// RCS-ID: $Id$ +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + #ifndef _WX_SCROLBAR_H_BASE_ #define _WX_SCROLBAR_H_BASE_ +#include "wx/defs.h" + #if wxUSE_SCROLLBAR #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[]; // ---------------------------------------------------------------------------- // wxScrollBar: a scroll bar control @@ -14,6 +27,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr; class WXDLLEXPORT wxScrollBarBase : public wxControl { public: + wxScrollBarBase() { } + // scrollbar construction bool Create(wxWindow *parent, wxWindowID id, @@ -35,7 +50,10 @@ public: virtual void SetThumbPosition(int viewStart) = 0; virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = TRUE) = 0; + bool refresh = true) = 0; + +private: + DECLARE_NO_COPY_CLASS(wxScrollBarBase) }; #if defined(__WXUNIVERSAL__) @@ -44,16 +62,16 @@ public: #include "wx/msw/scrolbar.h" #elif defined(__WXMOTIF__) #include "wx/motif/scrolbar.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/scrolbar.h" -#elif defined(__WXQT__) - #include "wx/qt/scrolbar.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/scrolbar.h" #elif defined(__WXMAC__) #include "wx/mac/scrolbar.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/scrolbar.h" #elif defined(__WXPM__) #include "wx/os2/scrolbar.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/scrolbar.h" #endif #endif // wxUSE_SCROLLBAR