mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Only bind wxEVT_COMMAND_MENU_SELECTED once rather than once per command as large numbers of event handlers make wx explode

Browse source 
Originally committed to SVN as r5263.
This commit is contained in:
Thomas Goyne 2011-01-23 06:45:03 +00:00
parent 88be46c657
commit 10c3a2ca16
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
aegisub/src/frame_main.cpp
View file

@ -151,10 +151,7 @@ FrameMain::FrameMain (wxArrayString args)
StartupLog("Binding commands"); StartupLog("Binding commands");
// XXX: This is a hack for now, it will need to be dealt with when other frames are involved. // XXX: This is a hack for now, it will need to be dealt with when other frames are involved.
int count = cmd::count(); Bind(wxEVT_COMMAND_MENU_SELECTED, &FrameMain::cmd_call, this);
for (int i = 0; i < count; i++) {
Bind(wxEVT_COMMAND_MENU_SELECTED, &FrameMain::cmd_call, this, i);
}
#ifdef __WXMAC__ #ifdef __WXMAC__
// Bind(FrameMain::OnAbout, &FrameMain::cmd_call, this, cmd::id("app/about")); // Bind(FrameMain::OnAbout, &FrameMain::cmd_call, this, cmd::id("app/about"));
@ -242,7 +239,8 @@ FrameMain::~FrameMain () {
void FrameMain::cmd_call(wxCommandEvent& event) { void FrameMain::cmd_call(wxCommandEvent& event) {
int id = event.GetId(); int id = event.GetId();
LOG_D("event/select") << "Id: " << id; LOG_D("event/select") << "Id: " << id;
cmd::call(context.get(), id); if (id < cmd::count())
cmd::call(context.get(), id);
} }
/// @brief Initialize toolbar /// @brief Initialize toolbar