Fixed some warnings (don't know why dialoged Makefile is being committed)

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

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index ee3dcb2c53c0cfc401c2ecd3fe1f1c76379e8ab1..94b62fb8463188700c8cdb9df8277862e9a38bc8 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
@@ -61,5 +60,9 @@ protected:
     #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) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & fn, (wxObject *) NULL ),
+
 #endif // _WX_SPINCTRL_H_