summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Robbbert <pac0446@bigpond.net.au>2015-12-27 23:53:15 +1100
committer Robbbert <pac0446@bigpond.net.au>2015-12-27 23:53:15 +1100
commit88e4fea8db7b3ac93b9e23f4a08a146f81fa791e (patch)
treec4ddbfe308ddc24f605b462630c775f9a1420979 /src
parent99559bc6bd802665fc78fc5969b84727c05bb439 (diff)
parentfd21d7accb59b8390c93ccce65ae342bdc88e823 (diff)
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src')
-rw-r--r--src/osd/modules/debugger/debugqt.cpp17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp
index 1819eaa24dd..75d925f1f24 100644
--- a/src/osd/modules/debugger/debugqt.cpp
+++ b/src/osd/modules/debugger/debugqt.cpp
@@ -18,6 +18,8 @@
#include <vector>
#include <QtWidgets/QApplication>
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtCore/QAbstractNativeEventFilter>
#include "emu.h"
#include "config.h"
@@ -33,6 +35,9 @@
#include "qt/deviceinformationwindow.h"
class debug_qt : public osd_module, public debug_module
+#if defined(WIN32) && !defined(SDLMAME_WIN32)
+, public QAbstractNativeEventFilter
+#endif
{
public:
debug_qt()
@@ -49,7 +54,9 @@ public:
virtual void init_debugger(running_machine &machine);
virtual void wait_for_debugger(device_t &device, bool firststop);
virtual void debugger_update();
-
+#if defined(WIN32) && !defined(SDLMAME_WIN32)
+ virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE;
+#endif
private:
running_machine *m_machine;
};
@@ -231,6 +238,12 @@ static void bring_main_window_to_front()
#if defined(WIN32) && !defined(SDLMAME_WIN32)
bool winwindow_qt_filter(void *message);
+
+bool debug_qt::nativeEventFilter(const QByteArray &eventType, void *message, long *)
+{
+ winwindow_qt_filter(message);
+ return false;
+}
#endif
void debug_qt::init_debugger(running_machine &machine)
@@ -240,7 +253,7 @@ void debug_qt::init_debugger(running_machine &machine)
// If you're starting from scratch, create a new qApp
new QApplication(qtArgc, qtArgv);
#if defined(WIN32) && !defined(SDLMAME_WIN32)
- QAbstractEventDispatcher::instance()->setEventFilter((QAbstractEventDispatcher::EventFilter)&winwindow_qt_filter);
+ QAbstractEventDispatcher::instance()->installNativeEventFilter(this);
#endif
}
else