don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -220,7 +220,7 @@ typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&);
|
||||
#define wxActiveXEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST( wxActiveXEventFunction, func )
|
||||
|
||||
#define EVT_ACTIVEX(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_ACTIVEX, id, -1, wxActiveXEventHandler( fn ), (wxObject *) NULL ),
|
||||
#define EVT_ACTIVEX(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_ACTIVEX, id, -1, wxActiveXEventHandler( fn ), NULL ),
|
||||
|
||||
#endif // wxUSE_ACTIVEX
|
||||
|
||||
|
@@ -64,7 +64,7 @@ public:
|
||||
const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant);
|
||||
|
||||
// Get/Put property
|
||||
wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const;
|
||||
wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const;
|
||||
wxVariant GetPropertyArray(const wxString& property, int noArgs, const wxVariant **args) const;
|
||||
wxVariant GetProperty(const wxString& property,
|
||||
const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant,
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
|
||||
// A way of initialising another wxAutomationObject with a dispatch object,
|
||||
// without having to deal with nasty IDispatch pointers.
|
||||
bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const;
|
||||
bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const;
|
||||
bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const;
|
||||
|
||||
public:
|
||||
|
Reference in New Issue
Block a user