Remove vestigial undo/redo from GUI, including (now inactive) icons from toolbar (#802)

Author: tturocy

Makefile.am

@@ -85,7 +85,6 @@ EXTRA_DIST = \
 	src/gui/bitmaps/prev.xpm \
 	src/gui/bitmaps/print.xpm \
 	src/gui/bitmaps/profiles.xpm \
-	src/gui/bitmaps/redo.xpm \
 	src/gui/bitmaps/saveas.xpm \
 	src/gui/bitmaps/savedata.xpm \
 	src/gui/bitmaps/save.xpm \
@@ -94,7 +93,6 @@ EXTRA_DIST = \
 	src/gui/bitmaps/tobegin.xpm \
 	src/gui/bitmaps/toend.xpm \
 	src/gui/bitmaps/tree.xpm \
-	src/gui/bitmaps/undo.xpm \
 	src/gui/bitmaps/zoomfit.xpm \
 	src/gui/bitmaps/zoomin.xpm \
 	src/gui/bitmaps/zoomout.xpm \

src/gui/bitmaps/Makefile.am

@@ -24,7 +24,6 @@
 #include <fstream>
 
 #include <wx/wxprec.h>
-#include <wx/filename.h> // used to create temp files for undo/redo
 
 #include "gambit.h"
 #include "core/tinyxml.h" // for XML parser for LoadDocument()
@@ -111,7 +110,7 @@ GameDocument::GameDocument(Game p_game)
 
 GameDocument::~GameDocument() { wxGetApp().RemoveDocument(this); }
 
-bool GameDocument::LoadDocument(const wxString &p_filename, bool p_saveUndo)
+bool GameDocument::LoadDocument(const wxString &p_filename)
 {
   TiXmlDocument doc((const char *)p_filename.mb_str());
   if (!doc.LoadFile()) {
@@ -218,11 +217,6 @@ bool GameDocument::LoadDocument(const wxString &p_filename, bool p_saveUndo)
     m_style.SetNumDecimals(numDecimals);
   }
 
-  if (p_saveUndo) {
-    std::ostringstream s;
-    SaveDocument(s);
-  }
-
   return true;
 }
 

src/gui/gamedoc.cc

@@ -120,12 +120,10 @@ class StrategyDominanceStack {
 // principle, be kept -- but they may no longer be Nash, etc.
 //
 // GBT_DOC_MODIFIED_LABELS: Labeling of players, strategies, etc. has
-// changed.  These have no effect on the game mathematically, so computed
-// data may be kept; but, we want to track the label change for undo, etc.
+// changed.
 //
 // GBT_DOC_MODIFIED_VIEWS: Information about how the document is viewed
-// (e.g., player colors) has changed.  We want to track this for undo,
-// but, again, this has no effect on the game mathematically.
+// (e.g., player colors) has changed.
 //
 using GameModificationType = enum {
   GBT_DOC_MODIFIED_NONE = 0x00,
@@ -173,7 +171,7 @@ class GameDocument {
   //@{
   /// Load document from the specified file (which should be a .gbt file)
   /// Returns true if successful, false if error
-  bool LoadDocument(const wxString &p_filename, bool p_saveUndo = true);
+  bool LoadDocument(const wxString &p_filename);
   void SaveDocument(std::ostream &) const;
   //@}
 

src/gui/gamedoc.h

@@ -364,11 +364,9 @@ void GameFrame::OnUpdate()
 #include "bitmaps/preview.xpm"
 #include "bitmaps/print.xpm"
 #include "bitmaps/profiles.xpm"
-#include "bitmaps/redo.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/saveas.xpm"
 #include "bitmaps/table.xpm"
-#include "bitmaps/undo.xpm"
 #include "bitmaps/zoomfit.xpm"
 #include "bitmaps/zoomin.xpm"
 #include "bitmaps/zoomout.xpm"
@@ -560,13 +558,6 @@ void GameFrame::MakeToolbar()
 
   toolBar->AddSeparator();
 
-  toolBar->AddTool(wxID_UNDO, wxEmptyString, wxBitmap(undo_xpm), wxNullBitmap, wxITEM_NORMAL,
-                   _("Undo the last action"), _("Undo the last change to the game"), nullptr);
-  toolBar->AddTool(wxID_REDO, wxEmptyString, wxBitmap(redo_xpm), wxNullBitmap, wxITEM_NORMAL,
-                   _("Redo the undone action"), _("Redo the last undone change"), nullptr);
-
-  toolBar->AddSeparator();
-
   toolBar->AddTool(GBT_MENU_EDIT_NEWPLAYER, wxEmptyString, wxBitmap(newplayer_xpm), wxNullBitmap,
                    wxITEM_NORMAL, _("Add a new player"), _("Add a new player to the game"),
                    nullptr);