X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk1/spinctrl.h diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h index c784b1d05a..0b42fce248 100644 --- a/include/wx/gtk1/spinctrl.h +++ b/include/wx/gtk1/spinctrl.h @@ -1,9 +1,8 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinctrl.h +// Name: wx/gtk1/spinctrl.h // Purpose: wxSpinCtrl class // Author: Robert Roebling // Modified by: -// RCS-ID: $Id$ // Copyright: (c) Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,10 +10,6 @@ #ifndef __GTKSPINCTRLH__ #define __GTKSPINCTRLH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #if wxUSE_SPINCTRL @@ -36,7 +31,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxSP_ARROW_KEYS, int min = 0, int max = 100, int initial = 0, - const wxString& name = _T("wxSpinCtrl")) + const wxString& name = wxT("wxSpinCtrl")) { Create(parent, id, value, pos, size, style, min, max, initial, name); } @@ -48,7 +43,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxSP_ARROW_KEYS, int min = 0, int max = 100, int initial = 0, - const wxString& name = _T("wxSpinCtrl")); + const wxString& name = wxT("wxSpinCtrl")); void SetValue(const wxString& text); void SetSelection(long from, long to); @@ -61,10 +56,10 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + // implementation void OnChar( wxKeyEvent &event ); - + bool IsOwnGtkWindow( GdkWindow *window ); void GtkDisableEvents(); void GtkEnableEvents(); @@ -72,7 +67,10 @@ public: GtkAdjustment *m_adjust; float m_oldPos; -protected: + virtual int GetBase() const { return m_base; } + virtual bool SetBase(int base); + + protected: virtual wxSize DoGetBestSize() const; // Widgets that use the style->base colour for the BG colour should @@ -80,6 +78,14 @@ protected: virtual bool UseGTKStyleBase() const { return true; } private: + // Common part of all ctors. + void Init() + { + m_base = 10; + } + + int m_base; + DECLARE_DYNAMIC_CLASS(wxSpinCtrl) DECLARE_EVENT_TABLE() };