I forgot to commit this one.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -156,7 +156,7 @@ void wxMenuItem::Init()
|
|||||||
{
|
{
|
||||||
if (m_text.IsEmpty())
|
if (m_text.IsEmpty())
|
||||||
{
|
{
|
||||||
wxASSERT_MSG(wxIsStockId(GetId()), wxT("A non-stock menu item with an empty label?"));
|
wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
|
||||||
m_text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
|
m_text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -353,7 +353,7 @@ void wxMenuItem::SetText(const wxString& txt)
|
|||||||
|
|
||||||
if (text.IsEmpty())
|
if (text.IsEmpty())
|
||||||
{
|
{
|
||||||
wxASSERT_MSG(wxIsStockId(GetId()), wxT("A non-stock menu item with an empty label?"));
|
wxASSERT_MSG(wxIsStockID(GetId()), wxT("A non-stock menu item with an empty label?"));
|
||||||
text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
|
text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR|wxSTOCK_WITH_MNEMONIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user