projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fixed library names generated by wx-config for OS/2's PM port.
[wxWidgets.git]
/
include
/
wx
/
fdrepdlg.h
diff --git
a/include/wx/fdrepdlg.h
b/include/wx/fdrepdlg.h
index 9f047c2672eee25159323c7fe25e3a82ae5cbcb5..4b5fb6cb59e215a67c72948c476149a623f78479 100644
(file)
--- a/
include/wx/fdrepdlg.h
+++ b/
include/wx/fdrepdlg.h
@@
-175,45
+175,23
@@
END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
+#define wxFindDialogEventHandler(func) \
+ (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func)
+
#define EVT_FIND(id, fn) \
#define EVT_FIND(id, fn) \
- DECLARE_EVENT_TABLE_ENTRY( \
- wxEVT_COMMAND_FIND, id, -1, \
- (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
- & fn, \
- (wxObject *) NULL \
- ),
+ wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn))
#define EVT_FIND_NEXT(id, fn) \
#define EVT_FIND_NEXT(id, fn) \
- DECLARE_EVENT_TABLE_ENTRY( \
- wxEVT_COMMAND_FIND_NEXT, id, -1, \
- (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
- & fn, \
- (wxObject *) NULL \
- ),
+ wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_NEXT, id, wxFindDialogEventHandler(fn))
#define EVT_FIND_REPLACE(id, fn) \
#define EVT_FIND_REPLACE(id, fn) \
- DECLARE_EVENT_TABLE_ENTRY( \
- wxEVT_COMMAND_FIND_REPLACE, id, -1, \
- (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
- & fn, \
- (wxObject *) NULL \
- ),
+ wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_REPLACE, id, wxFindDialogEventHandler(fn))
#define EVT_FIND_REPLACE_ALL(id, fn) \
#define EVT_FIND_REPLACE_ALL(id, fn) \
- DECLARE_EVENT_TABLE_ENTRY( \
- wxEVT_COMMAND_FIND_REPLACE_ALL, id, -1, \
- (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
- & fn, \
- (wxObject *) NULL \
- ),
+ wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_REPLACE_ALL, id, wxFindDialogEventHandler(fn))
#define EVT_FIND_CLOSE(id, fn) \
#define EVT_FIND_CLOSE(id, fn) \
- DECLARE_EVENT_TABLE_ENTRY( \
- wxEVT_COMMAND_FIND_CLOSE, id, -1, \
- (wxObjectEventFunction)(wxEventFunction)(wxFindDialogEventFunction) \
- & fn, \
- (wxObject *) NULL \
- ),
+ wx__DECLARE_EVT1(wxEVT_COMMAND_FIND_CLOSE, id, wxFindDialogEventHandler(fn))
#endif // wxUSE_FINDREPLDLG
#endif // wxUSE_FINDREPLDLG