applied patch 1683441

[wxWidgets.git] / src / common / cmdproc.cpp

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index 104bebb06335a5be8f708fab359fee8cd1aff98d..259d3e0ff7260bd97980fc1b06618bdca1f57130 100644 (file)
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -6,7 +6,7 @@
 // Created:     05.11.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     05.11.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // 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;
 }
 
     m_commandName = name;
 }
 

-wxCommand::~wxCommand()
-{
-}
-

 // ----------------------------------------------------------------------------
 // Command processor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Command processor
 // ----------------------------------------------------------------------------


@@ -69,9 +61,9 @@ wxCommandProcessor::wxCommandProcessor(int maxCommands)
 #endif // wxUSE_MENUS
     m_undoAccelerator = wxT("\tCtrl+Z");
     m_redoAccelerator = wxT("\tCtrl+Y");
 #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()
 }
 
 wxCommandProcessor::~wxCommandProcessor()


@@ -91,23 +83,25 @@ bool wxCommandProcessor::UndoCommand(wxCommand& cmd)
 
 // Pass a command to the processor. The processor calls Do();
 // if successful, is appended to the command history unless
 
 // 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)
 {
 bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
 {

-    wxCHECK_MSG( command, FALSE, _T("no command in wxCommandProcessor::Submit") );
+    wxCHECK_MSG( command, false, _T("no command in wxCommandProcessor::Submit") );

 
     if ( !DoCommand(*command) )
     {
         // the user code expects the command to be deleted anyhow
         delete command;
 
 
     if ( !DoCommand(*command) )
     {
         // the user code expects the command to be deleted anyhow
         delete command;
 

-        return FALSE;
+        return false;

     }
 
     if ( storeIt )
         Store(command);
     }
 
     if ( storeIt )
         Store(command);

+    else
+        delete command;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxCommandProcessor::Store(wxCommand *command)
 }
 
 void wxCommandProcessor::Store(wxCommand *command)


@@ -120,6 +114,10 @@ void wxCommandProcessor::Store(wxCommand *command)
         wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
         delete firstCommand;
         m_commands.Erase(firstNode);
         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'
     }
 
     // Correct a bug: we must chop off the current 'branch'


@@ -134,6 +132,11 @@ void wxCommandProcessor::Store(wxCommand *command)
             wxList::compatibility_iterator next = node->GetNext();
             delete (wxCommand *)node->GetData();
             m_commands.Erase(node);
             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;
         }
     }
             node = next;
         }
     }


@@ -152,11 +155,11 @@ bool wxCommandProcessor::Undo()
         {
             m_currentCommand = m_currentCommand->GetPrevious();
             SetMenuStrings();
         {
             m_currentCommand = m_currentCommand->GetPrevious();
             SetMenuStrings();

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxCommandProcessor::Redo()
 }
 
 bool wxCommandProcessor::Redo()


@@ -193,10 +196,10 @@ bool wxCommandProcessor::Redo()
         {
             m_currentCommand = redoNode;
             SetMenuStrings();
         {
             m_currentCommand = redoNode;
             SetMenuStrings();

-            return TRUE;
+            return true;

         }
     }
         }
     }

-    return FALSE;
+    return false;

 }
 
 bool wxCommandProcessor::CanUndo() const
 }
 
 bool wxCommandProcessor::CanUndo() const


@@ -209,15 +212,15 @@ bool wxCommandProcessor::CanUndo() const
 bool wxCommandProcessor::CanRedo() const
 {
     if (m_currentCommand && !m_currentCommand->GetNext())
 bool wxCommandProcessor::CanRedo() const
 {
     if (m_currentCommand && !m_currentCommand->GetNext())

-        return FALSE;
+        return false;

 
     if (m_currentCommand && m_currentCommand->GetNext())
 
     if (m_currentCommand && m_currentCommand->GetNext())

-        return TRUE;
+        return true;

 
     if (!m_currentCommand && (m_commands.GetCount() > 0))
 
     if (!m_currentCommand && (m_commands.GetCount() > 0))

-        return TRUE;
+        return true;

 
 

-    return FALSE;
+    return false;

 }
 
 void wxCommandProcessor::Initialize()
 }
 
 void wxCommandProcessor::Initialize()


@@ -233,7 +236,7 @@ void wxCommandProcessor::SetMenuStrings()
     {
         wxString undoLabel = GetUndoMenuLabel();
         wxString redoLabel = GetRedoMenuLabel();
     {
         wxString undoLabel = GetUndoMenuLabel();
         wxString redoLabel = GetRedoMenuLabel();

-        
+

         m_commandEditMenu->SetLabel(wxID_UNDO, undoLabel);
         m_commandEditMenu->Enable(wxID_UNDO, CanUndo());
 
         m_commandEditMenu->SetLabel(wxID_UNDO, undoLabel);
         m_commandEditMenu->Enable(wxID_UNDO, CanUndo());
 


@@ -251,7 +254,7 @@ wxString wxCommandProcessor::GetUndoMenuLabel() const
     {
         wxCommand *command = (wxCommand *)m_currentCommand->GetData();
         wxString commandName(command->GetName());
     {
         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;
         bool canUndo = command->CanUndo();
         if (canUndo)
             buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator;


@@ -262,7 +265,7 @@ wxString wxCommandProcessor::GetUndoMenuLabel() const
     {
         buf = _("&Undo") + m_undoAccelerator;
     }
     {
         buf = _("&Undo") + m_undoAccelerator;
     }

-    
+

     return buf;
 }
 
     return buf;
 }
 


@@ -277,7 +280,7 @@ wxString wxCommandProcessor::GetRedoMenuLabel() const
         {
             wxCommand *redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData();
             wxString redoCommandName(redoCommand->GetName());
         {
             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
             buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
         }
         else


@@ -297,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());
             // 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;
         }
     }
             buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
         }
     }


@@ -314,7 +317,9 @@ void wxCommandProcessor::ClearCommands()
         m_commands.Erase(node);
         node = m_commands.GetFirst();
     }
         m_commands.Erase(node);
         node = m_commands.GetFirst();
     }

+

     m_currentCommand = wxList::compatibility_iterator();
     m_currentCommand = wxList::compatibility_iterator();

+    m_lastSavedCommand = wxList::compatibility_iterator();

 }
 
 
 }