Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/include/wx/osx/spinctrl.h b/include/wx/osx/spinctrl.h
index a2f0c6223a54edf61c3fa40221cc6604a2a3ffe2..f8a7ab2057afef431c69d876616aab16339f90a1 100644 (file)
--- a/include/wx/osx/spinctrl.h
+++ b/include/wx/osx/spinctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/generic/spinctlg.h
+// Name:        wx/osx/spinctrl.h

 // Purpose:     generic wxSpinCtrl class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     generic wxSpinCtrl class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -20,7 +20,7 @@
 // without tons of #ifdefs.
 // ----------------------------------------------------------------------------
 
 // without tons of #ifdefs.
 // ----------------------------------------------------------------------------
 

-#if wxUSE_SPINBTN 
+#if wxUSE_SPINBTN

 
 #include "wx/containr.h"
 
 
 #include "wx/containr.h"
 


@@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxSpinCtrlButton;
 // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
 // ----------------------------------------------------------------------------
 
 // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxNavigationEnabled<wxControl>

 {
 public:
     wxSpinCtrl() { Init(); }
 {
 public:
     wxSpinCtrl() { Init(); }


@@ -43,9 +43,9 @@ public:
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,

-               long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                int min = 0, int max = 100, int initial = 0,
                int min = 0, int max = 100, int initial = 0,

-               const wxString& name = _T("wxSpinCtrl"))
+               const wxString& name = wxT("wxSpinCtrl"))

     {
         Init();
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     {
         Init();
         Create(parent, id, value, pos, size, style, min, max, initial, name);


@@ -56,9 +56,9 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                 int min = 0, int max = 100, int initial = 0,
                 int min = 0, int max = 100, int initial = 0,

-                const wxString& name = _T("wxSpinCtrl"));
+                const wxString& name = wxT("wxSpinCtrl"));

 
     // wxTextCtrl-like method
     void SetSelection(long from, long to);
 
     // wxTextCtrl-like method
     void SetSelection(long from, long to);


@@ -78,8 +78,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; }


@@ -93,8 +93,6 @@ public:
     // number is out of range
     bool GetTextValue(int *val) const;
 
     // number is out of range
     bool GetTextValue(int *val) const;
 

-    WX_DECLARE_CONTROL_CONTAINER();
-

 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;


@@ -107,13 +105,12 @@ private:
     // the subcontrols
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;
     // the subcontrols
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;

-    
+

     friend class wxSpinCtrlText;
     friend class wxSpinCtrlButton;
     friend class wxSpinCtrlText;
     friend class wxSpinCtrlButton;

-    
+

     int            m_oldValue;
 private:
     int            m_oldValue;
 private:

-    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 


@@ -135,9 +132,9 @@ public:
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,

-               long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                int min = 0, int max = 100, int initial = 0,
                int min = 0, int max = 100, int initial = 0,

-               const wxString& name = _T("wxSpinCtrl"))
+               const wxString& name = wxT("wxSpinCtrl"))

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


@@ -147,9 +144,9 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxSP_ARROW_KEYS | wxTE_RIGHT,
+                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,

                 int min = 0, int max = 100, int initial = 0,
                 int min = 0, int max = 100, int initial = 0,

-                const wxString& name = _T("wxSpinCtrl"))
+                const wxString& name = wxT("wxSpinCtrl"))

     {
         SetRange(min, max);
 
     {
         SetRange(min, max);