X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/include/wx/gtk/scrolbar.h?ds=sidebyside diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index 5badbfcb28..ddc02ebe9e 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -2,10 +2,9 @@ // Name: 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 ///////////////////////////////////////////////////////////////////////////// @@ -17,8 +16,6 @@ #endif #include "wx/defs.h" -#include "wx/object.h" -#include "wx/control.h" //----------------------------------------------------------------------------- // classes @@ -26,43 +23,42 @@ class wxScrollBar; -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char *wxScrollBarNameStr; - //----------------------------------------------------------------------------- // wxScrollBar //----------------------------------------------------------------------------- -class wxScrollBar: public wxControl +class wxScrollBar: public wxScrollBarBase { - DECLARE_DYNAMIC_CLASS(wxScrollBar) - - public: - - wxScrollBar(void) { m_adjust = NULL; m_oldPos = 0.0; }; - wxScrollBar(wxWindow *parent, wxWindowID id, +public: + wxScrollBar() + { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; } + inline wxScrollBar( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL, - const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(void); - bool Create(wxWindow *parent, wxWindowID id, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxScrollBarNameStr ) + { + Create( parent, id, pos, size, style, validator, name ); + } + bool Create( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL, - const wxString& name = wxScrollBarNameStr); - int GetPosition(void) const; + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxScrollBarNameStr ); + ~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 ); // Backward compatibility + // ---------------------- + int GetValue(void) const; void SetValue( int viewStart ); void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const; @@ -72,10 +68,17 @@ class wxScrollBar: public wxControl void SetObjectLength( int objectLength ); void SetViewLength( int viewLength ); - public: - + // implementation + // -------------- + + bool IsOwnGtkWindow( GdkWindow *window ); + void ApplyWidgetStyle(); + GtkAdjustment *m_adjust; float m_oldPos; + +private: + DECLARE_DYNAMIC_CLASS(wxScrollBar) }; #endif