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

Mask != flags is unusual: simplify most AddItem/AddCheck...

Browse Source 
... and the no longer used AddCommand.

There are only four exceptions, all using NoAutoSelect in the flags and not in
the mask.
This commit is contained in:
Paul Licameli
2018-10-17 09:50:58 -04:00
parent 80437582d8
commit 42aef9f3e8
4 changed files with 100 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/commands/CommandManager.cpp
View File

@@ -802,10 +802,9 @@ void CommandManager::AddCheck(const wxChar *name,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
int checkmark,
CommandFlag flags,
CommandMask mask)
CommandFlag flags)
{
AddItem(name, label, hasDialog, finder, callback, wxT(""), flags, mask, checkmark);
AddItem(name, label, hasDialog, finder, callback, wxT(""), flags, checkmark);
}
void CommandManager::AddItem(const wxChar *name,
@@ -814,11 +813,10 @@ void CommandManager::AddItem(const wxChar *name,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
CommandFlag flags,
CommandMask mask,
bool bIsEffect,
const CommandParameter &parameter)
{
AddItem(name, label, hasDialog, finder, callback, wxT(""), flags, mask, -1, bIsEffect, parameter);
AddItem(name, label, hasDialog, finder, callback, wxT(""), flags, -1, bIsEffect, parameter);
}
void CommandManager::AddItem(const wxChar *name,
@@ -828,11 +826,14 @@ void CommandManager::AddItem(const wxChar *name,
CommandFunctorPointer callback,
const wxChar *accel,
CommandFlag flags,
CommandMask mask,
int checkmark,
bool bIsEffect,
const CommandParameter &parameter)
const CommandParameter &parameter,
CommandMask mask)
{
if (mask == NoFlagsSpecified)
mask = flags;
wxString cookedParameter;
if( parameter == "" )
cookedParameter = name;
@@ -903,10 +904,9 @@ void CommandManager::AddCommand(const wxChar *name,
const wxChar *label,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
CommandFlag flags,
CommandMask mask)
CommandFlag flags)
{
AddCommand(name, label, finder, callback, wxT(""), flags, mask);
AddCommand(name, label, finder, callback, wxT(""), flags);
}
void CommandManager::AddCommand(const wxChar *name,
@@ -914,14 +914,12 @@ void CommandManager::AddCommand(const wxChar *name,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
const wxChar *accel,
CommandFlag flags,
CommandMask mask)
CommandFlag flags)
{
NewIdentifier(name, label_in, label_in, false, accel, NULL, finder, callback, {}, 0, 0, false, {});
if (flags != NoFlagsSpecified || mask != NoFlagsSpecified) {
SetCommandFlags(name, flags, mask);
}
if (flags != NoFlagsSpecified)
SetCommandFlags(name, flags, flags);
}
void CommandManager::AddGlobalCommand(const wxChar *name,

14
src/commands/CommandManager.h
View File

@@ -168,8 +168,7 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
CommandHandlerFinder finder,
CommandFunctorPointer callback,
int checkmark = 0,
CommandFlag flags = NoFlagsSpecified,
CommandMask mask = NoFlagsSpecified);
CommandFlag flags = NoFlagsSpecified);
void AddItem(const wxChar *name,
const wxChar *label,
@@ -177,7 +176,6 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
CommandHandlerFinder finder,
CommandFunctorPointer callback,
CommandFlag flags = NoFlagsSpecified,
CommandMask mask = NoFlagsSpecified,
bool bIsEffect = false,
const CommandParameter &parameter = CommandParameter{});
@@ -188,10 +186,10 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
CommandFunctorPointer callback,
const wxChar *accel,
CommandFlag flags = NoFlagsSpecified,
CommandMask mask = NoFlagsSpecified,
int checkmark = -1,
bool bIsEffect = false,
const CommandParameter &parameter = CommandParameter{});
const CommandParameter &parameter = CommandParameter{},
CommandMask mask = NoFlagsSpecified);
void AddSeparator();
@@ -201,16 +199,14 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
const wxChar *label,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
CommandFlag flags = NoFlagsSpecified,
CommandMask mask = NoFlagsSpecified);
CommandFlag flags = NoFlagsSpecified);
void AddCommand(const wxChar *name,
const wxChar *label,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
const wxChar *accel,
CommandFlag flags = NoFlagsSpecified,
CommandMask mask = NoFlagsSpecified);
CommandFlag flags = NoFlagsSpecified);
void AddGlobalCommand(const wxChar *name,
const wxChar *label,