removed redundant code

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

diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index b3a0d0cdd66493b6e1c82b1c166425ba9ba177f3..14065fb96a2c0ea87ed1b95702974aa90ecb5ac6 100644 (file)
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -15,8 +15,14 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_SPINCTRL
+
+#include "wx/control.h"
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxSpinButton
+// wxSpinCtrl

 //-----------------------------------------------------------------------------
 
 class wxSpinCtrl : public wxControl
 //-----------------------------------------------------------------------------
 
 class wxSpinCtrl : public wxControl


@@ -25,38 +31,56 @@ public:
     wxSpinCtrl() {}
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
     wxSpinCtrl() {}
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,

+               const wxString& value = wxEmptyString,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = _T("wxSpinCtrl"))
     {
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = _T("wxSpinCtrl"))
     {

-        Create(parent, id, pos, size, style, min, max, initial, name);
+        Create(parent, id, value, pos, size, style, min, max, initial, name);

     }
 
     bool Create(wxWindow *parent,
                 wxWindowID id = -1,
     }
 
     bool Create(wxWindow *parent,
                 wxWindowID id = -1,

+                const wxString& value = wxEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxString& name = _T("wxSpinCtrl"));
 
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxString& name = _T("wxSpinCtrl"));
 

+    void SetValue(const wxString& text);
+

     virtual int GetValue() const;
     virtual void SetValue( int value );
     virtual void SetRange( int minVal, int maxVal );
     virtual int GetMin() const;
     virtual int GetMax() const;
 
     virtual int GetValue() const;
     virtual void SetValue( int value );
     virtual void SetRange( int minVal, int maxVal );
     virtual int GetMin() const;
     virtual int GetMax() const;
 

+    // implementation
+    // --------------
+    
+    void OnChar( wxKeyEvent &event );
+    

     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();

+    void GtkDisableEvents();
+    void GtkEnableEvents();

 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 
 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 

+protected:
+    virtual wxSize DoGetBestSize() const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)

+    DECLARE_EVENT_TABLE()

 };
 
 };
 

+#endif
+    // wxUSE_SPINCTRL
+

 #endif
     // __GTKSPINCTRLH__
 #endif
     // __GTKSPINCTRLH__