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

Remove overload of NewIdentifier that was used only once

Browse Source
This commit is contained in:
Paul Licameli
2019-01-07 13:18:48 -05:00
parent 6d093019ef
commit 1e52400936
2 changed files with 17 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/commands/CommandManager.cpp
View File

@@ -568,18 +568,23 @@ void CommandManager::AddItemList(const CommandID & name,
{ {
for (size_t i = 0, cnt = nItems; i < cnt; i++) { for (size_t i = 0, cnt = nItems; i < cnt; i++) {
auto translated = items[i].Translation(); auto translated = items[i].Translation();
CommandListEntry *entry = NewIdentifier(name, auto stripped = translated.BeforeFirst(wxT('\t'));
translated, auto accel = translated.AfterFirst(wxT('\t'));
translated, CommandListEntry *entry =
// No means yet to specify ! NewIdentifier(name,
false, stripped,
CurrentMenu(), stripped,
finder, // No means yet to specify hasDialog !
callback, false,
items[i].Internal(), accel,
i, CurrentMenu(),
cnt, finder,
bIsEffect); callback,
items[i].Internal(),
i,
cnt,
bIsEffect,
{});
entry->flags = flags; entry->flags = flags;
CurrentMenu()->Append(entry->id, GetLabel(entry)); CurrentMenu()->Append(entry->id, GetLabel(entry));
mbSeparatorAllowed = true; mbSeparatorAllowed = true;
@@ -651,33 +656,6 @@ int CommandManager::NextIdentifier(int ID)
///WARNING: Does this conflict with the identifiers set for controls/windows? ///WARNING: Does this conflict with the identifiers set for controls/windows?
///If it does, a workaround may be to keep controls below wxID_LOWEST ///If it does, a workaround may be to keep controls below wxID_LOWEST
///and keep menus above wxID_HIGHEST ///and keep menus above wxID_HIGHEST
CommandListEntry *CommandManager::NewIdentifier(const CommandID & name,
const wxString & label,
const wxString & longLabel,
bool hasDialog,
wxMenu *menu,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
const CommandID &nameSuffix,
int index,
int count,
bool bIsEffect)
{
return NewIdentifier(name,
label.BeforeFirst(wxT('\t')),
longLabel.BeforeFirst(wxT('\t')),
hasDialog,
label.AfterFirst(wxT('\t')),
menu,
finder,
callback,
nameSuffix,
index,
count,
bIsEffect,
{});
}
CommandListEntry *CommandManager::NewIdentifier(const CommandID & nameIn, CommandListEntry *CommandManager::NewIdentifier(const CommandID & nameIn,
const wxString & label, const wxString & label,
const wxString & longLabel, const wxString & longLabel,

11
src/commands/CommandManager.h
View File

@@ -315,17 +315,6 @@ private:
// //
int NextIdentifier(int ID); int NextIdentifier(int ID);
CommandListEntry *NewIdentifier(const CommandID & name,
const wxString & label,
const wxString & longLabel,
bool hasDialog,
wxMenu *menu,
CommandHandlerFinder finder,
CommandFunctorPointer callback,
const CommandID &nameSuffix,
int index,
int count,
bool bIsEffect);
CommandListEntry *NewIdentifier(const CommandID & name, CommandListEntry *NewIdentifier(const CommandID & name,
const wxString & label, const wxString & label,
const wxString & longLabel, const wxString & longLabel,