Added wxLOCALE_DATE/TIME_FMT support to wxLocale::GetInfo().

[wxWidgets.git] / interface / wx / spinctrl.h

diff --git a/interface/wx/spinctrl.h b/interface/wx/spinctrl.h
index 82d5c2b299fea2251ed16202cfb88f6ead851738..62e6f93eaa92b3475016b93f69404dc07c89ce8f 100644 (file)
--- a/interface/wx/spinctrl.h
+++ b/interface/wx/spinctrl.h
@@ -21,10 +21,17 @@
         events. Using this style will prevent the user from using the Enter key
         for dialog navigation (e.g. activating the default button in the
         dialog) under MSW.
         events. Using this style will prevent the user from using the Enter key
         for dialog navigation (e.g. activating the default button in the
         dialog) under MSW.

+    @style{wxALIGN_LEFT}
+        Same as wxTE_LEFT for wxTextCtrl: the text is left aligned.
+    @style{wxALIGN_CENTRE}
+        Same as wxTE_CENTRE for wxTextCtrl: the text is centered.
+    @style{wxALIGN_RIGHT}
+        Same as wxTE_RIGHT for wxTextCtrl: the text is right aligned (this is
+        the default).

     @endStyleTable
 
 
     @endStyleTable
 
 

-    @beginEventTable{wxSpinEvent}
+    @beginEventEmissionTable{wxSpinEvent}

     @event{EVT_SPINCTRL(id, func)}
         Generated whenever the numeric value of the spinctrl is updated
     @endEventTable
     @event{EVT_SPINCTRL(id, func)}
         Generated whenever the numeric value of the spinctrl is updated
     @endEventTable


@@ -39,7 +46,7 @@
 
     @library{wxcore}
     @category{ctrl}
 
     @library{wxcore}
     @category{ctrl}

-    <!-- @appearance{spinctrl.png} -->
+    @appearance{spinctrl.png}

 
     @see wxSpinButton, wxSpinCtrlDouble, wxControl
 */
 
     @see wxSpinButton, wxSpinCtrlDouble, wxControl
 */


@@ -79,25 +86,24 @@ public:
 
         @see Create()
     */
 
         @see Create()
     */

-    wxSpinCtrl(wxWindow* parent, wxWindowID id = -1,
+    wxSpinCtrl(wxWindow* parent, wxWindowID id = wxID_ANY,

                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100,
                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"));
+               int initial = 0, const wxString& name = "wxSpinCtrl");

 
     /**
         Creation function called by the spin control constructor.
         See wxSpinCtrl() for details.
     */
 
     /**
         Creation function called by the spin control constructor.
         See wxSpinCtrl() for details.
     */

-    bool Create(wxWindow* parent, wxWindowID id = -1,
+    bool Create(wxWindow* parent, 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,

-                long style = wxSP_ARROW_KEYS,
-                int min = 0, int max = 100,
-                int initial = 0, const wxString& name = _T("wxSpinCtrl"));
+                long style = wxSP_ARROW_KEYS, int min = 0, int max = 100,
+                int initial = 0, const wxString& name = "wxSpinCtrl");

 
     /**
         Gets maximal allowable value.
 
     /**
         Gets maximal allowable value.


@@ -127,7 +133,7 @@ public:
         @note this is currently only implemented for Windows and generic versions
               of the control.
     */
         @note this is currently only implemented for Windows and generic versions
               of the control.
     */

-    void SetSelection(long from, long to);
+    virtual void SetSelection(long from, long to);

 
     /**
         Sets the value of the spin control. Use the variant using int instead.
 
     /**
         Sets the value of the spin control. Use the variant using int instead.