X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..465de0be705e52c7f97e9bb6169af9d20a7f72a8:/include/wx/gtk/spinctrl.h?ds=inline diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h index 2954b27e9b..15d663785c 100644 --- a/include/wx/gtk/spinctrl.h +++ b/include/wx/gtk/spinctrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinctrl.h +// Name: wx/gtk/spinctrl.h // Purpose: wxSpinCtrl class // Author: Robert Roebling // Modified by: @@ -23,17 +23,15 @@ class WXDLLIMPEXP_CORE wxSpinCtrlGTKBase : public wxSpinCtrlBase { public: - wxSpinCtrlGTKBase() : m_value(0) {} - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxT("wxSpinCtrlGTKBase")); + wxWindowID id, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + long style, + double min, double max, double initial, + double inc, + const wxString& name); // wxSpinCtrl(Double) methods call DoXXX functions of the same name @@ -60,10 +58,7 @@ public: // implementation void OnChar( wxKeyEvent &event ); - double m_value; // public for GTK callback function - protected: - double DoGetValue() const; double DoGetMin() const; double DoGetMax() const; @@ -84,7 +79,6 @@ protected: // override this and return true. virtual bool UseGTKStyleBase() const { return true; } -private: DECLARE_DYNAMIC_CLASS(wxSpinCtrlGTKBase) DECLARE_EVENT_TABLE() }; @@ -104,7 +98,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, int min = 0, int max = 100, int initial = 0, - const wxString& name = wxT("wxSpinCtrl")) + const wxString& name = wxS("wxSpinCtrl")) { Create(parent, id, value, pos, size, style, min, max, initial, name); } @@ -116,25 +110,24 @@ public: const wxSize& size = wxDefaultSize, long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, int min = 0, int max = 100, int initial = 0, - const wxString& name = wxT("wxSpinCtrl")) + const wxString& name = wxS("wxSpinCtrl")) { return wxSpinCtrlGTKBase::Create(parent, id, value, pos, size, style, min, max, initial, 1, name); } // accessors - int GetValue() const { return wxRound( DoGetValue() ); } - int GetMin() const { return wxRound( DoGetMin() ); } - int GetMax() const { return wxRound( DoGetMax() ); } - int GetIncrement() const { return wxRound( DoGetIncrement() ); } + int GetValue() const { return int(DoGetValue()); } + int GetMin() const { return int(DoGetMin()); } + int GetMax() const { return int(DoGetMax()); } + int GetIncrement() const { return int(DoGetIncrement()); } // operations void SetValue(const wxString& value) { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc void SetValue( int value ) { DoSetValue(value); } void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); } - void SetIncrement( double inc ) { DoSetIncrement(inc); } + void SetIncrement(int inc) { DoSetIncrement(inc); } -private: DECLARE_DYNAMIC_CLASS(wxSpinCtrl) }; @@ -154,7 +147,7 @@ public: long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, double min = 0, double max = 100, double initial = 0, double inc = 1, - const wxString& name = wxT("wxSpinCtrlDouble")) + const wxString& name = wxS("wxSpinCtrlDouble")) { Create(parent, id, value, pos, size, style, min, max, initial, inc, name); @@ -168,7 +161,7 @@ public: long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, double min = 0, double max = 100, double initial = 0, double inc = 1, - const wxString& name = wxT("wxSpinCtrlDouble")) + const wxString& name = wxS("wxSpinCtrlDouble")) { return wxSpinCtrlGTKBase::Create(parent, id, value, pos, size, style, min, max, initial, inc, name); @@ -188,7 +181,6 @@ public: void SetIncrement(double inc) { DoSetIncrement(inc); } void SetDigits(unsigned digits); -private: DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble) };