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

Add 'insert symbol menu' in EVT_MENU_OPEN instead of updateUI, this fixes crash on wxGTK

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1647 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2011-02-02 23:16:59 +00:00
parent b96e7ad1fb
commit e36f697855
5 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/cards_panel.cpp
+21 -1
View File
@@ -284,18 +284,38 @@ void CardsPanel::onUpdateUI(wxUpdateUIEvent& ev) {
case ID_INSERT_SYMBOL: {
wxMenu* menu = editor->getMenu(ID_INSERT_SYMBOL);
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;
}
#endif
}
}
void CardsPanel::onMenuOpen(wxMenuEvent& ev) {
if (ev.GetMenu() != menuFormat) return;
wxMenu* menu = editor->getMenu(ID_INSERT_SYMBOL);
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);
}
}
void CardsPanel::onCommand(int id) {
switch (id) {
case ID_CARD_PREV:
src/gui/set/cards_panel.hpp
+1
View File
@@ -37,6 +37,7 @@ class CardsPanel : public SetWindowPanel {
virtual void destroyUI(wxToolBar* tb, wxMenuBar* mb);
virtual void onUpdateUI(wxUpdateUIEvent&);
virtual void onCommand(int id);
virtual void onMenuOpen(wxMenuEvent&);
// --------------------------------------------------- : Actions
src/gui/set/panel.hpp
+3
View File
@@ -44,6 +44,9 @@ class SetWindowPanel : public wxPanel, public SetView {
/// Respond to one of those extra menu/tool items
virtual void onCommand(int id) {}
/// Called before a menu is opened in the parent window
virtual void onMenuOpen(wxMenuEvent&) {}
// --------------------------------------------------- : Actions/Events
/// Should return true if this panel wants to get focus to show an action
src/gui/set/window.cpp
+6
View File
@@ -813,6 +813,11 @@ void SetWindow::onChildMenu(wxCommandEvent& ev) {
current_panel->onCommand(ev.GetId());
}
void SetWindow::onMenuOpen(wxMenuEvent& ev) {
wxFrame::OnMenuOpen(ev);
current_panel->onMenuOpen(ev);
}
void SetWindow::onIdle(wxIdleEvent& ev) {
// Stuff that must be done in the main thread
show_update_dialog(this);
@@ -856,6 +861,7 @@ BEGIN_EVENT_TABLE(SetWindow, wxFrame)
EVT_MENU (ID_HELP_INDEX, SetWindow::onHelpIndex)
EVT_MENU (ID_HELP_WEBSITE, SetWindow::onHelpWebsite)
EVT_MENU (ID_HELP_ABOUT, SetWindow::onHelpAbout)
EVT_MENU_OPEN ( SetWindow::onMenuOpen)
EVT_TOOL_RANGE (ID_CHILD_MIN, ID_CHILD_MAX, SetWindow::onChildMenu)
EVT_COMMAND_RANGE (ID_CHILD_MIN, ID_CHILD_MAX, wxEVT_COMMAND_BUTTON_CLICKED, SetWindow::onChildMenu)
EVT_COMMAND_RANGE (ID_CHILD_MIN, ID_CHILD_MAX, wxEVT_COMMAND_SPINCTRL_UPDATED, SetWindow::onChildMenu)
src/gui/set/window.hpp
+1
View File
@@ -165,6 +165,7 @@ class SetWindow : public wxFrame, public SetView {
// --------------------------------------------------- : Window events - other
void onChildMenu (wxCommandEvent&);
void onMenuOpen (wxMenuEvent&);
void onIdle (wxIdleEvent&);