X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/846e1424e2f563b699e7fcb81d10cf6f2246487f..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/scrolbar.h diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h index 612c37afae..672334a1de 100644 --- a/include/wx/gtk1/scrolbar.h +++ b/include/wx/gtk1/scrolbar.h @@ -4,44 +4,33 @@ // 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" -#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() + wxScrollBar() { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; } inline wxScrollBar( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -69,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; @@ -81,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__