Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fix for wxQt wxUIActionSimulator with Qt 5.3

Browse Source 
QTest::mouseEvent() and keyEvent() want QWindow, not QWidget, in this version.
This commit is contained in:
Vadim Zeitlin
2016-02-24 22:58:07 +01:00
parent 9db24be496
commit 4d27a5dde3
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/qt/uiaction.cpp
View File

@@ -14,6 +14,7 @@
#include <QtTest/QtTestGui> #include <QtTest/QtTestGui>
#include <QApplication> #include <QApplication>
#include <QWidget>
#include "wx/qt/defs.h" #include "wx/qt/defs.h"
#include "wx/qt/private/utils.h" #include "wx/qt/private/utils.h"
@@ -26,6 +27,16 @@
using namespace Qt; using namespace Qt;
using namespace QTest; using namespace QTest;
// Apparently {mouse,key}Event() functions signature has changed somewhere
// between Qt 5.3 and 5.5 as they're documented to take QWidget in the latter
// but actually take QWindow in the former, so use this helper to hide the
// difference.
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
inline QWidget* argForEvents(QWidget* w) { return w; }
#else
inline QWindow* argForEvents(QWidget* w) { return w->windowHandle(); }
#endif
static MouseButton ConvertMouseButton( int button ) static MouseButton ConvertMouseButton( int button )
{ {
MouseButton qtButton; MouseButton qtButton;
@@ -66,7 +77,7 @@ static bool SimulateMouseButton( MouseAction mouseAction, MouseButton mouseButto
QPoint mousePosition = QCursor::pos(); QPoint mousePosition = QCursor::pos();
QWidget *widget = QApplication::widgetAt( mousePosition ); QWidget *widget = QApplication::widgetAt( mousePosition );
if ( widget != NULL ) if ( widget != NULL )
mouseEvent( mouseAction, widget, mouseButton, NoModifier, mousePosition ); mouseEvent( mouseAction, argForEvents(widget), mouseButton, NoModifier, mousePosition );
// If we found a widget then we successfully simulated an event: // If we found a widget then we successfully simulated an event:
@@ -77,7 +88,7 @@ static bool SimulateKeyboardKey( KeyAction keyAction, Key key )
{ {
QWidget *widget = QApplication::focusWidget(); QWidget *widget = QApplication::focusWidget();
if ( widget != NULL ) if ( widget != NULL )
keyEvent( keyAction, widget, key ); keyEvent( keyAction, argForEvents(widget), key );
// If we found a widget then we successfully simulated an event: // If we found a widget then we successfully simulated an event: