X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..13199c3dcbb708f859aeae6b480459b7b9bb9a9d:/include/wx/gtk/scrolbar.h diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index 8ce5e82897..37d64dbae6 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -7,31 +7,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKSCROLLBARH__ #define __GTKSCROLLBARH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "scrolbar.h" -#endif - #include "wx/defs.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxScrollBar; +class WXDLLIMPEXP_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, @@ -54,19 +48,11 @@ public: 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 ); + void SetRange(int range); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -75,13 +61,6 @@ public: // -------------- bool IsOwnGtkWindow( GdkWindow *window ); - void ApplyWidgetStyle(); - - GtkAdjustment *m_adjust; - float m_oldPos; - -protected: - virtual wxSize DoGetBestSize() const; private: DECLARE_DYNAMIC_CLASS(wxScrollBar)