Return -1 from AegisubApp::FilterEvent rather than wxEventFilter::Event_Skip, as the enum was added in wx 2.9.4
Originally committed to SVN as r6188.
This commit is contained in:
parent
84d1315736
commit
e34b401201
1 changed files with 1 additions and 6 deletions
|
@ -34,9 +34,6 @@
|
||||||
/// @ingroup main
|
/// @ingroup main
|
||||||
///
|
///
|
||||||
|
|
||||||
|
|
||||||
////////////
|
|
||||||
// Includes
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#ifndef AGI_PRE
|
#ifndef AGI_PRE
|
||||||
|
@ -50,8 +47,6 @@
|
||||||
#include <wx/utils.h>
|
#include <wx/utils.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <wx/eventfilter.h>
|
|
||||||
|
|
||||||
#include "include/aegisub/menu.h"
|
#include "include/aegisub/menu.h"
|
||||||
#include "command/command.h"
|
#include "command/command.h"
|
||||||
#include "command/icon.h"
|
#include "command/icon.h"
|
||||||
|
@ -537,7 +532,7 @@ int AegisubApp::OnRun() {
|
||||||
int AegisubApp::FilterEvent(wxEvent& event) {
|
int AegisubApp::FilterEvent(wxEvent& event) {
|
||||||
if (event.GetEventType() == wxEVT_KEY_DOWN)
|
if (event.GetEventType() == wxEVT_KEY_DOWN)
|
||||||
event.ResumePropagation(wxEVENT_PROPAGATE_MAX);
|
event.ResumePropagation(wxEVENT_PROPAGATE_MAX);
|
||||||
return wxEventFilter::Event_Skip;
|
return -1 /* wxEventFilter::Event_Skip */;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////
|
////////////////
|
||||||
|
|
Loading…
Reference in a new issue