fix for assert failure when deleting tree ctrl in-place edit window (sometimes)

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

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 84e20dc8404b0cd96587da79b7b341c625c52d72..9d6cd5c3e50b8d485b500396b752b9c774c2c77a 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -12,8 +12,7 @@
 #ifndef _WX_SPINCTRL_H_
 #define _WX_SPINCTRL_H_
 
-#include "wx/control.h"
-#include "wx/event.h"
+#include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 
 // ----------------------------------------------------------------------------
 // a spin ctrl is a text control with a spin button which is usually used to
@@ -34,6 +33,7 @@ public:
     virtual int GetMax() const { return m_max; }
 
     // operations
+    virtual void SetValue(const wxString& value) = 0;
     virtual void SetValue(int val) = 0;
     virtual void SetRange(int minVal, int maxVal) = 0;
 
@@ -52,11 +52,16 @@ protected:
 
 #if defined(__WXMSW__) && defined(__WIN32__)
     #include "wx/msw/spinctrl.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/spinctrl.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/spinctrl.h"
 #else // Win16 || !Win
-    #include "wx/generic/spinctrl.h"
+    #include "wx/generic/spinctlg.h"
 #endif // platform
 
+// Macro must be defined here, not event.h, since it must reference wxSpinEventFunction
+#define EVT_SPINCTRL(id, fn) { wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & fn, (wxObject *) NULL },
+
 #endif // _WX_SPINCTRL_H_