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
@@ -37,14 +37,410 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
|
||||
WX_DEFINE_LIST(wxMenuList);
|
||||
WX_DEFINE_LIST(wxMenuItemList);
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
// ============================================================================
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// ctor and dtor
|
||||
// wxMenuItem
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxMenuItemBase::~wxMenuItemBase()
|
||||
{
|
||||
delete m_subMenu;
|
||||
}
|
||||
|
||||
#if wxUSE_ACCEL
|
||||
|
||||
void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
|
||||
{
|
||||
wxString text = m_text.BeforeFirst(wxT('\t'));
|
||||
if ( accel )
|
||||
{
|
||||
text += wxT('\t');
|
||||
|
||||
int flags = accel->GetFlags();
|
||||
if ( flags & wxACCEL_ALT )
|
||||
text += wxT("Alt-");
|
||||
if ( flags & wxACCEL_CTRL )
|
||||
text += wxT("Ctrl-");
|
||||
if ( flags & wxACCEL_SHIFT )
|
||||
text += wxT("Shift-");
|
||||
|
||||
int code = accel->GetKeyCode();
|
||||
switch ( code )
|
||||
{
|
||||
case WXK_F1:
|
||||
case WXK_F2:
|
||||
case WXK_F3:
|
||||
case WXK_F4:
|
||||
case WXK_F5:
|
||||
case WXK_F6:
|
||||
case WXK_F7:
|
||||
case WXK_F8:
|
||||
case WXK_F9:
|
||||
case WXK_F10:
|
||||
case WXK_F11:
|
||||
case WXK_F12:
|
||||
text << wxT('F') << code - WXK_F1 + 1;
|
||||
break;
|
||||
|
||||
// if there are any other keys wxGetAccelFromString() may return,
|
||||
// we should process them here
|
||||
|
||||
default:
|
||||
if ( wxIsalnum(code) )
|
||||
{
|
||||
text << (wxChar)code;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
wxFAIL_MSG( wxT("unknown keyboard accel") );
|
||||
}
|
||||
}
|
||||
|
||||
SetText(text);
|
||||
}
|
||||
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMenu ctor and dtor
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
void wxMenuBase::Init(long style)
|
||||
{
|
||||
m_items.DeleteContents(TRUE);
|
||||
|
||||
m_menuBar = (wxMenuBar *)NULL;
|
||||
m_menuParent = (wxMenu *)NULL;
|
||||
|
||||
m_invokingWindow = (wxWindow *)NULL;
|
||||
m_style = style;
|
||||
m_clientData = (void *)NULL;
|
||||
m_eventHandler = this;
|
||||
}
|
||||
|
||||
wxMenuBase::~wxMenuBase()
|
||||
{
|
||||
// nothing to do, wxMenuItemList dtor will delete the menu items
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMenu item adding/removing
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
bool wxMenuBase::DoAppend(wxMenuItem *item)
|
||||
{
|
||||
wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Append()") );
|
||||
|
||||
m_items.Append(item);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool wxMenuBase::Insert(size_t pos, wxMenuItem *item)
|
||||
{
|
||||
wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Insert") );
|
||||
wxCHECK_MSG( pos < GetMenuItemCount(), FALSE,
|
||||
wxT("invalid index in wxMenu::Insert") );
|
||||
|
||||
return DoInsert(pos, item);
|
||||
}
|
||||
|
||||
bool wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
|
||||
{
|
||||
wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Insert()") );
|
||||
|
||||
wxMenuItemList::Node *node = m_items.Item(pos);
|
||||
wxCHECK_MSG( node, FALSE, wxT("invalid index in wxMenu::Insert()") );
|
||||
|
||||
m_items.Insert(node, item);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
wxMenuItem *wxMenuBase::Remove(wxMenuItem *item)
|
||||
{
|
||||
wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Remove") );
|
||||
|
||||
return DoRemove(item);
|
||||
}
|
||||
|
||||
wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
|
||||
{
|
||||
wxMenuItemList::Node *node = m_items.Find(item);
|
||||
|
||||
// if we get here, the item is valid or one of Remove() functions is broken
|
||||
wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
|
||||
|
||||
// we detach the item, but we do delete the list node (i.e. don't call
|
||||
// DetachNode() here!)
|
||||
node->SetData((wxMenuItem *)NULL); // to prevent it from deleting the item
|
||||
m_items.DeleteNode(node);
|
||||
|
||||
// item isn't attached to anything any more
|
||||
wxMenu *submenu = item->GetSubMenu();
|
||||
if ( submenu )
|
||||
{
|
||||
submenu->SetParent((wxMenu *)NULL);
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
bool wxMenuBase::Delete(wxMenuItem *item)
|
||||
{
|
||||
wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Delete") );
|
||||
|
||||
return DoDelete(item);
|
||||
}
|
||||
|
||||
bool wxMenuBase::DoDelete(wxMenuItem *item)
|
||||
{
|
||||
wxMenuItem *item2 = DoRemove(item);
|
||||
wxCHECK_MSG( item2, FALSE, wxT("failed to delete menu item") );
|
||||
|
||||
// don't delete the submenu
|
||||
item2->SetSubMenu((wxMenu *)NULL);
|
||||
|
||||
delete item2;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
bool wxMenuBase::Destroy(wxMenuItem *item)
|
||||
{
|
||||
wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Destroy") );
|
||||
|
||||
return DoDestroy(item);
|
||||
}
|
||||
|
||||
bool wxMenuBase::DoDestroy(wxMenuItem *item)
|
||||
{
|
||||
wxMenuItem *item2 = DoRemove(item);
|
||||
wxCHECK_MSG( item2, FALSE, wxT("failed to delete menu item") );
|
||||
|
||||
delete item2;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMenu searching for items
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Finds the item id matching the given string, -1 if not found.
|
||||
int wxMenuBase::FindItem(const wxString& text) const
|
||||
{
|
||||
wxString label = wxMenuItem(NULL, wxID_SEPARATOR, text).GetLabel();
|
||||
for ( wxMenuItemList::Node *node = m_items.GetFirst();
|
||||
node;
|
||||
node = node->GetNext() )
|
||||
{
|
||||
wxMenuItem *item = node->GetData();
|
||||
if ( item->IsSubMenu() )
|
||||
{
|
||||
int rc = item->GetSubMenu()->FindItem(label);
|
||||
if ( rc != wxNOT_FOUND )
|
||||
return rc;
|
||||
}
|
||||
else if ( !item->IsSeparator() )
|
||||
{
|
||||
if ( item->GetLabel() == label )
|
||||
return item->GetId();
|
||||
}
|
||||
}
|
||||
|
||||
return wxNOT_FOUND;
|
||||
}
|
||||
|
||||
// recursive search for item by id
|
||||
wxMenuItem *wxMenuBase::FindItem(int itemId, wxMenu **itemMenu) const
|
||||
{
|
||||
if ( itemMenu )
|
||||
*itemMenu = NULL;
|
||||
|
||||
wxMenuItem *item = NULL;
|
||||
for ( wxMenuItemList::Node *node = m_items.GetFirst();
|
||||
node && !item;
|
||||
node = node->GetNext() )
|
||||
{
|
||||
item = node->GetData();
|
||||
|
||||
if ( item->GetId() == itemId )
|
||||
{
|
||||
if ( itemMenu )
|
||||
*itemMenu = (wxMenu *)this;
|
||||
}
|
||||
else if ( item->IsSubMenu() )
|
||||
{
|
||||
item = item->GetSubMenu()->FindItem(itemId, itemMenu);
|
||||
}
|
||||
else
|
||||
{
|
||||
// don't exit the loop
|
||||
item = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
// non recursive search
|
||||
wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
|
||||
{
|
||||
wxMenuItem *item = (wxMenuItem *)NULL;
|
||||
wxMenuItemList::Node *node = GetMenuItems().GetFirst();
|
||||
|
||||
size_t pos;
|
||||
for ( pos = 0; node; pos++ )
|
||||
{
|
||||
item = node->GetData();
|
||||
if ( item->GetId() == id )
|
||||
break;
|
||||
|
||||
node = node->GetNext();
|
||||
}
|
||||
|
||||
if ( ppos )
|
||||
{
|
||||
*ppos = item ? pos : wxNOT_FOUND;
|
||||
}
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMenu helpers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Update a menu and all submenus recursively. source is the object that has
|
||||
// the update event handlers defined for it. If NULL, the menu or associated
|
||||
// window will be used.
|
||||
void wxMenuBase::UpdateUI(wxEvtHandler* source)
|
||||
{
|
||||
if ( !source && GetInvokingWindow() )
|
||||
source = GetInvokingWindow()->GetEventHandler();
|
||||
if ( !source )
|
||||
source = GetEventHandler();
|
||||
if ( !source )
|
||||
source = this;
|
||||
|
||||
wxMenuItemList::Node* node = GetMenuItems().GetFirst();
|
||||
while ( node )
|
||||
{
|
||||
wxMenuItem* item = node->GetData();
|
||||
if ( !item->IsSeparator() )
|
||||
{
|
||||
wxWindowID id = item->GetId();
|
||||
wxUpdateUIEvent event(id);
|
||||
event.SetEventObject( source );
|
||||
|
||||
if ( source->ProcessEvent(event) )
|
||||
{
|
||||
// if anything changed, update the chanegd attribute
|
||||
if (event.GetSetText())
|
||||
SetLabel(id, event.GetText());
|
||||
if (event.GetSetChecked())
|
||||
Check(id, event.GetChecked());
|
||||
if (event.GetSetEnabled())
|
||||
Enable(id, event.GetEnabled());
|
||||
}
|
||||
|
||||
// recurse to the submenus
|
||||
if ( item->GetSubMenu() )
|
||||
item->GetSubMenu()->UpdateUI(source);
|
||||
}
|
||||
//else: item is a separator (which don't process update UI events)
|
||||
|
||||
node = node->GetNext();
|
||||
}
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMenu functions forwarded to wxMenuItem
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
void wxMenuBase::Enable( int id, bool enable )
|
||||
{
|
||||
wxMenuItem *item = FindItem(id);
|
||||
|
||||
wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") );
|
||||
|
||||
item->Enable(enable);
|
||||
}
|
||||
|
||||
bool wxMenuBase::IsEnabled( int id ) const
|
||||
{
|
||||
wxMenuItem *item = FindItem(id);
|
||||
|
||||
wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsEnabled: no such item") );
|
||||
|
||||
return item->IsEnabled();
|
||||
}
|
||||
|
||||
void wxMenuBase::Check( int id, bool enable )
|
||||
{
|
||||
wxMenuItem *item = FindItem(id);
|
||||
|
||||
wxCHECK_RET( item, wxT("wxMenu::Check: no such item") );
|
||||
|
||||
item->Check(enable);
|
||||
}
|
||||
|
||||
bool wxMenuBase::IsChecked( int id ) const
|
||||
{
|
||||
wxMenuItem *item = FindItem(id);
|
||||
|
||||
wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsChecked: no such item") );
|
||||
|
||||
return item->IsChecked();
|
||||
}
|
||||
|
||||
void wxMenuBase::SetLabel( int id, const wxString &label )
|
||||
{
|
||||
wxMenuItem *item = FindItem(id);
|
||||
|
||||
wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") );
|
||||
|
||||
item->SetText(label);
|
||||
}
|
||||
|
||||
wxString wxMenuBase::GetLabel( int id ) const
|
||||
{
|
||||
wxMenuItem *item = FindItem(id);
|
||||
|
||||
wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetLabel: no such item") );
|
||||
|
||||
return item->GetText();
|
||||
}
|
||||
|
||||
void wxMenuBase::SetHelpString( int id, const wxString& helpString )
|
||||
{
|
||||
wxMenuItem *item = FindItem(id);
|
||||
|
||||
wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") );
|
||||
|
||||
item->SetHelp( helpString );
|
||||
}
|
||||
|
||||
wxString wxMenuBase::GetHelpString( int id ) const
|
||||
{
|
||||
wxMenuItem *item = FindItem(id);
|
||||
|
||||
wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") );
|
||||
|
||||
return item->GetHelp();
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMenuBarBase ctor and dtor
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
wxMenuBarBase::wxMenuBarBase()
|
||||
|
||||
Reference in New Issue
Block a user