need wxUSE_WCHAR_T around wxConvLocal

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

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index c2d44c895b52398a62e21a931fc50e6b39d7dfee..7466686e7a5c848ea292f1c7efcaf7d3b74c7c8f 100644 (file)
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -93,7 +93,12 @@ bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
     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;
+
         return FALSE;
+    }
 
     if ( storeIt )
         Store(command);
@@ -154,12 +159,17 @@ bool wxCommandProcessor::Redo()
 {
     wxCommand *redoCommand = (wxCommand *) NULL;
     wxNode *redoNode = (wxNode *) NULL;
-    if (m_currentCommand && m_currentCommand->Next())
+
+    if ( m_currentCommand )
     {
-        redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
-        redoNode = m_currentCommand->Next();
+        // is there anything to redo?
+        if ( m_currentCommand->Next() )
+        {
+            redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
+            redoNode = m_currentCommand->Next();
+        }
     }
-    else
+    else // no current command, redo the first one
     {
         if (m_commands.Number() > 0)
         {