Changed all symbols with the name "id" to "timerid" to allow Objective-C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,7 +25,7 @@ class WXDLLEXPORT wxTimer : public wxTimerBase
|
||||
{
|
||||
public:
|
||||
wxTimer() { Init(); }
|
||||
wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
|
||||
wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
|
||||
{ Init(); }
|
||||
~wxTimer();
|
||||
|
||||
|
Reference in New Issue
Block a user