Move wxScopedPtr::reset() implementation to wxDEFINE_SCOPED_PTR.

[wxWidgets.git] / include / wx / generic / spinctlg.h

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 0cc65d090de90cd4a57f15e5aec0b13b4e754151..41fc00cb1b339980c2373f9fe19971dcd4b8ed6f 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -50,10 +50,10 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,

-                const wxString& name = _T("wxSpinCtrl"));
+                const wxString& name = wxT("wxSpinCtrl"));

 
     virtual ~wxSpinCtrlGenericBase();
 
 
     virtual ~wxSpinCtrlGenericBase();
 


@@ -158,10 +158,10 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,

-                const wxString& name = _T("wxSpinCtrl"))
+                const wxString& name = wxT("wxSpinCtrl"))

     {
         m_min = min;
         m_max = max;
     {
         m_min = min;
         m_max = max;


@@ -243,9 +243,9 @@ public:
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,

-               long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                int min = 0, int max = 100, int initial = 0,
                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);
     }
     {
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }


@@ -255,32 +255,30 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                 int min = 0, int max = 100, int initial = 0,
                 int min = 0, int max = 100, int initial = 0,

-                const wxString& name = _T("wxSpinCtrl"))
+                const wxString& name = wxT("wxSpinCtrl"))

     {
         return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size,
                                              style, min, max, initial, 1, name);
     }
 
     // accessors
     {
         return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size,
                                              style, min, max, initial, 1, name);
     }
 
     // accessors

-    int GetValue(wxSPINCTRL_GETVALUE_FIX) const
-        { return wxRound( DoGetValue() ); }
-    int GetMin() const       { return wxRound( m_min ); }
-    int GetMax() const       { return wxRound( m_max ); }
-    int GetIncrement() const { return wxRound( m_increment ); }
+    int GetValue(wxSPINCTRL_GETVALUE_FIX) const { return int(DoGetValue()); }
+    int GetMin() const { return int(m_min); }
+    int GetMax() const { return int(m_max); }
+    int GetIncrement() const { return int(m_increment); }

 
     // operations
     void SetValue(const wxString& value)
         { wxSpinCtrlGenericBase::SetValue(value); }
     void SetValue( int value )              { DoSetValue(value); }
     void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); }
 
     // operations
     void SetValue(const wxString& value)
         { wxSpinCtrlGenericBase::SetValue(value); }
     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); }

 
 protected:
     virtual void DoSendEvent();
 
 
 protected:
     virtual void DoSendEvent();
 

-private:

     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 


@@ -299,10 +297,10 @@ public:
                      const wxString& value = wxEmptyString,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      const wxString& value = wxEmptyString,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,

-                     long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+                     long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                      double min = 0, double max = 100, double initial = 0,
                      double inc = 1,
                      double min = 0, double max = 100, double initial = 0,
                      double inc = 1,

-                     const wxString& name = _T("wxSpinCtrlDouble"))
+                     const wxString& name = wxT("wxSpinCtrlDouble"))

     {
         m_digits = 0;
         Create(parent, id, value, pos, size, style,
     {
         m_digits = 0;
         Create(parent, id, value, pos, size, style,


@@ -314,10 +312,10 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,

-                const wxString& name = _T("wxSpinCtrlDouble"))
+                const wxString& name = wxT("wxSpinCtrlDouble"))

     {
         return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size,
                                              style, min, max, initial,
     {
         return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size,
                                              style, min, max, initial,


@@ -344,7 +342,6 @@ protected:
 
     unsigned m_digits;
 
 
     unsigned m_digits;
 

-private:

     DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
 };