General fixes

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 9563c9e5368fdc6f05a71018f5f6d51e7302db44..604e2f1a79e88157dd1aae6a98e08b82077081fc 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -12,6 +12,8 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
+WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {
@@ -19,7 +21,27 @@ class WXDLLEXPORT wxControl : public wxControlBase
 
 public:
    wxControl();
-   virtual ~wxControl();
+   wxControl(wxWindow *parent,
+             wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = 0,
+#if wxUSE_VALIDATORS
+             const wxValidator& validator = wxDefaultValidator,
+#endif
+             const wxString& name = wxControlNameStr)
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+#if wxUSE_VALIDATORS
+            const wxValidator& validator = wxDefaultValidator,
+#endif
+            const wxString& name = wxControlNameStr);
+    virtual ~wxControl();
 
    // Simulates an event
    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
@@ -67,7 +89,11 @@ protected:
 
    // create the control of the given class with the given style, returns FALSE
    // if creation failed
-   bool OS2CreateControl(const wxChar *classname, WXDWORD style);
+   bool OS2CreateControl(const wxChar *classname, WXDWORD style,
+                         const wxPoint& pos = wxDefaultPosition,
+                         const wxSize& size = wxDefaultSize,
+                         const wxString& label = wxEmptyString,
+                         WXDWORD exstyle = (WXDWORD)-1);
 
    // determine the extended styles combination for this window (may slightly
    // modify styl parameter)

diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h
index b71c6bc271a4a011adbb2c28b362c396d7289f5a..7423d7e2aa56c2f68c66c399159a5487513c5533 100644 (file)
--- a/include/wx/os2/spinctrl.h
+++ b/include/wx/os2/spinctrl.h
@@ -46,12 +46,32 @@ public:
                 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);
 
+    virtual wxSize DoGetBestSize() const;
+
+    // the handler for wxSpinButton events
+    void OnSpinChange(wxSpinEvent& event);
+
     WXHWND m_hwndBuddy;
 
+private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // _WX_MSW_SPINCTRL_H_