summaryrefslogtreecommitdiffstats
path: root/src/activeqt/container/qaxwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/activeqt/container/qaxwidget.cpp')
-rw-r--r--src/activeqt/container/qaxwidget.cpp68
1 files changed, 46 insertions, 22 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 800bc8d..b5fbeec 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -39,6 +39,7 @@
****************************************************************************/
#include "qaxwidget.h"
+#include "../shared/qaxutils_p.h"
#ifndef QT_NO_WIN_ACTIVEQT
@@ -191,7 +192,10 @@ public:
return OLE_E_NOT_INPLACEACTIVE;
RECT rcPos = { host->x(), host->y(), host->x()+host->width(), host->y()+host->height() };
- return m_spOleObject->DoVerb(index, 0, this, 0, host->winId(), &rcPos);
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
+ return m_spOleObject->DoVerb(index, 0, this, 0,
+ hwndForWidget(host),
+ &rcPos);
}
// IUnknown
@@ -486,14 +490,16 @@ bool axc_FilterProc(void *m)
QAxWidget *ax = 0;
QAxHostWidget *host = 0;
while (!host && hwnd) {
- QWidget *widget = QWidget::find(hwnd);
+ // FIXME: 4.10.2011: Does this still work?
+ QWidget *widget = QWidget::find(reinterpret_cast<WId>(hwnd));
if (widget && widget->inherits("QAxHostWidget"))
host = qobject_cast<QAxHostWidget*>(widget);
hwnd = ::GetParent(hwnd);
}
if (host)
ax = qobject_cast<QAxWidget*>(host->parentWidget());
- if (ax && msg->hwnd != host->winId()) {
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
+ if (ax && msg->hwnd != hwndForWidget(host)) {
if (message >= WM_KEYFIRST && message <= WM_KEYLAST) {
QAxClientSite *site = host->clientSite();
site->eventTranslated = true; // reset in QAxClientSite::TranslateAccelerator
@@ -702,7 +708,10 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
RECT rcPos = { host->x(), host->y(), host->x()+sizehint.width(), host->y()+sizehint.height() };
- hr = m_spOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, 0, (IOleClientSite*)this, 0, host->winId(), &rcPos);
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
+ hr = m_spOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, 0, (IOleClientSite*)this, 0,
+ hwndForWidget(host),
+ &rcPos);
if (!m_spOleControl)
m_spOleObject->QueryInterface(IID_IOleControl, (void**)&m_spOleControl);
@@ -1009,7 +1018,8 @@ HRESULT WINAPI QAxClientSite::TranslateAccelerator(LPMSG lpMsg, DWORD /*grfModif
// if the request is coming from an out-of-proc server or a non ActiveQt server,
// we send the message to the host window. This will make sure this key event
// comes to Qt for processing.
- SendMessage(host->winId(), lpMsg->message, lpMsg->wParam, lpMsg->lParam);
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
+ SendMessage(hwndForWidget(host), lpMsg->message, lpMsg->wParam, lpMsg->lParam);
if (ActiveQtDetected && !fromInProcServer) {
// ActiveQt based servers will need further processing of the event
// (eg. <SPACE> key for a checkbox), so we return false.
@@ -1044,7 +1054,7 @@ HRESULT WINAPI QAxClientSite::GetWindow(HWND *phwnd)
if (!phwnd)
return E_POINTER;
- *phwnd = host->winId();
+ *phwnd = hwndForWidget(host);
return S_OK;
}
@@ -1097,17 +1107,20 @@ HRESULT WINAPI QAxClientSite::GetWindowContext(IOleInPlaceFrame **ppFrame, IOleI
if (!ppFrame || !ppDoc || !lprcPosRect || !lprcClipRect || !lpFrameInfo)
return E_POINTER;
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
QueryInterface(IID_IOleInPlaceFrame, (void**)ppFrame);
QueryInterface(IID_IOleInPlaceUIWindow, (void**)ppDoc);
- ::GetClientRect(host->winId(), lprcPosRect);
- ::GetClientRect(host->winId(), lprcClipRect);
+ const HWND hwnd = hwndForWidget(host);
+ ::GetClientRect(hwnd, lprcPosRect);
+ ::GetClientRect(hwnd, lprcClipRect);
lpFrameInfo->cb = sizeof(OLEINPLACEFRAMEINFO);
lpFrameInfo->fMDIApp = false;
lpFrameInfo->haccel = 0;
lpFrameInfo->cAccelEntries = 0;
- lpFrameInfo->hwndFrame = widget ? widget->window()->winId() : 0;
+ // FIXME: 4.10.2011: Parent's HWND required, should work.
+ lpFrameInfo->hwndFrame = widget ? hwnd : 0;
return S_OK;
}
@@ -1386,7 +1399,8 @@ HRESULT WINAPI QAxClientSite::SetMenu(HMENU hmenuShared, HOLEMENU holemenu, HWND
menuItemMap.clear();
}
- OleSetMenuDescriptor(holemenu, widget ? widget->window()->winId() : 0, m_menuOwner, this, m_spInPlaceActiveObject);
+ // FIXME: 4.10.2011: Parent's HWND required, should work.
+ OleSetMenuDescriptor(holemenu, widget ? hwndForWidget(widget) : 0, m_menuOwner, this, m_spInPlaceActiveObject);
return S_OK;
#endif
}
@@ -1443,7 +1457,8 @@ extern Q_GUI_EXPORT bool qt_win_ignoreNextMouseReleaseEvent;
HRESULT WINAPI QAxClientSite::EnableModeless(BOOL fEnable)
{
- EnableWindow(host->window()->winId(), fEnable);
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
+ EnableWindow(hwndForWidget(host), fEnable);
if (!fEnable) {
if (!QApplicationPrivate::isBlockedByModal(host))
@@ -1452,7 +1467,8 @@ HRESULT WINAPI QAxClientSite::EnableModeless(BOOL fEnable)
if (QApplicationPrivate::isBlockedByModal(host))
QApplicationPrivate::leaveModal(host);
}
- qt_win_ignoreNextMouseReleaseEvent = false;
+ // FIXME 4.10.2011: No longer exists in Lighthouse.
+ // qt_win_ignoreNextMouseReleaseEvent = false;
return S_OK;
}
@@ -1588,8 +1604,9 @@ HRESULT WINAPI QAxClientSite::ActivateMe(IOleDocumentView *pViewToActivate)
m_spActiveView->UIActivate(TRUE);
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
RECT rect;
- GetClientRect(widget->winId(), &rect);
+ GetClientRect(hwndForWidget(widget), &rect);
m_spActiveView->SetRect(&rect);
m_spActiveView->Show(TRUE);
@@ -1686,7 +1703,7 @@ void QAxHostWidget::resizeObject()
// document server - talk to view?
if (axhost->m_spActiveView) {
RECT rect;
- GetClientRect(winId(), &rect);
+ GetClientRect(hwndForWidget(this), &rect);
axhost->m_spActiveView->SetRect(&rect);
return;
@@ -1716,6 +1733,7 @@ void QAxHostWidget::showEvent(QShowEvent *)
bool QAxHostWidget::winEvent(MSG *msg, long *result)
{
+ // FIXME: 4.10.2011: no longer implemented
if (axhost && axhost->inPlaceObjectWindowless) {
Q_ASSERT(axhost->m_spInPlaceObject);
IOleInPlaceObjectWindowless *windowless = (IOleInPlaceObjectWindowless*)axhost->m_spInPlaceObject;
@@ -1725,7 +1743,8 @@ bool QAxHostWidget::winEvent(MSG *msg, long *result)
if (hres == S_OK)
return true;
}
- return QWidget::winEvent(msg, result);
+ // QWidget::winEvent(msg, result);
+ return false;
}
bool QAxHostWidget::event(QEvent *e)
@@ -1736,14 +1755,18 @@ bool QAxHostWidget::event(QEvent *e)
killTimer(setFocusTimer);
setFocusTimer = 0;
RECT rcPos = { x(), y(), x()+size().width(), y()+size().height() };
- axhost->m_spOleObject->DoVerb(OLEIVERB_UIACTIVATE, 0, (IOleClientSite*)axhost, 0, winId(), &rcPos);
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
+ axhost->m_spOleObject->DoVerb(OLEIVERB_UIACTIVATE, 0, (IOleClientSite*)axhost, 0,
+ hwndForWidget(this),
+ &rcPos);
if (axhost->m_spActiveView)
axhost->m_spActiveView->UIActivate(TRUE);
}
break;
case QEvent::WindowBlocked:
- if (IsWindowEnabled(winId())) {
- EnableWindow(winId(), false);
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
+ if (IsWindowEnabled(hwndForWidget(this))) {
+ EnableWindow(hwndForWidget(this), false);
if (axhost && axhost->m_spInPlaceActiveObject) {
axhost->inPlaceModelessEnabled = false;
axhost->m_spInPlaceActiveObject->EnableModeless(false);
@@ -1751,8 +1774,9 @@ bool QAxHostWidget::event(QEvent *e)
}
break;
case QEvent::WindowUnblocked:
- if (!IsWindowEnabled(winId())) {
- EnableWindow(winId(), true);
+ // FIXME: 4.10.2011 Does this work with the parent's HWND?
+ if (!IsWindowEnabled(hwndForWidget(this))) {
+ EnableWindow(hwndForWidget(this), true);
if (axhost && axhost->m_spInPlaceActiveObject) {
axhost->inPlaceModelessEnabled = true;
axhost->m_spInPlaceActiveObject->EnableModeless(true);
@@ -1826,7 +1850,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
QPixmap pm(size());
pm.fill();
- HBITMAP hBmp = pm.toWinHBITMAP();
+ HBITMAP hBmp = qaxPixmapToWinHBITMAP(pm);
HDC hBmp_hdc = CreateCompatibleDC(qt_win_display_dc());
HGDIOBJ old_hBmp = SelectObject(hBmp_hdc, hBmp);
@@ -1840,7 +1864,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
view->Release();
QPainter painter(this);
- painter.drawPixmap(0, 0, QPixmap::fromWinHBITMAP(hBmp));
+ painter.drawPixmap(0, 0, qaxPixmapFromWinHBITMAP(hBmp));
SelectObject(hBmp_hdc, old_hBmp);
DeleteObject(hBmp);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 17:16:11 +0000