X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1d4dd7add411ebff1ce4a8d1d992e0e43ee26b1..96ac065f9ecc4d3d5c2c3ad6521091cc5d920024:/src/common/cmdproc.cpp

diff --git a/src/common/cmdproc.cpp b/src/common/cmdproc.cpp
index 4945bdbe28..08f414c171 100644
--- a/src/common/cmdproc.cpp
+++ b/src/common/cmdproc.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "cmdproc.h"
 #endif
 
@@ -64,12 +64,14 @@ wxCommand::~wxCommand()
 wxCommandProcessor::wxCommandProcessor(int maxCommands)
 {
     m_maxNoCommands = maxCommands;
-    m_currentCommand = (wxNode *) NULL;
 #if wxUSE_MENUS
     m_commandEditMenu = (wxMenu *) NULL;
 #endif // wxUSE_MENUS
     m_undoAccelerator = wxT("\tCtrl+Z");
     m_redoAccelerator = wxT("\tCtrl+Y");
+#if !wxUSE_STL
+    m_currentCommand = NULL;
+#endif
 }
 
 wxCommandProcessor::~wxCommandProcessor()
@@ -114,10 +116,10 @@ void wxCommandProcessor::Store(wxCommand *command)
 
     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);
     }
 
     // Correct a bug: we must chop off the current 'branch'
@@ -126,12 +128,12 @@ 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);
             node = next;
         }
     }
@@ -160,7 +162,11 @@ bool wxCommandProcessor::Undo()
 bool wxCommandProcessor::Redo()
 {
     wxCommand *redoCommand = (wxCommand *) NULL;
-    wxNode *redoNode = (wxNode *) NULL;
+    wxList::compatibility_iterator redoNode
+#if !wxUSE_STL
+        = NULL          // just to avoid warnings
+#endif // !wxUSE_STL
+        ;
 
     if ( m_currentCommand )
     {
@@ -202,13 +208,13 @@ bool wxCommandProcessor::CanUndo() const
 
 bool wxCommandProcessor::CanRedo() const
 {
-    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->GetNext() == (wxNode*) NULL))
+    if (m_currentCommand && !m_currentCommand->GetNext())
         return FALSE;
 
-    if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->GetNext() != (wxNode*) NULL))
+    if (m_currentCommand && m_currentCommand->GetNext())
         return TRUE;
 
-    if ((m_currentCommand == (wxNode*) NULL) && (m_commands.GetCount() > 0))
+    if (!m_currentCommand && (m_commands.GetCount() > 0))
         return TRUE;
 
     return FALSE;
@@ -300,15 +306,15 @@ 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();
 }