fix removing menu item, ticket 3387
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -829,7 +829,7 @@ wxString wxMenuItem::GTKProcessMenuItemLabel(const wxString& str, wxString *hotK
|
|||||||
hotKey->Empty();
|
hotKey->Empty();
|
||||||
if(*pc == wxT('\t'))
|
if(*pc == wxT('\t'))
|
||||||
{
|
{
|
||||||
pc++;
|
++pc;
|
||||||
hotKey->assign(pc, str.end());
|
hotKey->assign(pc, str.end());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1215,9 +1215,8 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
|
|||||||
m_prevRadio = NULL;
|
m_prevRadio = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: this code doesn't delete the item factory item and this seems
|
gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), NULL);
|
||||||
// impossible as of GTK 1.2.6.
|
gtk_container_remove(GTK_CONTAINER(m_menu), mitem);
|
||||||
gtk_widget_destroy( mitem );
|
|
||||||
|
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user