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

Reorder accel argument and unify two overloads of AddItem

Browse Source
This commit is contained in:
Paul Licameli
2018-10-17 11:42:14 -04:00
parent c376ffb165
commit de4132d66c
3 changed files with 239 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/commands/CommandManager.cpp
View File

@@ -804,19 +804,7 @@ void CommandManager::AddCheck(const wxChar *name,
int checkmark,
CommandFlag flags)
{
AddItem(name, label, hasDialog, finder, callback, wxT(""), flags, checkmark);
}
void CommandManager::AddItem(const wxChar *name,
const wxChar *label,
bool hasDialog,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
CommandFlag flags,
bool bIsEffect,
const CommandParameter &parameter)
{
AddItem(name, label, hasDialog, finder, callback, wxT(""), flags, -1, bIsEffect, parameter);
AddItem(name, label, hasDialog, finder, callback, flags, wxT(""), checkmark);
}
void CommandManager::AddItem(const wxChar *name,
@@ -824,8 +812,8 @@ void CommandManager::AddItem(const wxChar *name,
bool hasDialog,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
const wxChar *accel,
CommandFlag flags,
const wxChar *accel,
int checkmark,
bool bIsEffect,
const CommandParameter &parameter,

11
src/commands/CommandManager.h
View File

@@ -170,22 +170,13 @@ class AUDACITY_DLL_API CommandManager final : public XMLTagHandler
int checkmark = 0,
CommandFlag flags = NoFlagsSpecified);
void AddItem(const wxChar *name,
const wxChar *label,
bool hasDialog,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
CommandFlag flags = NoFlagsSpecified,
bool bIsEffect = false,
const CommandParameter &parameter = CommandParameter{});
void AddItem(const wxChar *name,
const wxChar *label_in,
bool hasDialog,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
const wxChar *accel,
CommandFlag flags = NoFlagsSpecified,
const wxChar *accel = wxT(""),
int checkmark = -1,
bool bIsEffect = false,
const CommandParameter &parameter = CommandParameter{},