added wxGLCanvas::IsDisplaySupported() (patch 1879906)

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 350c6ea86180c096b6a8cd437879824dcc4dbdb7..cf94fe18a3edb9407310cc93d72aa65f9748c368 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -12,17 +12,13 @@
 #ifndef _WX_MSW_SPINCTRL_H_
 #define _WX_MSW_SPINCTRL_H_
 
 #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"
 
 #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);
 
 // ----------------------------------------------------------------------------
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
 
 // ----------------------------------------------------------------------------


@@ -69,7 +65,7 @@ public:
 
     virtual ~wxSpinCtrl();
 
 
     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 int  GetValue() const;
     virtual bool SetFont(const wxFont &font);
     virtual void SetFocus();


@@ -96,13 +92,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 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);
 
 
     // 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 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;
 
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;