X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f530fa27a92ea58071c83aa7bfe0a859626b39e7..850df2d78866c3edcf848103b5dbc7e7fa1ee5fa:/src/common/cmdproc.cpp?ds=inline diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp index 320084dcce..259d3e0ff7 100644 --- a/src/common/cmdproc.cpp +++ b/src/common/cmdproc.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "cmdproc.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -53,10 +49,6 @@ wxCommand::wxCommand(bool canUndoIt, const wxString& name) m_commandName = name; } -wxCommand::~wxCommand() -{ -} - // ---------------------------------------------------------------------------- // Command processor // ---------------------------------------------------------------------------- @@ -69,9 +61,9 @@ wxCommandProcessor::wxCommandProcessor(int maxCommands) #endif // wxUSE_MENUS m_undoAccelerator = wxT("\tCtrl+Z"); m_redoAccelerator = wxT("\tCtrl+Y"); -#if !wxUSE_STL - m_currentCommand = NULL; -#endif + + m_lastSavedCommand = + m_currentCommand = wxList::compatibility_iterator(); } wxCommandProcessor::~wxCommandProcessor() @@ -122,6 +114,10 @@ void wxCommandProcessor::Store(wxCommand *command) wxCommand *firstCommand = (wxCommand *)firstNode->GetData(); delete firstCommand; m_commands.Erase(firstNode); + + // Make sure m_lastSavedCommand won't point to freed memory + if ( m_lastSavedCommand == firstNode ) + m_lastSavedCommand = wxList::compatibility_iterator(); } // Correct a bug: we must chop off the current 'branch' @@ -136,6 +132,11 @@ void wxCommandProcessor::Store(wxCommand *command) wxList::compatibility_iterator next = node->GetNext(); delete (wxCommand *)node->GetData(); m_commands.Erase(node); + + // Make sure m_lastSavedCommand won't point to freed memory + if ( m_lastSavedCommand == node ) + m_lastSavedCommand = wxList::compatibility_iterator(); + node = next; } } @@ -253,7 +254,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; @@ -279,7 +280,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 @@ -299,7 +300,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; } } @@ -316,7 +317,9 @@ void wxCommandProcessor::ClearCommands() m_commands.Erase(node); node = m_commands.GetFirst(); } + m_currentCommand = wxList::compatibility_iterator(); + m_lastSavedCommand = wxList::compatibility_iterator(); }