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

Actually trigger a hotkey if it exists.

Browse source 
Originally committed to SVN as r5128.
This commit is contained in:
Amar Takhar 2011-01-05 14:07:23 +00:00
parent 9915fb1c3b
commit 2804e0cb52
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aegisub/src/frame_main.h
View file

@ -94,10 +94,10 @@ public:
void DetachVideo(bool detach=true); void DetachVideo(bool detach=true);
void LoadVFR(wxString filename); void LoadVFR(wxString filename);
private:
agi::Context temp_context; agi::Context temp_context;
private:
void cmd_call(wxCommandEvent& event); void cmd_call(wxCommandEvent& event);
AssFile *ass; AssFile *ass;

4
aegisub/src/hotkey.cpp
View file

@ -36,7 +36,8 @@
#include "aegisub/toolbar.h" #include "aegisub/toolbar.h"
#include "libresrc/libresrc.h" #include "libresrc/libresrc.h"
#include "command/command.h" #include "command/command.h"
#include "frame_main.h"
#include "main.h"
namespace hotkey { namespace hotkey {
@ -68,6 +69,7 @@ void check(std::string context, int key_code, wchar_t key_char, int modifier) {
std::string command; std::string command;
if (agi::hotkey::hotkey->Scan(context, combo, command) == 0) { if (agi::hotkey::hotkey->Scan(context, combo, command) == 0) {
(*cmd::get(command))(&wxGetApp().frame->temp_context);
} }
} }