Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Missing casts to event handling functions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-09 16:29:59 +00:00
parent ef0aea5ad4
commit d94c09cdc6
8 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/choicebk.h
View File

@@ -126,17 +126,13 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&); typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
#define wxChoicebookEventHandler(func) \ #define wxChoicebookEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func)
#define EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) \ #define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, \ wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxChoicebookEventHandler(fn))
id, \
wxChoicebookEventHandler(fn))
#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) \ #define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, \ wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxChoicebookEventHandler(fn))
id, \
wxChoicebookEventHandler(fn))
#endif // wxUSE_CHOICEBOOK #endif // wxUSE_CHOICEBOOK

2
include/wx/dateevt.h
View File

@@ -51,7 +51,7 @@ END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&); typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&);
#define wxDateEventHandler(func) \ #define wxDateEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxDateEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDateEventFunction, &func)
#define EVT_DATE_CHANGED(id, fn) \ #define EVT_DATE_CHANGED(id, fn) \
wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn)) wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn))

2
include/wx/dialup.h
View File

@@ -191,7 +191,7 @@ private:
typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&); typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
#define wxDialUpEventHandler(func) \ #define wxDialUpEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxDialUpEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDialUpEventFunction, &func)
// macros to catch dialup events // macros to catch dialup events
#define EVT_DIALUP_CONNECTED(func) \ #define EVT_DIALUP_CONNECTED(func) \

2
include/wx/fdrepdlg.h
View File

@@ -176,7 +176,7 @@ END_DECLARE_EVENT_TYPES()
typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&); typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
#define wxFindDialogEventHandler(func) \ #define wxFindDialogEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func)
#define EVT_FIND(id, fn) \ #define EVT_FIND(id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn)) wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn))

10
include/wx/generic/grid.h
View File

@@ -1327,7 +1327,7 @@ public:
// DecRef() must be called on the returned pointer, as usual // DecRef() must be called on the returned pointer, as usual
wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const; wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const;
// shortcuts for setting the column parameters // shortcuts for setting the column parameters
// set the format for the data in the column: default is string // set the format for the data in the column: default is string
@@ -2133,16 +2133,16 @@ typedef void (wxEvtHandler::*wxGridRangeSelectEventFunction)(wxGridRangeSelectEv
typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreatedEvent&); typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreatedEvent&);
#define wxGridEventHandler(func) \ #define wxGridEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxGridEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridEventFunction, &func)
#define wxGridSizeEventHandler(func) \ #define wxGridSizeEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxGridSizeEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridSizeEventFunction, &func)
#define wxGridRangeSelectEventHandler(func) \ #define wxGridRangeSelectEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxGridRangeSelectEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridRangeSelectEventFunction, &func)
#define wxGridEditorCreatedEventHandler(func) \ #define wxGridEditorCreatedEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxGridEditorCreatedEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridEditorCreatedEventFunction, &func)
#define wx__DECLARE_GRIDEVT(evt, id, fn) \ #define wx__DECLARE_GRIDEVT(evt, id, fn) \
wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridEventHandler(fn)) wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridEventHandler(fn))

2
include/wx/generic/splitter.h
View File

@@ -389,7 +389,7 @@ private:
typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&); typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
#define wxSplitterEventHandler(func) \ #define wxSplitterEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxSplitterEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSplitterEventFunction, &func)
#define wx__DECLARE_SPLITTEREVT(evt, id, fn) \ #define wx__DECLARE_SPLITTEREVT(evt, id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn)) wx__DECLARE_EVT1(wxEVT_COMMAND_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn))

2
include/wx/process.h
View File

@@ -168,7 +168,7 @@ public:
typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
#define wxProcessEventHandler(func) \ #define wxProcessEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)
#define EVT_END_PROCESS(id, func) \ #define EVT_END_PROCESS(id, func) \
wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func)) wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))

2
include/wx/textctrl.h
View File

@@ -477,7 +477,7 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&);
#define wxTextEventHandler(func) wxCommandEventHandler(func) #define wxTextEventHandler(func) wxCommandEventHandler(func)
#define wxTextUrlEventHandler(func) \ #define wxTextUrlEventHandler(func) \
(wxObjectEventFunction)wxStaticCastEvent(wxTextUrlEventFunction, &func) (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTextUrlEventFunction, &func)
#define wx__DECLARE_TEXTEVT(evt, id, fn) \ #define wx__DECLARE_TEXTEVT(evt, id, fn) \
wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_ ## evt, id, wxTextEventHandler(fn)) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_ ## evt, id, wxTextEventHandler(fn))