Applied #13738: Make a wxRichTextImage's box display around the image (dghart)

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

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index 259d3e0ff7260bd97980fc1b06618bdca1f57130..7de08c279063d0ab5ad45ff89b823c2d0b4d5c3b 100644 (file)
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -28,6 +28,7 @@
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/menu.h"
     #include "wx/intl.h"
     #include "wx/string.h"
     #include "wx/menu.h"

+    #include "wx/accel.h"

 #endif //WX_PRECOMP
 
 #include "wx/cmdproc.h"
 #endif //WX_PRECOMP
 
 #include "wx/cmdproc.h"


@@ -57,10 +58,13 @@ wxCommandProcessor::wxCommandProcessor(int maxCommands)
 {
     m_maxNoCommands = maxCommands;
 #if wxUSE_MENUS
 {
     m_maxNoCommands = maxCommands;
 #if wxUSE_MENUS

-    m_commandEditMenu = (wxMenu *) NULL;
+    m_commandEditMenu = NULL;

 #endif // wxUSE_MENUS
 #endif // wxUSE_MENUS

-    m_undoAccelerator = wxT("\tCtrl+Z");
-    m_redoAccelerator = wxT("\tCtrl+Y");
+
+#if wxUSE_ACCEL
+    m_undoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Z').ToString();
+    m_redoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Y').ToString();
+#endif // wxUSE_ACCEL

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


@@ -86,7 +90,7 @@ bool wxCommandProcessor::UndoCommand(wxCommand& cmd)
 // storeIt is false.
 bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
 {
 // 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) )
     {
 
     if ( !DoCommand(*command) )
     {


@@ -106,19 +110,7 @@ bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
 
 void wxCommandProcessor::Store(wxCommand *command)
 {
 
 void wxCommandProcessor::Store(wxCommand *command)
 {

-    wxCHECK_RET( command, _T("no command in wxCommandProcessor::Store") );
-
-    if ( (int)m_commands.GetCount() == m_maxNoCommands )
-    {
-        wxList::compatibility_iterator firstNode = m_commands.GetFirst();
-        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();
-    }
+    wxCHECK_RET( command, wxT("no command in wxCommandProcessor::Store") );

 
     // Correct a bug: we must chop off the current 'branch'
     // so that we're at the end of the command list.
 
     // Correct a bug: we must chop off the current 'branch'
     // so that we're at the end of the command list.


@@ -130,17 +122,31 @@ void wxCommandProcessor::Store(wxCommand *command)
         while (node)
         {
             wxList::compatibility_iterator next = node->GetNext();
         while (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
 
             // Make sure m_lastSavedCommand won't point to freed memory

-            if ( m_lastSavedCommand == node )
+            if ( m_lastSavedCommand && m_lastSavedCommand == node )

                 m_lastSavedCommand = wxList::compatibility_iterator();
 
                 m_lastSavedCommand = wxList::compatibility_iterator();
 

+            delete (wxCommand *)node->GetData();
+            m_commands.Erase(node);
+

             node = next;
         }
     }
 
             node = next;
         }
     }
 

+    if ( (int)m_commands.GetCount() == m_maxNoCommands )
+    {
+        wxList::compatibility_iterator firstNode = m_commands.GetFirst();
+
+        // Make sure m_lastSavedCommand won't point to freed memory
+        if ( m_lastSavedCommand && m_lastSavedCommand == firstNode )
+            m_lastSavedCommand = wxList::compatibility_iterator();
+
+        wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
+        delete firstCommand;
+        m_commands.Erase(firstNode);
+    }
+

     m_commands.Append(command);
     m_currentCommand = m_commands.GetLast();
     SetMenuStrings();
     m_commands.Append(command);
     m_currentCommand = m_commands.GetLast();
     SetMenuStrings();


@@ -164,11 +170,11 @@ bool wxCommandProcessor::Undo()
 
 bool wxCommandProcessor::Redo()
 {
 
 bool wxCommandProcessor::Redo()
 {

-    wxCommand *redoCommand = (wxCommand *) NULL;
+    wxCommand *redoCommand = NULL;

     wxList::compatibility_iterator redoNode
     wxList::compatibility_iterator redoNode

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

         = NULL          // just to avoid warnings
         = NULL          // just to avoid warnings

-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS

         ;
 
     if ( m_currentCommand )
         ;
 
     if ( m_currentCommand )