Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk1 / spinctrl.h

diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index c784b1d05a86c012303033763a33a67559e3f1de..e1fb0b8cd6b92dccb2a8c2e58311a639e4124ef3 100644 (file)
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        spinctrl.h
+// Name:        wx/gtk1/spinctrl.h
 // Purpose:     wxSpinCtrl class
 // Author:      Robert Roebling
 // Modified by:
@@ -11,10 +11,6 @@
 #ifndef __GTKSPINCTRLH__
 #define __GTKSPINCTRLH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_SPINCTRL
@@ -36,7 +32,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 +44,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 +57,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 +68,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 +79,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()
 };