- DECLARE_EVENT_TABLE_ENTRY( \
- wxEVT_COMMAND_REPLACE_ALL, id, -1, \
- (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
- & fn, \
- (wxObject *) NULL \
- ),
-
-#define EVT_FIND_FIND_CLOSE(id, fn) \
- DECLARE_EVENT_TABLE_ENTRY( \
- wxEVT_COMMAND_FIND_CLOSE, id, -1, \
- (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
- & fn, \
- (wxObject *) NULL \
- ),
+ wx__DECLARE_EVT1(wxEVT_FIND_REPLACE_ALL, id, wxFindDialogEventHandler(fn))
+
+#define EVT_FIND_CLOSE(id, fn) \
+ wx__DECLARE_EVT1(wxEVT_FIND_CLOSE, id, wxFindDialogEventHandler(fn))
+
+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_FIND wxEVT_FIND
+#define wxEVT_COMMAND_FIND_NEXT wxEVT_FIND_NEXT
+#define wxEVT_COMMAND_FIND_REPLACE wxEVT_FIND_REPLACE
+#define wxEVT_COMMAND_FIND_REPLACE_ALL wxEVT_FIND_REPLACE_ALL
+#define wxEVT_COMMAND_FIND_CLOSE wxEVT_FIND_CLOSE