From f24b783af3785e748b775409d926361e87e8eb13 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 21 Jan 2007 06:43:59 +0000 Subject: [PATCH] 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 --- include/wx/tbarbase.h | 2 +- src/common/menucmn.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 582fb2da81..3aa70ce99d 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 = wxWindow::NewControlId(); + m_id = wxNewId(); m_clientData = clientData; m_bmpNormal = bmpNormal; diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index 7d5185c1b5..49f3a00d9e 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 = wxWindow::NewControlId(); + m_id = wxNewId(); if (m_id == wxID_SEPARATOR) m_kind = wxITEM_SEPARATOR; -- 2.45.2