initial draft of wxCollapsiblePane (patch 1577412 by Francesco)

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

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index 973af21a18bbba66b3e7fb2d33647b8855689038..50e6ef6afeaa411e1c9beaf779c34a0903eebdec 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -20,11 +20,7 @@
 // without tons of #ifdefs.
 // ----------------------------------------------------------------------------
 
-#if wxUSE_SPINBTN 
-
-#ifdef __GNUG__
-    #pragma interface "spinctlg.h"
-#endif
+#if wxUSE_SPINBTN
 
 class WXDLLEXPORT wxSpinButton;
 class WXDLLEXPORT wxTextCtrl;
@@ -39,7 +35,7 @@ public:
     wxSpinCtrl() { Init(); }
 
     wxSpinCtrl(wxWindow *parent,
-               wxWindowID id = -1,
+               wxWindowID id = wxID_ANY,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
@@ -52,7 +48,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
@@ -66,6 +62,7 @@ public:
     void SetValue(int val);
     void SetValue(const wxString& text);
     void SetRange(int min, int max);
+    void SetSelection(long from, long to);
 
     // accessors
     int GetValue() const;
@@ -75,8 +72,8 @@ public:
     // implementation from now on
 
     // forward these functions to all subcontrols
-    virtual bool Enable(bool enable = TRUE);
-    virtual bool Show(bool show = TRUE);
+    virtual bool Enable(bool enable = true);
+    virtual bool Show(bool show = true);
 
     // get the subcontrols
     wxTextCtrl *GetText() const { return m_text; }
@@ -86,13 +83,13 @@ public:
     void SetTextValue(int val);
 
     // put the numeric value of the string in the text ctrl into val and return
-    // TRUE or return FALSE if the text ctrl doesn't contain a number or if the
+    // true or return false if the text ctrl doesn't contain a number or if the
     // number is out of range
     bool GetTextValue(int *val) const;
 
 protected:
     // override the base class virtuals involved into geometry calculations
-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // common part of all ctors
@@ -102,7 +99,7 @@ private:
     // the subcontrols
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
@@ -121,7 +118,7 @@ public:
     wxSpinCtrl() { Init(); }
 
     wxSpinCtrl(wxWindow *parent,
-               wxWindowID id = -1,
+               wxWindowID id = wxID_ANY,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
@@ -133,7 +130,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,