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
2003-10-27 03:42:30 +00:00
parent d642247352
commit c5c5dad595
2 changed files with 8 additions and 8 deletions
--- a/include/wx/generic/timer.h
+++ b/include/wx/generic/timer.h
@@ -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();