X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fabb57533169f2f75367e0d120c762518548890..721ab9053804ef63e42f33841e242753f1ed66aa:/include/wx/gtk1/scrolbar.h?ds=sidebyside diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h index 98a3da43b1..612c37afae 100644 --- a/include/wx/gtk1/scrolbar.h +++ b/include/wx/gtk1/scrolbar.h @@ -16,6 +16,9 @@ #endif #include "wx/defs.h" + +#if wxUSE_SCROLLBAR + #include "wx/object.h" #include "wx/control.h" @@ -37,11 +40,9 @@ extern const char *wxScrollBarNameStr; class wxScrollBar: public wxControl { - DECLARE_DYNAMIC_CLASS(wxScrollBar) - - public: - - wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; }; +public: + wxScrollBar() + { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; } inline wxScrollBar( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -49,7 +50,7 @@ class wxScrollBar: public wxControl const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ) { - Create( parent, id, pos, size, style, validator, name ); + Create( parent, id, pos, size, style, validator, name ); } bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -57,8 +58,8 @@ class wxScrollBar: public wxControl long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(void); - int GetThumbPosition(void) const; + ~wxScrollBar(); + int GetThumbPosition() const; int GetThumbSize() const; int GetPageSize() const; int GetRange() const; @@ -66,7 +67,8 @@ class wxScrollBar: public wxControl virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize, bool refresh = TRUE ); - // Backward compatibility + // Backward compatibility + // ---------------------- int GetValue(void) const; void SetValue( int viewStart ); @@ -77,14 +79,20 @@ class wxScrollBar: public wxControl void SetObjectLength( int objectLength ); void SetViewLength( int viewLength ); - // implementation + // implementation + // -------------- bool IsOwnGtkWindow( GdkWindow *window ); void ApplyWidgetStyle(); GtkAdjustment *m_adjust; float m_oldPos; + +private: + DECLARE_DYNAMIC_CLASS(wxScrollBar) }; +#endif + #endif // __GTKSCROLLBARH__