use wxWindow::NewControlId() instead of wxNewId() to avoid clashes with the user-defined ids

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-18 14:15:54 +00:00
parent fb96cf856e
commit 9249d38d6e
9 changed files with 14 additions and 10 deletions
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -51,8 +51,12 @@ public:

    // same as ctor above
    void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY)
-        { m_owner = owner; m_idTimer = timerid == wxID_ANY ? wxNewId() : timerid; }
-    wxEvtHandler * GetOwner() const { return m_owner; }
+    {
+        m_owner = owner;
+        m_idTimer = timerid == wxID_ANY ? wxWindow::NewControlId() : timerid;
+    }
+
+    wxEvtHandler *GetOwner() const { return m_owner; }

    virtual ~wxTimerBase();