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
This commit is contained in:
parent
6d727f6c10
commit
f24b783af3
@ -76,7 +76,7 @@ public:
|
|||||||
m_tbar = tbar;
|
m_tbar = tbar;
|
||||||
m_id = toolid;
|
m_id = toolid;
|
||||||
if (m_id == wxID_ANY)
|
if (m_id == wxID_ANY)
|
||||||
m_id = wxWindow::NewControlId();
|
m_id = wxNewId();
|
||||||
m_clientData = clientData;
|
m_clientData = clientData;
|
||||||
|
|
||||||
m_bmpNormal = bmpNormal;
|
m_bmpNormal = bmpNormal;
|
||||||
|
@ -375,7 +375,7 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
|
|||||||
m_id = id;
|
m_id = id;
|
||||||
m_kind = kind;
|
m_kind = kind;
|
||||||
if (m_id == wxID_ANY)
|
if (m_id == wxID_ANY)
|
||||||
m_id = wxWindow::NewControlId();
|
m_id = wxNewId();
|
||||||
if (m_id == wxID_SEPARATOR)
|
if (m_id == wxID_SEPARATOR)
|
||||||
m_kind = wxITEM_SEPARATOR;
|
m_kind = wxITEM_SEPARATOR;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user