X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..a516284f67e1910fc6dc5364b289340332d0d35f:/include/wx/gtk/scrolbar.h?ds=sidebyside diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index 455eb42799..9f909f17aa 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.h +// Name: wx/gtk/scrolbar.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,13 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSCROLLBARH__ -#define __GTKSCROLLBARH__ - -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface -#endif +#ifndef _WX_GTK_SCROLLBAR_H_ +#define _WX_GTK_SCROLLBAR_H_ #include "wx/defs.h" @@ -21,17 +16,16 @@ // classes //----------------------------------------------------------------------------- -class wxScrollBar; +class WXDLLIMPEXP_FWD_CORE wxScrollBar; //----------------------------------------------------------------------------- // wxScrollBar //----------------------------------------------------------------------------- -class wxScrollBar: public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase { public: - wxScrollBar() - { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; } + wxScrollBar(); inline wxScrollBar( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -47,39 +41,27 @@ public: long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(); + virtual ~wxScrollBar(); int GetThumbPosition() const; int GetThumbSize() const; int GetPageSize() const; int GetRange() const; virtual void SetThumbPosition( int viewStart ); virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize, - bool refresh = TRUE ); + bool refresh = true ); - // Backward compatibility - // ---------------------- - - int GetValue(void) const; - void SetValue( int viewStart ); - void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const; - int GetViewLength() const; - int GetObjectLength() const; + void SetThumbSize(int thumbSize); void SetPageSize( int pageLength ); - void SetObjectLength( int objectLength ); - void SetViewLength( int viewLength ); - - // implementation - // -------------- + void SetRange(int range); - bool IsOwnGtkWindow( GdkWindow *window ); - void ApplyWidgetStyle(); + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - GtkAdjustment *m_adjust; - float m_oldPos; +protected: + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; private: DECLARE_DYNAMIC_CLASS(wxScrollBar) }; -#endif - // __GTKSCROLLBARH__ +#endif // _WX_GTK_SCROLLBAR_H_