Revert menus and toolbars to using wxNewId() too since their IDs can't

be negative either

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 582fb2da81a80575fafb7e2173db930b7b3e9886..3aa70ce99dc4b62ee6c8fb6dc4f1328275aa496b 100644 (file)
--- 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_tbar = tbar;
         m_id = toolid;
         if (m_id == wxID_ANY)

-            m_id = wxWindow::NewControlId();
+            m_id = wxNewId();

         m_clientData = clientData;
 
         m_bmpNormal = bmpNormal;
         m_clientData = clientData;
 
         m_bmpNormal = bmpNormal;

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 7d5185c1b51d0b043bacddbef01e13d14292bc55..49f3a00d9e08b8f9deef1edbf56b38949f59a60e 100644 (file)
--- 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          = id;
     m_kind        = kind;
     if (m_id == wxID_ANY)

-        m_id = wxWindow::NewControlId();
+        m_id = wxNewId();

     if (m_id == wxID_SEPARATOR)
         m_kind = wxITEM_SEPARATOR;
 
     if (m_id == wxID_SEPARATOR)
         m_kind = wxITEM_SEPARATOR;