timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes #1, menu items not properly disabled on some platforms

Browse Source
This commit is contained in:
Timothy Warren 2015-04-29 21:28:32 -04:00
parent 8f05ce1059
commit 2b2175220f
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/widgets/MainFrame.cpp
View File

@ -151,8 +151,8 @@ void MainFrame::SetupMenu()
//editMenu->Append(wxID_FIND, "&Find\tCtrl+F"); //editMenu->Append(wxID_FIND, "&Find\tCtrl+F");
//editMenu->Append(wxID_REPLACE, "&Replace\tCtrl+R"); //editMenu->Append(wxID_REPLACE, "&Replace\tCtrl+R");
//editMenu->AppendSeparator(); //editMenu->AppendSeparator();
editMenu->Append(wxID_PREFERENCES, "&Preferences\tCtrl+P"); //editMenu->Append(wxID_PREFERENCES, "&Preferences\tCtrl+P");
editMenu->AppendSeparator(); //editMenu->AppendSeparator();
editMenu->Append(wxID_SELECTALL, "Select All\tCtrl+A", "Select all the text in the current document"); editMenu->Append(wxID_SELECTALL, "Select All\tCtrl+A", "Select all the text in the current document");
viewMenu->AppendCheckItem(myID_VIEW_WHITESPACE, "Show Invisible Characters\tCtrl+Shift+I", "Toggle visibility of white space characters"); viewMenu->AppendCheckItem(myID_VIEW_WHITESPACE, "Show Invisible Characters\tCtrl+Shift+I", "Toggle visibility of white space characters");
@ -454,9 +454,9 @@ void MainFrame::EnableEditControls(bool enable)
this->fileMenu->Enable(myID_CLOSE_ALL, enable); this->fileMenu->Enable(myID_CLOSE_ALL, enable);
// Enable/disable top level menus // Enable/disable top level menus
this->mbar->EnableTop(myEDIT_MENU, enable); this->EnableEntireMenu(myEDIT_MENU, this->editMenu, enable);
this->mbar->EnableTop(myVIEW_MENU, enable); this->EnableEntireMenu(myVIEW_MENU, this->viewMenu, enable);
this->mbar->EnableTop(myLANG_MENU, enable); this->EnableEntireMenu(myLANG_MENU, this->langMenu, enable);
this->toolBar->EnableTool(wxID_SAVE, enable); this->toolBar->EnableTool(wxID_SAVE, enable);
this->toolBar->EnableTool(wxID_CLOSE, enable); this->toolBar->EnableTool(wxID_CLOSE, enable);
@ -465,6 +465,36 @@ void MainFrame::EnableEditControls(bool enable)
this->toolBar->EnableTool(wxID_PASTE, enable); this->toolBar->EnableTool(wxID_PASTE, enable);
} }
/**
* Enable/disable all the items in the menu, for environments
* that don't properly support disabling the menu by the parent label (like Ubuntu's Unity)
*
* @param size_t menuId
* @param wxMenu* menu
* @param bool enable
* @return void
*/
void MainFrame::EnableEntireMenu(size_t menuId, wxMenu *menu, bool enable)
{
// Toggle the top of the menu
this->mbar->EnableTop(menuId, enable);
// Toggle the rest of the items in the menu
wxMenuItemList list = menu->GetMenuItems();
wxMenuItemList::iterator iter;
for(iter = list.begin(); iter != list.end(); ++iter)
{
wxMenuItem *current = *iter;
current->Enable(enable);
}
}
/**
* Displays a context menu on the current tab
*
* @return void
*/
void MainFrame::OnTabContextMenu(wxAuiNotebookEvent &WXUNUSED(event)) void MainFrame::OnTabContextMenu(wxAuiNotebookEvent &WXUNUSED(event))
{ {
// Create Menu // Create Menu

1
src/widgets/MainFrame.h
View File

@ -33,6 +33,7 @@ class MainFrame: public wxFrame
void SetupStatusBar(); void SetupStatusBar();
void BindEvents(); void BindEvents();
void EnableEditControls(bool enable=true); void EnableEditControls(bool enable=true);
void EnableEntireMenu(size_t menuId, wxMenu *menu, bool enable=true);
// Main Menu Event handlers // Main Menu Event handlers
void OnNew(wxCommandEvent &event); void OnNew(wxCommandEvent &event);