X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de97a3b945c99fb942209df48be26f43c1b436d..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk/scrolbar.h?ds=sidebyside diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index 2a79f45acf..fb9ab1bc9f 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -1,48 +1,23 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.h +// Name: wx/gtk/scrolbar.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSCROLLBARH__ -#define __GTKSCROLLBARH__ - -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxScrollBar; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char *wxScrollBarNameStr; +#ifndef _WX_GTK_SCROLLBAR_H_ +#define _WX_GTK_SCROLLBAR_H_ //----------------------------------------------------------------------------- // wxScrollBar //----------------------------------------------------------------------------- -class wxScrollBar: public wxControl +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase { - DECLARE_DYNAMIC_CLASS(wxScrollBar) - - public: - - wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; }; +public: + wxScrollBar(); inline wxScrollBar( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -50,7 +25,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, @@ -58,30 +33,23 @@ class wxScrollBar: public wxControl long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(void); - int GetPosition(void) const; + virtual ~wxScrollBar(); + int GetThumbPosition() const; int GetThumbSize() const; int GetPageSize() const; int GetRange() const; - virtual void SetPosition( int viewStart ); + 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 ); + void SetRange(int range); + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - public: - - GtkAdjustment *m_adjust; - float m_oldPos; + DECLARE_DYNAMIC_CLASS(wxScrollBar) }; -#endif - // __GTKSCROLLBARH__ +#endif // _WX_GTK_SCROLLBAR_H_