diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/osd/modules/debugger/debugqt.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/osd/modules/debugger/debugqt.cpp')
| -rw-r--r-- | src/osd/modules/debugger/debugqt.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp index 692e58d6551..75d925f1f24 100644 --- a/src/osd/modules/debugger/debugqt.cpp +++ b/src/osd/modules/debugger/debugqt.cpp @@ -8,9 +8,7 @@ // //============================================================ -#if (!defined(NO_MEM_TRACKING)) #define NO_MEM_TRACKING -#endif #include "debug_module.h" #include "modules/osdmodule.h" @@ -19,8 +17,9 @@ #include <vector> -#include <QtGui/QtGui> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> +#include <QtCore/QAbstractEventDispatcher> +#include <QtCore/QAbstractNativeEventFilter> #include "emu.h" #include "config.h" @@ -36,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() @@ -52,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; }; @@ -234,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) @@ -243,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 |
