X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20e05ffbd3eff02a4c643e412d4f600cdea26952..960b193e59a7700570cfcae914ef2f698e6ba3b8:/include/wx/gtk1/scrolbar.h diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h index ddccb240da..4f43d99e7e 100644 --- a/include/wx/gtk1/scrolbar.h +++ b/include/wx/gtk1/scrolbar.h @@ -4,44 +4,34 @@ // 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(NO_GCC_PRAGMA) +#pragma interface "scrolbar.h" #endif #include "wx/defs.h" -#if wxUSE_SCROLLBAR - -#include "wx/object.h" -#include "wx/control.h" - //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- class wxScrollBar; -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char *wxScrollBarNameStr; - //----------------------------------------------------------------------------- // wxScrollBar //----------------------------------------------------------------------------- -class wxScrollBar: public wxControl +class wxScrollBar: public wxScrollBarBase { public: - wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; }; + 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 @@ public: 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 @@ public: 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; @@ -68,7 +58,7 @@ public: // Backward compatibility // ---------------------- - + int GetValue(void) const; void SetValue( int viewStart ); void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const; @@ -80,18 +70,19 @@ public: // implementation // -------------- - + bool IsOwnGtkWindow( GdkWindow *window ); void ApplyWidgetStyle(); - + GtkAdjustment *m_adjust; float m_oldPos; - + +protected: + virtual wxSize DoGetBestSize() const; + private: DECLARE_DYNAMIC_CLASS(wxScrollBar) }; -#endif - #endif // __GTKSCROLLBARH__