X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1d4dd7add411ebff1ce4a8d1d992e0e43ee26b1..0b83552acf359689c43d641175f7292391f6a9e6:/src/common/cmdproc.cpp?ds=sidebyside diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp index 4945bdbe28..2ab9be0b0d 100644 --- a/src/common/cmdproc.cpp +++ b/src/common/cmdproc.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 05.11.00 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "cmdproc.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -32,6 +28,7 @@ #include "wx/intl.h" #include "wx/string.h" #include "wx/menu.h" + #include "wx/accel.h" #endif //WX_PRECOMP #include "wx/cmdproc.h" @@ -53,10 +50,6 @@ wxCommand::wxCommand(bool canUndoIt, const wxString& name) m_commandName = name; } -wxCommand::~wxCommand() -{ -} - // ---------------------------------------------------------------------------- // Command processor // ---------------------------------------------------------------------------- @@ -64,12 +57,14 @@ wxCommand::~wxCommand() wxCommandProcessor::wxCommandProcessor(int maxCommands) { m_maxNoCommands = maxCommands; - m_currentCommand = (wxNode *) NULL; #if wxUSE_MENUS - m_commandEditMenu = (wxMenu *) NULL; + m_commandEditMenu = NULL; #endif // wxUSE_MENUS - m_undoAccelerator = wxT("\tCtrl+Z"); - m_redoAccelerator = wxT("\tCtrl+Y"); + m_undoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Z').ToString(); + m_redoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Y').ToString(); + + m_lastSavedCommand = + m_currentCommand = wxList::compatibility_iterator(); } wxCommandProcessor::~wxCommandProcessor() @@ -89,35 +84,41 @@ bool wxCommandProcessor::UndoCommand(wxCommand& cmd) // Pass a command to the processor. The processor calls Do(); // if successful, is appended to the command history unless -// storeIt is FALSE. +// storeIt is false. bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt) { - wxCHECK_MSG( command, FALSE, _T("no command in wxCommandProcessor::Submit") ); + wxCHECK_MSG( command, false, wxT("no command in wxCommandProcessor::Submit") ); if ( !DoCommand(*command) ) { // the user code expects the command to be deleted anyhow delete command; - return FALSE; + return false; } if ( storeIt ) Store(command); + else + delete command; - return TRUE; + return true; } void wxCommandProcessor::Store(wxCommand *command) { - wxCHECK_RET( command, _T("no command in wxCommandProcessor::Store") ); + wxCHECK_RET( command, wxT("no command in wxCommandProcessor::Store") ); if ( (int)m_commands.GetCount() == m_maxNoCommands ) { - wxNode *firstNode = m_commands.GetFirst(); + wxList::compatibility_iterator firstNode = m_commands.GetFirst(); wxCommand *firstCommand = (wxCommand *)firstNode->GetData(); delete firstCommand; - delete firstNode; + 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' @@ -126,12 +127,17 @@ void wxCommandProcessor::Store(wxCommand *command) ClearCommands(); else { - wxNode *node = m_currentCommand->GetNext(); + wxList::compatibility_iterator node = m_currentCommand->GetNext(); while (node) { - wxNode *next = node->GetNext(); + wxList::compatibility_iterator next = node->GetNext(); delete (wxCommand *)node->GetData(); - delete node; + 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; } } @@ -150,17 +156,21 @@ bool wxCommandProcessor::Undo() { m_currentCommand = m_currentCommand->GetPrevious(); SetMenuStrings(); - return TRUE; + return true; } } - return FALSE; + return false; } bool wxCommandProcessor::Redo() { - wxCommand *redoCommand = (wxCommand *) NULL; - wxNode *redoNode = (wxNode *) NULL; + wxCommand *redoCommand = NULL; + wxList::compatibility_iterator redoNode +#if !wxUSE_STL + = NULL // just to avoid warnings +#endif // !wxUSE_STL + ; if ( m_currentCommand ) { @@ -187,10 +197,10 @@ bool wxCommandProcessor::Redo() { m_currentCommand = redoNode; SetMenuStrings(); - return TRUE; + return true; } } - return FALSE; + return false; } bool wxCommandProcessor::CanUndo() const @@ -202,16 +212,16 @@ bool wxCommandProcessor::CanUndo() const bool wxCommandProcessor::CanRedo() const { - if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->GetNext() == (wxNode*) NULL)) - return FALSE; + if (m_currentCommand && !m_currentCommand->GetNext()) + return false; - if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->GetNext() != (wxNode*) NULL)) - return TRUE; + if (m_currentCommand && m_currentCommand->GetNext()) + return true; - if ((m_currentCommand == (wxNode*) NULL) && (m_commands.GetCount() > 0)) - return TRUE; + if (!m_currentCommand && (m_commands.GetCount() > 0)) + return true; - return FALSE; + return false; } void wxCommandProcessor::Initialize() @@ -227,7 +237,7 @@ void wxCommandProcessor::SetMenuStrings() { wxString undoLabel = GetUndoMenuLabel(); wxString redoLabel = GetRedoMenuLabel(); - + m_commandEditMenu->SetLabel(wxID_UNDO, undoLabel); m_commandEditMenu->Enable(wxID_UNDO, CanUndo()); @@ -245,7 +255,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; @@ -256,7 +266,7 @@ wxString wxCommandProcessor::GetUndoMenuLabel() const { buf = _("&Undo") + m_undoAccelerator; } - + return buf; } @@ -271,7 +281,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 @@ -291,7 +301,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; } } @@ -300,15 +310,17 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const void wxCommandProcessor::ClearCommands() { - wxNode *node = m_commands.GetFirst(); + wxList::compatibility_iterator node = m_commands.GetFirst(); while (node) { wxCommand *command = (wxCommand *)node->GetData(); delete command; - delete node; + m_commands.Erase(node); node = m_commands.GetFirst(); } - m_currentCommand = (wxNode *) NULL; + + m_currentCommand = wxList::compatibility_iterator(); + m_lastSavedCommand = wxList::compatibility_iterator(); }