X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..84d1cd430f9f4cba81737a45cd40fdb7cbac4f7d:/include/wx/gtk/spinctrl.h?ds=sidebyside diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h index 50a65db8fc..898f1dcd1e 100644 --- a/include/wx/gtk/spinctrl.h +++ b/include/wx/gtk/spinctrl.h @@ -8,14 +8,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKSPINCTRLH__ -#define __GTKSPINCTRLH__ - -#include "wx/defs.h" - -#if wxUSE_SPINCTRL - -#include "wx/control.h" +#ifndef _WX_GTK_SPINCTRL_H_ +#define _WX_GTK_SPINCTRL_H_ //----------------------------------------------------------------------------- // wxSpinCtrl @@ -24,7 +18,7 @@ class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl { public: - wxSpinCtrl() {} + wxSpinCtrl(); wxSpinCtrl(wxWindow *parent, wxWindowID id = -1, const wxString& value = wxEmptyString, @@ -61,15 +55,14 @@ public: // implementation void OnChar( wxKeyEvent &event ); - bool IsOwnGtkWindow( GdkWindow *window ); void GtkDisableEvents(); void GtkEnableEvents(); - GtkAdjustment *m_adjust; - float m_oldPos; + int m_pos; protected: virtual wxSize DoGetBestSize() const; + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; // Widgets that use the style->base colour for the BG colour should // override this and return true. @@ -80,8 +73,4 @@ private: DECLARE_EVENT_TABLE() }; -#endif - // wxUSE_SPINCTRL - -#endif - // __GTKSPINCTRLH__ +#endif // _WX_GTK_SPINCTRL_H_