Remove undo/redo from graphical interface.

Undo and redo facility was not fully implemented and had
unpredictable behaviour.

Closes #505.

Author: tturocy

ChangeLog

@@ -7,6 +7,10 @@
   terminal Nash profile correctly.  (#172)
 - Improved sizing of list of logit profiles computed for normal form games.
 
+### Removed
+- Undo and redo have been removed from the graphical interface.  (These were meant to be
+  removed previously as they did not work properly and gave unpredictable behaviour.) (#505)
+
 
 ## [16.3.1] - 2025-08-18
 

src/gui/efgdisplay.cc

@@ -335,11 +335,6 @@ gbtEfgDisplay::gbtEfgDisplay(wxWindow *p_parent, gbtGameDocument *p_doc)
 void gbtEfgDisplay::MakeMenus()
 {
   m_nodeMenu = new wxMenu;
-
-  m_nodeMenu->Append(wxID_UNDO, _("&Undo\tCtrl-Z"), _("Undo the last change"));
-  m_nodeMenu->Append(wxID_REDO, _("&Redo\tCtrl-Y"), _("Redo the last undone change"));
-  m_nodeMenu->AppendSeparator();
-
   m_nodeMenu->Append(GBT_MENU_EDIT_INSERT_MOVE, _("&Insert move"), _("Insert a move"));
   m_nodeMenu->Append(GBT_MENU_EDIT_INSERT_ACTION, _("Insert &action"),
                      _("Insert an action at the current move"));
@@ -590,8 +585,6 @@ void gbtEfgDisplay::OnUpdate()
 
   Gambit::GameNode selectNode = m_doc->GetSelectNode();
 
-  m_nodeMenu->Enable(wxID_UNDO, m_doc->CanUndo());
-  m_nodeMenu->Enable(wxID_REDO, m_doc->CanRedo());
   m_nodeMenu->Enable(GBT_MENU_EDIT_INSERT_MOVE, selectNode);
   m_nodeMenu->Enable(GBT_MENU_EDIT_INSERT_ACTION, selectNode && selectNode->GetInfoset());
   m_nodeMenu->Enable(GBT_MENU_EDIT_REVEAL, selectNode && selectNode->GetInfoset());

src/gui/gamedoc.cc

@@ -184,7 +184,6 @@ gbtGameDocument::gbtGameDocument(Gambit::Game p_game)
 
   std::ostringstream s;
   SaveDocument(s);
-  m_undoList.push_back(s.str());
 }
 
 gbtGameDocument::~gbtGameDocument() { wxGetApp().RemoveDocument(this); }
@@ -300,7 +299,6 @@ bool gbtGameDocument::LoadDocument(const wxString &p_filename, bool p_saveUndo)
   if (p_saveUndo) {
     std::ostringstream s;
     SaveDocument(s);
-    m_undoList.push_back(s.str());
   }
 
   return true;
@@ -348,11 +346,8 @@ void gbtGameDocument::UpdateViews(gbtGameModificationType p_modifications)
 {
   if (p_modifications != GBT_DOC_MODIFIED_NONE) {
     m_modified = true;
-    m_redoList = std::list<std::string>();
-
     std::ostringstream s;
     SaveDocument(s);
-    m_undoList.push_back(s.str());
   }
 
   if (p_modifications == GBT_DOC_MODIFIED_GAME || p_modifications == GBT_DOC_MODIFIED_PAYOFFS) {
@@ -395,65 +390,6 @@ void gbtGameDocument::SetStyle(const gbtStyle &p_style)
   UpdateViews(GBT_DOC_MODIFIED_VIEWS);
 }
 
-//
-// A word about the undo and redo features:
-// We store a list of the textual representation of games.  We don't
-// store other aspects of the state (e.g., profiles) as yet.
-// The "undo" list includes the representation of the current state
-// of the game (hence, CanUndo() only returns true when the list has
-// more than one element.
-//
-void gbtGameDocument::Undo()
-{
-  // The current game is at the end of the undo list; move it to the redo list
-  m_redoList.push_back(m_undoList.back());
-  m_undoList.pop_back();
-
-  m_game = nullptr;
-
-  while (!m_profiles.empty()) {
-    delete m_profiles.back();
-    m_profiles.pop_back();
-  }
-  m_currentProfileList = 0;
-
-  wxString tempfile = wxFileName::CreateTempFileName(wxT("gambit"));
-  std::ofstream f((const char *)tempfile.mb_str());
-  f << m_undoList.back() << std::endl;
-  f.close();
-
-  LoadDocument(tempfile, false);
-  wxRemoveFile(tempfile);
-
-  for (int i = 1; i <= m_views.size(); m_views[i++]->OnUpdate())
-    ;
-}
-
-void gbtGameDocument::Redo()
-{
-  m_undoList.push_back(m_redoList.back());
-  m_redoList.pop_back();
-
-  m_game = nullptr;
-
-  while (!m_profiles.empty()) {
-    delete m_profiles.back();
-    m_profiles.pop_back();
-  }
-  m_currentProfileList = 0;
-
-  wxString tempfile = wxFileName::CreateTempFileName(wxT("gambit"));
-  std::ofstream f((const char *)tempfile.mb_str());
-  f << m_undoList.back() << std::endl;
-  f.close();
-
-  LoadDocument(tempfile, false);
-  wxRemoveFile(tempfile);
-
-  for (int i = 1; i <= m_views.size(); m_views[i++]->OnUpdate())
-    ;
-}
-
 void gbtGameDocument::SetCurrentProfile(int p_profile)
 {
   m_profiles[m_currentProfileList]->SetCurrent(p_profile);

src/gui/gamedoc.h

@@ -235,8 +235,6 @@ class gbtGameDocument {
   Gambit::Array<gbtAnalysisOutput *> m_profiles;
   int m_currentProfileList;
 
-  std::list<std::string> m_undoList, m_redoList;
-
   void UpdateViews(gbtGameModificationType p_modifications);
 
 public:
@@ -269,17 +267,6 @@ class gbtGameDocument {
   bool IsConstSum() const { return m_game->IsConstSum(); }
   bool IsTree() const { return m_game->IsTree(); }
 
-  //!
-  //! @name Handling of undo/redo features
-  //!
-  //@{
-  bool CanUndo() const { return (m_undoList.size() > 1); }
-  void Undo();
-
-  bool CanRedo() const { return (m_redoList.size() > 0); }
-  void Redo();
-  //@}
-
   //!
   //! @name Handling of list of computed profiles
   //!

src/gui/gameframe.cc

@@ -198,8 +198,6 @@ EVT_MENU(wxID_PREVIEW, gbtGameFrame::OnFilePrintPreview)
 EVT_MENU(wxID_PRINT, gbtGameFrame::OnFilePrint)
 EVT_MENU(wxID_EXIT, gbtGameFrame::OnFileExit)
 EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, gbtGameFrame::OnFileMRUFile)
-EVT_MENU(wxID_UNDO, gbtGameFrame::OnEditUndo)
-EVT_MENU(wxID_REDO, gbtGameFrame::OnEditRedo)
 EVT_MENU(GBT_MENU_EDIT_INSERT_MOVE, gbtGameFrame::OnEditInsertMove)
 EVT_MENU(GBT_MENU_EDIT_INSERT_ACTION, gbtGameFrame::OnEditInsertAction)
 EVT_MENU(GBT_MENU_EDIT_DELETE_TREE, gbtGameFrame::OnEditDeleteTree)
@@ -246,19 +244,15 @@ gbtGameFrame::gbtGameFrame(wxWindow *p_parent, gbtGameDocument *p_doc)
   MakeMenus();
   MakeToolbar();
 
-  wxAcceleratorEntry entries[10];
+  wxAcceleratorEntry entries[8];
   entries[0].Set(wxACCEL_CTRL, (int)'o', wxID_OPEN);
   entries[1].Set(wxACCEL_CTRL, (int)'s', wxID_SAVE);
   entries[2].Set(wxACCEL_CTRL | wxACCEL_SHIFT, (int)'s', wxID_SAVEAS);
   entries[3].Set(wxACCEL_CTRL, (int)'p', wxID_PRINT);
   entries[4].Set(wxACCEL_CTRL, (int)'w', wxID_CLOSE);
   entries[5].Set(wxACCEL_CTRL, (int)'x', wxID_EXIT);
-  entries[6].Set(wxACCEL_CTRL, (int)'z', wxID_UNDO);
-  entries[7].Set(wxACCEL_CTRL, (int)'y', wxID_REDO);
-  //  entries[8].Set(wxACCEL_NORMAL, WXK_DELETE, GBT_MENU_EDIT_DELETE_TREE);
-  // entries[9].Set(wxACCEL_NORMAL, WXK_BACK, GBT_MENU_EDIT_DELETE_PARENT);
-  entries[8].Set(wxACCEL_CTRL, (int)'+', GBT_MENU_VIEW_ZOOMIN);
-  entries[9].Set(wxACCEL_CTRL, (int)'-', GBT_MENU_VIEW_ZOOMOUT);
+  entries[6].Set(wxACCEL_CTRL, (int)'+', GBT_MENU_VIEW_ZOOMIN);
+  entries[7].Set(wxACCEL_CTRL, (int)'-', GBT_MENU_VIEW_ZOOMOUT);
   wxAcceleratorTable accel(10, entries);
   SetAcceleratorTable(accel);
 
@@ -325,10 +319,6 @@ void gbtGameFrame::OnUpdate()
 
   menuBar->Enable(GBT_MENU_FILE_EXPORT_EFG, m_doc->IsTree());
 
-  menuBar->Enable(wxID_UNDO, m_doc->CanUndo());
-  GetToolBar()->EnableTool(wxID_UNDO, m_doc->CanUndo());
-  menuBar->Enable(wxID_REDO, m_doc->CanRedo());
-  GetToolBar()->EnableTool(wxID_REDO, m_doc->CanRedo());
   menuBar->Enable(GBT_MENU_EDIT_INSERT_MOVE, selectNode != nullptr);
   menuBar->Enable(GBT_MENU_EDIT_INSERT_ACTION, selectNode && selectNode->GetInfoset());
   menuBar->Enable(GBT_MENU_EDIT_REVEAL, selectNode && selectNode->GetInfoset());
@@ -456,13 +446,6 @@ void gbtGameFrame::MakeMenus()
   AppendBitmapItem(fileMenu, wxID_EXIT, _("E&xit\tCtrl-Q"), _("Exit Gambit"), wxBitmap(exit_xpm));
 
   auto *editMenu = new wxMenu;
-
-  AppendBitmapItem(editMenu, wxID_UNDO, _("&Undo\tCtrl-Z"), _("Undo the last change"),
-                   wxBitmap(undo_xpm));
-  AppendBitmapItem(editMenu, wxID_REDO, _("&Redo\tCtrl-Y"), _("Redo the last undone change"),
-                   wxBitmap(redo_xpm));
-
-  editMenu->AppendSeparator();
   AppendBitmapItem(editMenu, GBT_MENU_EDIT_NEWPLAYER, _("Add p&layer"),
                    _("Add a new player to the game"), wxBitmap(newplayer_xpm));
 
@@ -931,20 +914,6 @@ void gbtGameFrame::OnFileMRUFile(wxCommandEvent &p_event)
 //                gbtGameFrame: Menu handlers - Edit menu
 //----------------------------------------------------------------------
 
-void gbtGameFrame::OnEditUndo(wxCommandEvent &)
-{
-  if (m_doc->CanUndo()) {
-    m_doc->Undo();
-  }
-}
-
-void gbtGameFrame::OnEditRedo(wxCommandEvent &)
-{
-  if (m_doc->CanRedo()) {
-    m_doc->Redo();
-  }
-}
-
 void gbtGameFrame::OnEditInsertMove(wxCommandEvent &)
 {
   gbtInsertMoveDialog dialog(this, m_doc);

src/gui/gameframe.h

@@ -68,9 +68,6 @@ class gbtGameFrame : public wxFrame, public gbtGameView {
   void OnFileExit(wxCommandEvent &);
   void OnFileMRUFile(wxCommandEvent &);
 
-  void OnEditUndo(wxCommandEvent &);
-  void OnEditRedo(wxCommandEvent &);
-
   void OnEditInsertMove(wxCommandEvent &);
   void OnEditInsertAction(wxCommandEvent &);
   void OnEditDeleteTree(wxCommandEvent &);