Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/msw/menu.cpp
View File

@@ -82,7 +82,7 @@ void wxMenu::Init()
m_hMenu = (WXHMENU)CreatePopupMenu();
if ( !m_hMenu )
{
wxLogLastError("CreatePopupMenu");
wxLogLastError(wxT("CreatePopupMenu"));
}
// if we have a title, insert it in the beginning of the menu
@@ -103,7 +103,7 @@ wxMenu::~wxMenu()
{
if ( !::DestroyMenu(GetHmenu()) )
{
wxLogLastError("DestroyMenu");
wxLogLastError(wxT("DestroyMenu"));
}
}
@@ -135,35 +135,50 @@ int wxMenu::FindAccel(int id) const
void wxMenu::UpdateAccel(wxMenuItem *item)
{
// find the (new) accel for this item
wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText());
if ( accel )
accel->m_command = item->GetId();
if ( item->IsSubMenu() )
{
wxMenu *submenu = item->GetSubMenu();
wxMenuItemList::Node *node = submenu->GetMenuItems().GetFirst();
while ( node )
{
UpdateAccel(node->GetData());
// find the old one
int n = FindAccel(item->GetId());
if ( n == wxNOT_FOUND )
{
// no old, add new if any
if ( accel )
m_accels.Add(accel);
else
return; // skipping RebuildAccelTable() below
node = node->GetNext();
}
}
else
else if ( !item->IsSeparator() )
{
// replace old with new or just remove the old one if no new
delete m_accels[n];
// find the (new) accel for this item
wxAcceleratorEntry *accel = wxGetAccelFromString(item->GetText());
if ( accel )
m_accels[n] = accel;
else
m_accels.Remove(n);
}
accel->m_command = item->GetId();
if ( IsAttached() )
{
m_menuBar->RebuildAccelTable();
// find the old one
int n = FindAccel(item->GetId());
if ( n == wxNOT_FOUND )
{
// no old, add new if any
if ( accel )
m_accels.Add(accel);
else
return; // skipping RebuildAccelTable() below
}
else
{
// replace old with new or just remove the old one if no new
delete m_accels[n];
if ( accel )
m_accels[n] = accel;
else
m_accels.Remove(n);
}
if ( IsAttached() )
{
m_menuBar->RebuildAccelTable();
}
}
//else: it is a separator, they can't have accels, nothing to do
}
#endif // wxUSE_ACCEL
@@ -234,7 +249,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
if ( !ok )
{
wxLogLastError("Insert or AppendMenu");
wxLogLastError(wxT("Insert or AppendMenu"));
return FALSE;
}
@@ -308,7 +323,7 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
// remove the item from the menu
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
{
wxLogLastError("RemoveMenu");
wxLogLastError(wxT("RemoveMenu"));
}
if ( IsAttached() )
@@ -361,7 +376,7 @@ void wxMenu::SetTitle(const wxString& label)
(unsigned)idMenuTitle, m_title) ||
!::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
{
wxLogLastError("InsertMenu");
wxLogLastError(wxT("InsertMenu"));
}
}
}
@@ -373,7 +388,7 @@ void wxMenu::SetTitle(const wxString& label)
if ( !RemoveMenu(hMenu, 0, MF_BYPOSITION) ||
!RemoveMenu(hMenu, 0, MF_BYPOSITION) )
{
wxLogLastError("RemoveMenu");
wxLogLastError(wxT("RemoveMenu"));
}
}
else
@@ -383,7 +398,7 @@ void wxMenu::SetTitle(const wxString& label)
MF_BYPOSITION | MF_STRING,
(unsigned)idMenuTitle, m_title) )
{
wxLogLastError("ModifyMenu");
wxLogLastError(wxT("ModifyMenu"));
}
}
}
@@ -399,7 +414,7 @@ void wxMenu::SetTitle(const wxString& label)
if ( !SetMenuItemInfo(hMenu, (unsigned)idMenuTitle, FALSE, &mii) )
{
wxLogLastError("SetMenuItemInfo");
wxLogLastError(wxT("SetMenuItemInfo"));
}
}
#endif // Win32
@@ -546,7 +561,7 @@ WXHMENU wxMenuBar::Create()
if ( !m_hMenu )
{
wxLogLastError("CreateMenu");
wxLogLastError(wxT("CreateMenu"));
}
else
{
@@ -557,7 +572,7 @@ WXHMENU wxMenuBar::Create()
(UINT)m_menus[i]->GetHMenu(),
m_titles[i]) )
{
wxLogLastError("AppendMenu");
wxLogLastError(wxT("AppendMenu"));
}
}
}
@@ -618,7 +633,7 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
if ( ::ModifyMenu(GetHmenu(), pos, MF_BYPOSITION | MF_STRING | flagsOld,
id, label) == (int)0xFFFFFFFF )
{
wxLogLastError("ModifyMenu");
wxLogLastError(wxT("ModifyMenu"));
}
Refresh();
@@ -648,14 +663,14 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
// can't use ModifyMenu() because it deletes the submenu it replaces
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
{
wxLogLastError("RemoveMenu");
wxLogLastError(wxT("RemoveMenu"));
}
if ( !::InsertMenu(GetHmenu(), (UINT)pos,
MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT)GetHmenuOf(menu), title) )
{
wxLogLastError("InsertMenu");
wxLogLastError(wxT("InsertMenu"));
}
#if wxUSE_ACCEL
@@ -687,7 +702,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
MF_BYPOSITION | MF_POPUP | MF_STRING,
(UINT)GetHmenuOf(menu), title) )
{
wxLogLastError("InsertMenu");
wxLogLastError(wxT("InsertMenu"));
}
#if wxUSE_ACCEL
@@ -748,7 +763,7 @@ wxMenu *wxMenuBar::Remove(size_t pos)
{
if ( !::RemoveMenu(GetHmenu(), (UINT)pos, MF_BYPOSITION) )
{
wxLogLastError("RemoveMenu");
wxLogLastError(wxT("RemoveMenu"));
}
menu->Detach();
@@ -831,7 +846,7 @@ int wxMenuBar::FindMenuItem(const wxString& menuString,
for ( size_t i = 0; i < count; i++ )
{
wxString title = wxStripMenuCodes(m_titles[i]);
if ( menuString == title )
if ( menuLabel == title )
return m_menus[i]->FindItem(itemString);
}