amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 14:07:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanup for insert symbol menu change

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1649 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2011-02-03 22:24:37 +00:00
parent f189929158
commit 6981c4a2b4
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/cards_panel.cpp
+3 -11
View File
@@ -135,6 +135,9 @@ bool CardsPanel::Layout() {
return SetWindowPanel::Layout(); return SetWindowPanel::Layout();
} }
/*void removeInsertSymbolMenu() {
menuFormat->Append(ID_INSERT_SYMBOL, _(""), _MENU_("insert symbol"));
}*/// TODO
CardsPanel::~CardsPanel() { CardsPanel::~CardsPanel() {
// settings.card_notes_height = splitter->GetSashPosition(); // settings.card_notes_height = splitter->GetSashPosition();
// we don't own the submenu // we don't own the submenu
@@ -284,17 +287,6 @@ void CardsPanel::onUpdateUI(wxUpdateUIEvent& ev) {
case ID_INSERT_SYMBOL: { case ID_INSERT_SYMBOL: {
wxMenu* menu = editor->getMenu(ID_INSERT_SYMBOL); wxMenu* menu = editor->getMenu(ID_INSERT_SYMBOL);
ev.Enable(menu); ev.Enable(menu);
/*
if (insertSymbolMenu->GetSubMenu() != menu || (menu && menu->GetParent() != menuFormat)) {
// re-add the menu
fprintf(stderr,"insert1 %p %p\n", menuFormat,insertSymbolMenu);fflush(stderr);
menuFormat->Remove(ID_INSERT_SYMBOL);
fprintf(stderr,"insert2\n");fflush(stderr);
insertSymbolMenu->SetSubMenu(menu);
fprintf(stderr,"insert3\n");fflush(stderr);
menuFormat->Append(insertSymbolMenu);
fprintf(stderr,"insert4\n");fflush(stderr);
}*/
break; break;
} }
#endif #endif
src/gui/set/window.cpp
+1 -1
View File
@@ -814,8 +814,8 @@ void SetWindow::onChildMenu(wxCommandEvent& ev) {
} }
void SetWindow::onMenuOpen(wxMenuEvent& ev) { void SetWindow::onMenuOpen(wxMenuEvent& ev) {
wxFrame::OnMenuOpen(ev);
current_panel->onMenuOpen(ev); current_panel->onMenuOpen(ev);
wxFrame::OnMenuOpen(ev);
} }
void SetWindow::onIdle(wxIdleEvent& ev) { void SetWindow::onIdle(wxIdleEvent& ev) {