AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert e41a1b1cbb "Menubar accelerators are now preserved"

Browse Source 
It overwrites any existing accelerator table, and menubar accelerators
seem to work fine without it. See #18053
This commit is contained in:
Paul Cornett 2018-02-05 10:02:48 -08:00 committed by paulcor
parent 8881953bea
commit 0fe9d7c3bb
1 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/gtk/frame.cpp
View File

@ -111,78 +111,11 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
*height = 0;
}
#if wxUSE_MENUS && wxUSE_ACCEL
// Helper for wxCreateAcceleratorTableForMenuBar
static void wxAddAccelerators(wxList& accelEntries, wxMenu* menu)
{
size_t i;
for (i = 0; i < menu->GetMenuItems().GetCount(); i++)
{
wxMenuItem* item = (wxMenuItem*) menu->GetMenuItems().Item(i)->GetData();
if (item->GetSubMenu())
{
wxAddAccelerators(accelEntries, item->GetSubMenu());
}
else if (!item->GetItemLabel().IsEmpty())
{
wxAcceleratorEntry* entry = wxAcceleratorEntry::Create(item->GetItemLabel());
if (entry)
{
entry->Set(entry->GetFlags(), entry->GetKeyCode(), item->GetId());
accelEntries.Append((wxObject*) entry);
}
}
}
}
// Create an accelerator table consisting of all the accelerators
// from the menubar in the given menus
static wxAcceleratorTable wxCreateAcceleratorTableForMenuBar(wxMenuBar* menuBar)
{
wxList accelEntries;
size_t i;
for (i = 0; i < menuBar->GetMenuCount(); i++)
{
wxAddAccelerators(accelEntries, menuBar->GetMenu(i));
}
size_t n = accelEntries.GetCount();
if (n == 0)
return wxAcceleratorTable();
wxAcceleratorEntry* entries = new wxAcceleratorEntry[n];
for (i = 0; i < accelEntries.GetCount(); i++)
{
wxAcceleratorEntry* entry = (wxAcceleratorEntry*) accelEntries.Item(i)->GetData();
entries[i] = (*entry);
delete entry;
}
wxAcceleratorTable table(n, entries);
delete[] entries;
return table;
}
#endif // wxUSE_MENUS && wxUSE_ACCEL
bool wxFrame::ShowFullScreen(bool show, long style)
{
if (!wxFrameBase::ShowFullScreen(show, style))
return false;
#if wxUSE_MENUS && wxUSE_ACCEL
if (show && GetMenuBar())
{
wxAcceleratorTable table(wxCreateAcceleratorTableForMenuBar(GetMenuBar()));
if (table.IsOk())
SetAcceleratorTable(table);
}
#endif // wxUSE_MENUS && wxUSE_ACCEL
wxWindow* const bar[] = {
#if wxUSE_MENUS
m_frameMenuBar,