Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 14:02:57 +02:00
Code Issues Releases Wiki Activity

Remove CommandManager::SetDefaultFlags and related

Browse Source
This commit is contained in:
Paul Licameli
2018-10-17 16:47:15 -04:00
parent a1bd9062ae
commit fc1bc7994e
3 changed files with 1 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/commands/CommandManager.cpp
View File

@@ -429,8 +429,6 @@ private:
CommandManager::CommandManager():
mCurrentID(17000),
mCurrentMenuName(COMMAND),
mDefaultFlags(AlwaysEnabledFlag),
mDefaultMask(AlwaysEnabledFlag),
bMakingOccultCommands( false )
{
mbSeparatorAllowed = false;
@@ -976,8 +974,7 @@ CommandListEntry *CommandManager::NewIdentifier(const wxString & nameIn,
entry->multi = multi;
entry->index = index;
entry->count = count;
entry->flags = mDefaultFlags;
entry->mask = mDefaultMask;
entry->flags = entry->mask = AlwaysEnabledFlag;
entry->enabled = true;
entry->skipKeydown = (accel.Find(wxT("\tskipKeydown")) != wxNOT_FOUND);
entry->wantKeyup = (accel.Find(wxT("\twantKeyup")) != wxNOT_FOUND) || entry->skipKeydown;
@@ -1801,14 +1798,6 @@ void CommandManager::WriteXML(XMLWriter &xmlFile) const
xmlFile.EndTag(wxT("audacitykeyboard"));
}
void CommandManager::SetDefaultFlags(CommandFlag flags, CommandMask mask)
{
if (mask == NoFlagsSpecified)
mask = flags;
mDefaultFlags = flags;
mDefaultMask = mask;
}
void CommandManager::SetOccultCommands( bool bOccult)
{
bMakingOccultCommands = bOccult;

10
src/commands/CommandManager.h
View File

@@ -217,14 +217,6 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
CommandHandlerFinder finder,
CommandFunctorPointer callback,
const wxChar *accel);
//
// Command masks
//
// For NEW items/commands
void SetDefaultFlags(CommandFlag flags, CommandMask mask = NoFlagsSpecified);
CommandFlag GetDefaultFlags() const { return mDefaultFlags; }
CommandMask GetDefaultMask() const { return mDefaultMask; }
void SwapMenuBars();
void SetOccultCommands( bool bOccult);
@@ -397,8 +389,6 @@ private:
std::unique_ptr<wxMenu> uCurrentMenu;
wxMenu *mCurrentMenu {};
CommandFlag mDefaultFlags;
CommandMask mDefaultMask;
bool bMakingOccultCommands;
};