[1001483] Added wxPasswordEntryDialog analagous to wxTextEntryDialog, allows detectin...

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

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index d1b84a732889e91703a74488810dc1611012ccda..ff315b97aea9cd40dea8ca3bd8c8224fd23eb57e 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -22,7 +22,7 @@
 
 #if wxUSE_SPINBTN
 
 
 #if wxUSE_SPINBTN
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "spinctlg.h"
 #endif
 
     #pragma interface "spinctlg.h"
 #endif
 


@@ -39,7 +39,7 @@ public:
     wxSpinCtrl() { Init(); }
 
     wxSpinCtrl(wxWindow *parent,
     wxSpinCtrl() { Init(); }
 
     wxSpinCtrl(wxWindow *parent,

-               wxWindowID id = -1,
+               wxWindowID id = wxID_ANY,

                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,


@@ -47,11 +47,12 @@ public:
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = _T("wxSpinCtrl"))
     {
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = _T("wxSpinCtrl"))
     {

+        Init();

         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
 
     bool Create(wxWindow *parent,
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
 
     bool Create(wxWindow *parent,

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,


@@ -65,6 +66,7 @@ public:
     void SetValue(int val);
     void SetValue(const wxString& text);
     void SetRange(int min, int max);
     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;
 
     // accessors
     int GetValue() const;


@@ -74,8 +76,8 @@ public:
     // implementation from now on
 
     // forward these functions to all subcontrols
     // 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; }
 
     // get the subcontrols
     wxTextCtrl *GetText() const { return m_text; }


@@ -85,13 +87,13 @@ public:
     void SetTextValue(int val);
 
     // put the numeric value of the string in the text ctrl into val and return
     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
     // 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
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // common part of all ctors


@@ -101,7 +103,7 @@ private:
     // the subcontrols
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;
     // the subcontrols
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };


@@ -120,7 +122,7 @@ public:
     wxSpinCtrl() { Init(); }
 
     wxSpinCtrl(wxWindow *parent,
     wxSpinCtrl() { Init(); }
 
     wxSpinCtrl(wxWindow *parent,

-               wxWindowID id = -1,
+               wxWindowID id = wxID_ANY,

                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,


@@ -132,7 +134,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
     }
 
     bool Create(wxWindow *parent,

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,