From d0db1a0d7f7fb508b08aa72e19a474599605666e Mon Sep 17 00:00:00 2001
From: Tim Warren <timothy.warren@11main.com>
Date: Tue, 21 Apr 2015 10:09:39 -0400
Subject: [PATCH] Enable/disable controls into one method

---
 src/widgets/MainFrame.cpp | 62 ++++++++++++---------------------------
 src/widgets/MainFrame.h   |  3 +-
 2 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/src/widgets/MainFrame.cpp b/src/widgets/MainFrame.cpp
index 32b7c2f..11be773 100644
--- a/src/widgets/MainFrame.cpp
+++ b/src/widgets/MainFrame.cpp
@@ -26,7 +26,7 @@ MainFrame::MainFrame(wxFrame *frame, const wxString& title)
 	base_sizer->SetContainingWindow(this);
 	base_sizer->SetMinSize(800,600);
 	
-	this->DisableEditControls();
+	this->EnableEditControls(false);
 	this->BindEvents();
 	
 	// Do the layout
@@ -79,7 +79,7 @@ void MainFrame::SetupToolbar()
 	toolBar->AddTool(wxID_NEW, "New", new_file_icon, "New file");
 	toolBar->AddTool(wxID_OPEN, "Open", open_file_icon, "Open file");
 	toolBar->AddTool(wxID_SAVE, "Save", save_file_icon, "Save file");
-#ifndef __WXWIN__
+#ifndef WIN32
 	toolBar->AddTool(wxID_CLOSE, "Close", close_file_icon, "Close file");
 #endif
 	toolBar->AddSeparator();
@@ -215,7 +215,7 @@ void MainFrame::OnClosed(wxAuiNotebookEvent &WXUNUSED(event))
 {
 	if (notebook->GetPageCount() == 0)
 	{
-		this->DisableEditControls();
+		this->EnableEditControls(false);
 	}
 }
 
@@ -328,46 +328,22 @@ void MainFrame::OnAbout(wxCommandEvent &WXUNUSED(event))
 	wxAboutBox(info);
 }
 
-/**
- * Enable file-specific controls
- */
-void MainFrame::EnableEditControls()
+void MainFrame::EnableEditControls(bool enable)
 {
-	fileMenu->Enable(wxID_SAVE, true);
-	fileMenu->Enable(wxID_SAVEAS, true);
+	fileMenu->Enable(wxID_SAVE, enable);
+	fileMenu->Enable(wxID_SAVEAS, enable);
+	fileMenu->Enable(wxID_CLOSE, enable);
 	
-	editMenu->Enable(wxID_CUT, true);
-	editMenu->Enable(wxID_COPY, true);
-	editMenu->Enable(wxID_PASTE, true);
-	editMenu->Enable(wxID_CLEAR, true);
-	editMenu->Enable(wxID_FIND, true);
-	editMenu->Enable(wxID_SELECTALL, true);
-			
-	toolBar->EnableTool(wxID_SAVE, true);
-	toolBar->EnableTool(wxID_CLOSE, true);
-	toolBar->EnableTool(wxID_COPY, true);
-	toolBar->EnableTool(wxID_CUT, true);
-	toolBar->EnableTool(wxID_PASTE, true);
+	editMenu->Enable(wxID_CUT, enable);
+	editMenu->Enable(wxID_COPY, enable);
+	editMenu->Enable(wxID_PASTE, enable);
+	editMenu->Enable(wxID_CLEAR, enable);
+	editMenu->Enable(wxID_FIND, enable);
+	editMenu->Enable(wxID_SELECTALL, enable);
+	
+	toolBar->EnableTool(wxID_SAVE, enable);
+	toolBar->EnableTool(wxID_CLOSE, enable);
+	toolBar->EnableTool(wxID_COPY, enable);
+	toolBar->EnableTool(wxID_CUT, enable);
+	toolBar->EnableTool(wxID_PASTE, enable);
 }
-
-/**
- * Disables file-specific controls
- */
-void MainFrame::DisableEditControls()
-{
-	fileMenu->Enable(wxID_SAVE, false);
-	fileMenu->Enable(wxID_SAVEAS, false);
-	
-	editMenu->Enable(wxID_CUT, false);
-	editMenu->Enable(wxID_COPY, false);
-	editMenu->Enable(wxID_PASTE, false);
-	editMenu->Enable(wxID_CLEAR, false);
-	editMenu->Enable(wxID_FIND, false);
-	editMenu->Enable(wxID_SELECTALL, false);
-	
-	toolBar->EnableTool(wxID_SAVE, false);
-	toolBar->EnableTool(wxID_CLOSE, false);
-	toolBar->EnableTool(wxID_COPY, false);
-	toolBar->EnableTool(wxID_CUT, false);
-	toolBar->EnableTool(wxID_PASTE, false);
-}
\ No newline at end of file
diff --git a/src/widgets/MainFrame.h b/src/widgets/MainFrame.h
index 5a507db..90de238 100644
--- a/src/widgets/MainFrame.h
+++ b/src/widgets/MainFrame.h
@@ -38,8 +38,7 @@ class MainFrame: public wxFrame
 		void SetupToolbar();
 		void SetupStatusBar();
 		void BindEvents();
-		void EnableEditControls();
-		void DisableEditControls();
+		void EnableEditControls(bool enable=true);
 		void OnNew(wxCommandEvent &event);
 		void OnOpen(wxCommandEvent &event);
 		void OnClose(wxAuiNotebookEvent &event);