SpinCtrl update

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h
index c6bfbf2889d740307067cc6c8b895816067bcf47..b71c6bc271a4a011adbb2c28b362c396d7289f5a 100644 (file)
--- a/include/wx/os2/spinctrl.h
+++ b/include/wx/os2/spinctrl.h
@@ -15,7 +15,7 @@
 #include "wx/spinbutt.h"    // the base class
 
 // ----------------------------------------------------------------------------
 #include "wx/spinbutt.h"    // the base class
 
 // ----------------------------------------------------------------------------

-// Under Win32 and OS2 PM, wxSpinCtrl is a wxSpinButton with a buddy 
+// Under Win32 and OS2 PM, wxSpinCtrl is a wxSpinButton with a buddy

 // text window whose contents is automatically updated when the spin
 // control is clicked.
 // ----------------------------------------------------------------------------
 // text window whose contents is automatically updated when the spin
 // control is clicked.
 // ----------------------------------------------------------------------------


@@ -27,17 +27,19 @@ public:
 
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
 
     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,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS,

diff --git a/src/os2/spinctrl.cpp b/src/os2/spinctrl.cpp
index 2739992b99699293cb9887bd93f3e3fe036f64f1..66b5fe5f9970cdcceefc2077ed01264ed6a92a5a 100644 (file)
--- a/src/os2/spinctrl.cpp
+++ b/src/os2/spinctrl.cpp
@@ -54,6 +54,7 @@ static const int MARGIN_BETWEEN = 5;
 
 bool wxSpinCtrl::Create(wxWindow *parent,
                         wxWindowID id,
 
 bool wxSpinCtrl::Create(wxWindow *parent,
                         wxWindowID id,

+                        const wxString& value,

                         const wxPoint& pos,
                         const wxSize& size,
                         long style,
                         const wxPoint& pos,
                         const wxSize& size,
                         long style,