From 9249d38d6e18ba24119fefa8970b6e8ce7104de3 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 18 Jan 2007 14:15:54 +0000
Subject: [PATCH] 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
---
 include/wx/tbarbase.h    | 2 +-
 include/wx/timer.h       | 8 ++++++--
 include/wx/xrc/xmlres.h  | 2 +-
 src/common/menucmn.cpp   | 2 +-
 src/generic/choicbkg.cpp | 2 +-
 src/generic/listbkg.cpp  | 2 +-
 src/generic/toolbkg.cpp  | 2 +-
 src/generic/treebkg.cpp  | 2 +-
 src/xrc/xmlres.cpp       | 2 +-
 9 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 3aa70ce99d..582fb2da81 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -76,7 +76,7 @@ public:
         m_tbar = tbar;
         m_id = toolid;
         if (m_id == wxID_ANY)
-            m_id = wxNewId();
+            m_id = wxWindow::NewControlId();
         m_clientData = clientData;
 
         m_bmpNormal = bmpNormal;
diff --git a/include/wx/timer.h b/include/wx/timer.h
index b0efc9d3ad..2ce27b648c 100644
--- 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();
 
diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index c581aafc8b..a2758acef8 100644
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -223,7 +223,7 @@ public:
     // resource. If an unknown str_id is requested (i.e. other than wxID_XXX
     // or integer), a new record is created which associates the given string
     // with a number. If value_if_not_found == wxID_NONE, the number is obtained via
-    // wxNewId(). Otherwise value_if_not_found is used.
+    // wxWindow::NewControlId(). Otherwise value_if_not_found is used.
     // Macro XRCID(name) is provided for convenient use in event tables.
     static int GetXRCID(const wxChar *str_id, int value_if_not_found = wxID_NONE);
 
diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 49f3a00d9e..7d5185c1b5 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -375,7 +375,7 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
     m_id          = id;
     m_kind        = kind;
     if (m_id == wxID_ANY)
-        m_id = wxNewId();
+        m_id = wxWindow::NewControlId();
     if (m_id == wxID_SEPARATOR)
         m_kind = wxITEM_SEPARATOR;
 
diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 6eb0219821..5a69921346 100644
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -54,7 +54,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
 const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();
 #endif
-const int wxID_CHOICEBOOKCHOICE = wxNewId();
+const int wxID_CHOICEBOOKCHOICE = wxWindow::NewControlId();
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
     EVT_CHOICE(wxID_CHOICEBOOKCHOICE, wxChoicebook::OnChoiceSelected)
diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index a898d98276..fa585a19dd 100644
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -54,7 +54,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent)
 const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType();
 #endif
-const int wxID_LISTBOOKLISTVIEW = wxNewId();
+const int wxID_LISTBOOKLISTVIEW = wxWindow::NewControlId();
 
 BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)
diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 310c29ab71..30b39328d8 100644
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -50,7 +50,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent)
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();
 #endif
-const int wxID_TOOLBOOKTOOLBAR = wxNewId();
+const int wxID_TOOLBOOKTOOLBAR = wxWindow::NewControlId();
 
 BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
     EVT_SIZE(wxToolbook::OnSize)
diff --git a/src/generic/treebkg.cpp b/src/generic/treebkg.cpp
index 3b8b22c21e..c82869767b 100644
--- a/src/generic/treebkg.cpp
+++ b/src/generic/treebkg.cpp
@@ -54,7 +54,7 @@ const wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = wxNewEventType();
 #endif
-const int wxID_TREEBOOKTREEVIEW = wxNewId();
+const int wxID_TREEBOOKTREEVIEW = wxWindow::NewControlId();
 
 BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase)
     EVT_TREE_SEL_CHANGED   (wxID_TREEBOOKTREEVIEW, wxTreebook::OnTreeSelectionChange)
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 479dbbd138..cd05c3f70d 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -1594,7 +1594,7 @@ static int XRCID_Lookup(const wxChar *str_id, int value_if_not_found = wxID_NONE
         }
         else
         {
-            (*rec_var)->id = wxNewId();
+            (*rec_var)->id = wxWindow::NewControlId();
         }
     }
 
-- 
2.45.2