Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tturocy merged 1 commit into from
Mar 15, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
57 changes: 0 additions & 57 deletions src/gui/bitmaps/Makefile.am
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions src/gui/gamedoc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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;
}

Expand Down
8 changes: 3 additions & 5 deletions src/gui/gamedoc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
//@}

Expand Down
9 changes: 0 additions & 9 deletions src/gui/gameframe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down
Loading