X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d77254fc5ff47027b316cad519219623b31adaeb..231b9591aac1d6a507aa1ecfeb5f57e720003391:/include/wx/msw/spinctrl.h

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 79c5c74a2c..e137d50d6e 100644
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -12,16 +12,14 @@
 #ifndef _WX_MSW_SPINCTRL_H_
 #define _WX_MSW_SPINCTRL_H_
 
-#ifdef __GNUG__
-    #pragma interface "spinctrl.h"
-#endif
-
 #include "wx/spinbutt.h"    // the base class
 
+#if wxUSE_SPINCTRL
+
 #include "wx/dynarray.h"
 
-class WXDLLEXPORT wxSpinCtrl;
-WX_DEFINE_EXPORTED_ARRAY(wxSpinCtrl *, wxArraySpins);
+class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
 
 // ----------------------------------------------------------------------------
 // Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call
@@ -29,13 +27,13 @@ WX_DEFINE_EXPORTED_ARRAY(wxSpinCtrl *, wxArraySpins);
 // control is clicked.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSpinCtrl : public wxSpinButton
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton
 {
 public:
     wxSpinCtrl() { }
 
     wxSpinCtrl(wxWindow *parent,
-               wxWindowID id = -1,
+               wxWindowID id = wxID_ANY,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
@@ -47,7 +45,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,
@@ -59,18 +57,23 @@ public:
     // because the base class already has one returning int!)
     void SetValue(const wxString& text);
 
+    // another wxTextCtrl-like method
+    void SetSelection(long from, long to);
+
     // implementation only from now on
     // -------------------------------
 
     virtual ~wxSpinCtrl();
 
-    virtual void SetValue(int val) { wxSpinButton::SetValue(val); }
+    virtual void SetValue(int val);
     virtual int  GetValue() const;
     virtual bool SetFont(const wxFont &font);
     virtual void SetFocus();
 
-    virtual bool Enable(bool enable = TRUE);
-    virtual bool Show(bool show = TRUE);
+    virtual bool Enable(bool enable = true);
+    virtual bool Show(bool show = true);
+
+    virtual bool Reparent(wxWindowBase *newParent);
 
     // wxSpinButton doesn't accept focus, but we do
     virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
@@ -91,12 +94,29 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
     virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoGetClientSize(int *x, int *y) const;
+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip( wxToolTip *tip );
+#endif // wxUSE_TOOLTIPS
 
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 
-    // Handle processing of special keys
+    // handle processing of special keys
     void OnChar(wxKeyEvent& event);
+    void OnSetFocus(wxFocusEvent& event);
+    void OnKillFocus(wxFocusEvent& event);
+
+    // generate spin control update event with the given value
+    void SendSpinUpdate(int value);
+
+    // called to ensure that the value is in the correct range
+    virtual void NormalizeValue();
+
+
+    // the value of the control before the latest change (which might not have
+    // changed anything in fact -- this is why we need this field)
+    int m_oldValue;
 
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;
@@ -109,8 +129,11 @@ protected:
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSpinCtrl)
 };
 
+#endif // wxUSE_SPINCTRL
+
 #endif // _WX_MSW_SPINCTRL_H_