X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk1/scrolbar.h?ds=sidebyside diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h index 8ce5e82897..2a5baa7ff2 100644 --- a/include/wx/gtk1/scrolbar.h +++ b/include/wx/gtk1/scrolbar.h @@ -1,37 +1,31 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: scrolbar.h +// Name: wx/gtk1/scrolbar.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // 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_FWD_CORE wxScrollBar; //----------------------------------------------------------------------------- // wxScrollBar //----------------------------------------------------------------------------- -class wxScrollBar: public wxScrollBarBase +class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase { public: wxScrollBar() - { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; } + { m_adjust = NULL; m_oldPos = 0.0; } inline wxScrollBar( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -47,7 +41,7 @@ public: long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(); + virtual ~wxScrollBar(); int GetThumbPosition() const; int GetThumbSize() const; int GetPageSize() const; @@ -70,12 +64,11 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation // -------------- bool IsOwnGtkWindow( GdkWindow *window ); - void ApplyWidgetStyle(); GtkAdjustment *m_adjust; float m_oldPos;