Skip to content

Commit 303d50c

Browse files
committed
Use __FOX_UNDO__ to enable/disable experimental Undo feature
1 parent 4067677 commit 303d50c

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

Fox/src/Fox.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,11 +1649,11 @@ WXCrystMainFrame::WXCrystMainFrame(const wxString& title, const wxPoint& pos, co
16491649
_T("Add a new Single Crystal Diffraction Object"));
16501650
objectMenu->Append(MENU_OBJECT_CREATE_GLOBALOPTOBJ, _T("New Monte-Carlo Object"),
16511651
_T("Add a new Monte-Carlo Object"));
1652-
/*
1652+
#ifdef __FOX_UNDO__
16531653
wxMenu *menuEdit = new wxMenu;//
16541654
menuEdit->Append(wxID_UNDO, _T("&Undo\tCtrl-Z"), _T("Undo last change in objects (EXPERIMENTAL)"));
16551655
menuEdit->Append(wxID_REDO, _T("&Redo\tCtrl-Y"), _T("Redo next change in objects (EXPERIMENTAL)"));
1656-
*/
1656+
#endif
16571657
//FoxGrid////////////////////////////////////////////////////////////////////
16581658
wxMenu *gridMenu = new wxMenu;
16591659
gridMenu->Append(MENU_GRID_SERVER_RUN, _T("&Run Server"), _T("Start Fox Grid Server"));
@@ -1674,7 +1674,9 @@ WXCrystMainFrame::WXCrystMainFrame(const wxString& title, const wxPoint& pos, co
16741674
wxMenuBar *menuBar = new wxMenuBar();
16751675
menuBar->Append(menuFile, _T("&File"));
16761676
menuBar->Append(objectMenu,_T("&Objects"));
1677-
// menuBar->Append(menuEdit,_T("Edit"));
1677+
#ifdef __FOX_UNDO__
1678+
menuBar->Append(menuEdit,_T("Edit"));
1679+
#endif
16781680
#ifdef __FOX_COD__
16791681
menuBar->Append(codMenu,_T("COD"));
16801682
#endif

ObjCryst/wxCryst/wxCryst.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ WXField *spLastWXFieldInputNotValidated=0;
257257

258258
void WXCrystValidateAllUserInput()
259259
{
260-
/*
260+
#ifdef __FOX_UNDO__
261261
// Hijack this function to record changes in the configuration
262262
gConfigHistory.Store();
263-
*/
263+
#endif
264264
if(0==spLastWXFieldInputNotValidated) return;
265265
VFN_DEBUG_ENTRY("WXCrystValidateAllUserInput()...",6)
266266
static WXField *pField;

0 commit comments

Comments
 (0)