1. wxMenu changes: wxMenuBase appears, several new functions for dynamic menu

handling as well
2. new sample: menu
3. small corrections to wxFileHistory made possible by wxMenu changes
4. ugly fix for panel loaded from resources and TABbing
5. wxDataObject &c doc updates


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-02 01:25:43 +00:00
parent cf85cb95f1
commit 717a57c2fa
29 changed files with 2205 additions and 1790 deletions

View File

@@ -1931,11 +1931,21 @@ void wxFileHistory::RemoveFileFromHistory(int i)
// delete the last menu item which is unused now
menu->Delete(wxID_FILE1 + m_fileHistoryN - 1);
// unfortunately, we can't delete separator (there is no function to
// delete item by position, only by id - and what if there are several
// separators in this menu?) - so we will be always left with at least
// one and, even worse, we will add another one if this was the last
// file... (FIXME)
// delete the last separator too if no more files are left
if ( m_fileHistoryN == 1 )
{
wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
if ( node )
{
wxMenuItem *menuItem = node->GetData();
if ( menuItem->IsSeparator() )
{
menu->Delete(menuItem);
}
//else: should we search backwards for the last separator?
}
//else: menu is empty somehow
}
}
m_fileHistoryN--;