moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h
index c6bfbf2889d740307067cc6c8b895816067bcf47..7423d7e2aa56c2f68c66c399159a5487513c5533 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,29 +27,51 @@ 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,
                 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"));
 

+    // a wxTextCtrl-like method (but we can't have GetValue returning wxString
+    // because the base class already has one returning int!)
+    void SetValue(const wxString& text);
+
+    // implementation only from now on
+    // -------------------------------
+
+    virtual void SetValue(int val) { wxSpinButton::SetValue(val); }
+    virtual int GetValue() const;
+    virtual bool SetFont(const wxFont &font);
+
+    virtual bool Enable(bool enable = TRUE);
+    virtual bool Show(bool show = TRUE);

 protected:
     void DoMoveWindow(int x, int y, int width, int height);
 
 protected:
     void DoMoveWindow(int x, int y, int width, int height);
 

+    virtual wxSize DoGetBestSize() const;
+
+    // the handler for wxSpinButton events
+    void OnSpinChange(wxSpinEvent& event);
+

     WXHWND m_hwndBuddy;
 
     WXHWND m_hwndBuddy;
 

+private:

     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)

+    DECLARE_EVENT_TABLE()

 };
 
 #endif // _WX_MSW_SPINCTRL_H_
 };
 
 #endif // _WX_MSW_SPINCTRL_H_