X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fabb57533169f2f75367e0d120c762518548890..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/scrolbar.h diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index 98a3da43b1..672334a1de 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -4,20 +4,18 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKSCROLLBARH__ #define __GTKSCROLLBARH__ -#ifdef __GNUG__ -#pragma interface +#if defined(__GNUG__) && !defined(__APPLE__) +#pragma interface "scrolbar.h" #endif #include "wx/defs.h" -#include "wx/object.h" -#include "wx/control.h" //----------------------------------------------------------------------------- // classes @@ -25,23 +23,15 @@ 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 = (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 +39,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 +47,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,8 +56,9 @@ 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 ); void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const; @@ -77,13 +68,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; + +protected: + virtual wxSize DoGetBestSize() const; + +private: + DECLARE_DYNAMIC_CLASS(wxScrollBar) }; #endif