From 7e1a12d07d936d99d5d6d163e3d8b9bb1f52c115 Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Thu, 22 Sep 2011 16:10:35 +0200 Subject: Fix QWindowsAccessible::GetWindow() Since we added QAI::window() we now have a more reliable way of getting hold of a HWND. Change-Id: I330ecee67f041d5b204ef4bc1401ce4cc76de2b7 Reviewed-on: http://codereview.qt-project.org/5840 Reviewed-by: Qt Sanity Bot Reviewed-by: Frederik Gladhorn --- .../platforms/windows/qwindowsaccessibility.cpp | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowsaccessibility.cpp') diff --git a/src/plugins/platforms/windows/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/qwindowsaccessibility.cpp index 39452da71b..7434071bf3 100644 --- a/src/plugins/platforms/windows/qwindowsaccessibility.cpp +++ b/src/plugins/platforms/windows/qwindowsaccessibility.cpp @@ -1203,28 +1203,14 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::GetWindow(HWND *phwnd) if (!accessible->isValid()) return E_UNEXPECTED; - QObject *o = accessible->object(); - QWindow *window = qobject_cast(o); + QWindow *window = accessible->window(); if (!window) - window = QGuiApplication::topLevelWindows().first(); - - - Q_ASSERT(window); - if (!o || !window) return E_FAIL; - -#ifdef Q_WS_QPA - //QPlatformNativeInterface *platform = QGuiApplication::platformNativeInterface(); - //Q_ASSERT(platform); - //*phwnd = (HWND)platform->nativeResourceForWindow("handle", window); - - - return S_OK; -#else - *phwnd = static_cast(o)->effectiveWinId(); + QPlatformNativeInterface *platform = QGuiApplication::platformNativeInterface(); + Q_ASSERT(platform); + *phwnd = (HWND)platform->nativeResourceForWindow("handle", window); return S_OK; -#endif } HRESULT STDMETHODCALLTYPE QWindowsAccessible::ContextSensitiveHelp(BOOL) -- cgit v1.2.3