diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-22 16:10:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 09:56:09 +0200 |
| commit | 7e1a12d07d936d99d5d6d163e3d8b9bb1f52c115 (patch) | |
| tree | 5066106f17ae199bc09943895ba05967d4269d68 /src | |
| parent | 5bfeab8749ce6820d55135b81665a7231d3b1504 (diff) | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsaccessibility.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
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<QWindow*>(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<QWidget*>(o)->effectiveWinId(); + QPlatformNativeInterface *platform = QGuiApplication::platformNativeInterface(); + Q_ASSERT(platform); + *phwnd = (HWND)platform->nativeResourceForWindow("handle", window); return S_OK; -#endif } HRESULT STDMETHODCALLTYPE QWindowsAccessible::ContextSensitiveHelp(BOOL) |