Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-23 07:58:05 +02:00
Code Issues Releases Wiki Activity

Fix for bug #736

Browse Source 
This MUST be tested by everyone on as many platforms as you
have access to...reason:

This removes a very old piece of code (May 10, 2003) in the
command manager that worked around a problem in GTK where
accelerators could not be changed again after the initial
menu setup.

While there is another way to fix this bug, remove this old
code is actually a better way AS LONG AS it doesn't break
anything else.  So far, it's looking like it is no longer
needed.

But, I'll be trying as many combinations of changing shortcuts,
entering/exiting preferences, swapping shortcuts, etc, as
I can on Linux, Windows and OSX.

But, the more ppl trying to break keyboard shortcuts the
better.

In case it helps, here's the comments that Dominic had in the
code:

   // This is a very weird hack.  Under GTK, menu labels are totally
   // linked to accelerators the first time you create a menu item
   // with that label and can't be changed.  This causes all sorts of
   // problems.  As a workaround, we create each menu item with a
   // made-up name (just an ID number string) but with the accelerator
   // we want, then immediately change the label to the correct string.
   // -DMM
This commit is contained in:
lllucius@gmail.com 2014-12-07 01:06:37 +00:00
parent c17edd0680
commit f18f4857e2
1 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/commands/CommandManager.cpp
View File

@ -418,29 +418,14 @@ void CommandManager::InsertItem(wxString name, wxString label_in,
int ID = NewIdentifier(name, label, menu, callback, false, 0, 0);
// Replace the accel key with the one from the preferences
label = label.BeforeFirst(wxT('\t'));
// This is a very weird hack. Under GTK, menu labels are totally
// linked to accelerators the first time you create a menu item
// with that label and can't be changed. This causes all sorts of
// problems. As a workaround, we create each menu item with a
// made-up name (just an ID number string) but with the accelerator
// we want, then immediately change the label to the correct string.
// -DMM
mHiddenID++;
wxString dummy, newLabel;
dummy.Printf(wxT("%s%08d"), label.c_str(), mHiddenID);
newLabel = label;
if (checkmark >= 0) {
menu->InsertCheckItem(pos, ID, dummy);
menu->InsertCheckItem(pos, ID, label);
menu->Check(ID, checkmark != 0);
}
else {
menu->Insert(pos, ID, dummy);
menu->Insert(pos, ID, label);
}
menu->SetLabel(ID, newLabel);
// menu->SetLabel(ID, newLabel);
mbSeparatorAllowed = true;
}
@ -495,28 +480,14 @@ void CommandManager::AddItem(const wxChar *name,
SetCommandFlags(name, flags, mask);
}
// Replace the accel key with the one from the preferences
label = label.BeforeFirst(wxT('\t'));
// This is a very weird hack. Under GTK, menu labels are totally
// linked to accelerators the first time you create a menu item
// with that label and can't be changed. This causes all sorts of
// problems. As a workaround, we create each menu item with a
// made-up name (just an ID number string) but with the accelerator
// we want, then immediately change the label to the correct string.
// -DMM
wxString newLabel;
newLabel.Printf(wxT("%s%08d"), label.c_str(), ++mHiddenID);
if (checkmark >= 0) {
CurrentMenu()->AppendCheckItem(ID, newLabel);
CurrentMenu()->AppendCheckItem(ID, label);
CurrentMenu()->Check(ID, checkmark != 0);
}
else {
CurrentMenu()->Append(ID, newLabel);
CurrentMenu()->Append(ID, label);
}
CurrentMenu()->SetLabel(ID, label);
mbSeparatorAllowed = true;
}