X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57f4f9255e3d70e219e6eabd68c3990c0f471f81..af57c51ab758ad9810ea5bbb3703341cd5f367b1:/include/wx/msw/spinctrl.h

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index e5687d075c..2427369e45 100644
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -12,15 +12,13 @@
 #ifndef _WX_MSW_SPINCTRL_H_
 #define _WX_MSW_SPINCTRL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "spinctrl.h"
-#endif
-
 #include "wx/spinbutt.h"    // the base class
 
+#if wxUSE_SPINCTRL
+
 #include "wx/dynarray.h"
 
-class WXDLLEXPORT wxSpinCtrl;
+class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
 
 // ----------------------------------------------------------------------------
@@ -67,7 +65,7 @@ public:
 
     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();
@@ -94,13 +92,28 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
     virtual void DoGetSize(int *width, int *height) 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;
@@ -116,6 +129,8 @@ private:
     DECLARE_NO_COPY_CLASS(wxSpinCtrl)
 };
 
+#endif // wxUSE_SPINCTRL
+
 #endif // _WX_MSW_SPINCTRL_H_