Avoid deprecation warnings for GetText (patch #1829903)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -201,7 +201,7 @@ void wxMenu::UpdateAccel(
|
|||||||
//
|
//
|
||||||
// Find the (new) accel for this item
|
// Find the (new) accel for this item
|
||||||
//
|
//
|
||||||
wxAcceleratorEntry* pAccel = wxAcceleratorEntry::Create(pItem->GetText());
|
wxAcceleratorEntry* pAccel = wxAcceleratorEntry::Create(pItem->GetItemLabel());
|
||||||
|
|
||||||
if (pAccel)
|
if (pAccel)
|
||||||
pAccel->m_command = pItem->GetId();
|
pAccel->m_command = pItem->GetId();
|
||||||
@@ -323,7 +323,7 @@ bool wxMenu::DoInsertOrAppend( wxMenuItem* pItem,
|
|||||||
//
|
//
|
||||||
rItem.afStyle |= MIS_TEXT;
|
rItem.afStyle |= MIS_TEXT;
|
||||||
}
|
}
|
||||||
pData = (char*) pItem->GetText().wx_str();
|
pData = (char*) pItem->GetItemLabel().wx_str();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nPos == (size_t)-1)
|
if (nPos == (size_t)-1)
|
||||||
|
Reference in New Issue
Block a user