From: Włodzimierz Skiba Date: Wed, 9 Mar 2005 16:29:59 +0000 (+0000) Subject: Missing casts to event handling functions. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d94c09cdc685ff1dc85365af2ba7d36fa86d1002 Missing casts to event handling functions. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h index 0453908336..dadd5f4be7 100644 --- a/include/wx/choicebk.h +++ b/include/wx/choicebk.h @@ -126,17 +126,13 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&); #define wxChoicebookEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func) -#define EVT_CHOICEBOOK_PAGE_CHANGED(id, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, \ - id, \ - wxChoicebookEventHandler(fn)) +#define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxChoicebookEventHandler(fn)) -#define EVT_CHOICEBOOK_PAGE_CHANGING(id, fn) \ - wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, \ - id, \ - wxChoicebookEventHandler(fn)) +#define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \ + wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxChoicebookEventHandler(fn)) #endif // wxUSE_CHOICEBOOK diff --git a/include/wx/dateevt.h b/include/wx/dateevt.h index e8ea798496..b37340c5cd 100644 --- a/include/wx/dateevt.h +++ b/include/wx/dateevt.h @@ -51,7 +51,7 @@ END_DECLARE_EVENT_TYPES() typedef void (wxEvtHandler::*wxDateEventFunction)(wxDateEvent&); #define wxDateEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxDateEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDateEventFunction, &func) #define EVT_DATE_CHANGED(id, fn) \ wx__DECLARE_EVT1(wxEVT_DATE_CHANGED, id, wxDateEventHandler(fn)) diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 30c06f756c..2a9975fd51 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -191,7 +191,7 @@ private: typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&); #define wxDialUpEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxDialUpEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDialUpEventFunction, &func) // macros to catch dialup events #define EVT_DIALUP_CONNECTED(func) \ diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h index 8e2d8970b4..4b5fb6cb59 100644 --- a/include/wx/fdrepdlg.h +++ b/include/wx/fdrepdlg.h @@ -176,7 +176,7 @@ END_DECLARE_EVENT_TYPES() typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&); #define wxFindDialogEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func) #define EVT_FIND(id, fn) \ wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn)) diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index cdca4984ef..faa87dded8 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -1327,7 +1327,7 @@ public: // DecRef() must be called on the returned pointer, as usual wxGridCellAttr *GetOrCreateCellAttr(int row, int col) const; - + // shortcuts for setting the column parameters // 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&); #define wxGridEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxGridEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridEventFunction, &func) #define wxGridSizeEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxGridSizeEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridSizeEventFunction, &func) #define wxGridRangeSelectEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxGridRangeSelectEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridRangeSelectEventFunction, &func) #define wxGridEditorCreatedEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxGridEditorCreatedEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxGridEditorCreatedEventFunction, &func) #define wx__DECLARE_GRIDEVT(evt, id, fn) \ wx__DECLARE_EVT1(wxEVT_GRID_ ## evt, id, wxGridEventHandler(fn)) diff --git a/include/wx/generic/splitter.h b/include/wx/generic/splitter.h index dc767d5b71..12056cac56 100644 --- a/include/wx/generic/splitter.h +++ b/include/wx/generic/splitter.h @@ -389,7 +389,7 @@ private: typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&); #define wxSplitterEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxSplitterEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSplitterEventFunction, &func) #define wx__DECLARE_SPLITTEREVT(evt, id, fn) \ wx__DECLARE_EVT1(wxEVT_COMMAND_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn)) diff --git a/include/wx/process.h b/include/wx/process.h index baaea3e330..b372d7235f 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -168,7 +168,7 @@ public: typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); #define wxProcessEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func) #define EVT_END_PROCESS(id, func) \ wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func)) diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 9d66c98012..29806404bd 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -477,7 +477,7 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&); #define wxTextEventHandler(func) wxCommandEventHandler(func) #define wxTextUrlEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxTextUrlEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTextUrlEventFunction, &func) #define wx__DECLARE_TEXTEVT(evt, id, fn) \ wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_ ## evt, id, wxTextEventHandler(fn))