X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9d59ee7e0cbe4acae6153adafb5ddce9a4e65dd..ea68b7060519bc63646e39fc76a963ecd04e667e:/src/common/cmdproc.cpp diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp index beb3bd77b5..df71ab8148 100644 --- a/src/common/cmdproc.cpp +++ b/src/common/cmdproc.cpp @@ -53,10 +53,6 @@ wxCommand::wxCommand(bool canUndoIt, const wxString& name) m_commandName = name; } -wxCommand::~wxCommand() -{ -} - // ---------------------------------------------------------------------------- // Command processor // ---------------------------------------------------------------------------- @@ -106,6 +102,8 @@ bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt) if ( storeIt ) Store(command); + else + delete command; return true; } @@ -251,7 +249,7 @@ wxString wxCommandProcessor::GetUndoMenuLabel() const { wxCommand *command = (wxCommand *)m_currentCommand->GetData(); wxString commandName(command->GetName()); - if (commandName == wxT("")) commandName = _("Unnamed command"); + if (commandName.empty()) commandName = _("Unnamed command"); bool canUndo = command->CanUndo(); if (canUndo) buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator; @@ -277,7 +275,7 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const { wxCommand *redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData(); wxString redoCommandName(redoCommand->GetName()); - if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); + if (redoCommandName.empty()) redoCommandName = _("Unnamed command"); buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator; } else @@ -297,7 +295,7 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const // we've undone to the start of the list, but can redo the first. wxCommand *redoCommand = (wxCommand *)m_commands.GetFirst()->GetData(); wxString redoCommandName(redoCommand->GetName()); - if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command"); + if (redoCommandName.empty()) redoCommandName = _("Unnamed command"); buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator; } }