diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:31:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:31:23 +0100 |
| commit | 7477c86107ac0f5d344b380b38118c3a90f994a7 (patch) | |
| tree | dfab513c73345083f9ff7cf41438a530cb78cb8a /src/activeqt/control/qaxserverbase.cpp | |
| parent | 05808fb8b011c760a2af6dd520b781447db4a0ba (diff) | |
| parent | 7c5d5ab0d6ab20f0052dedddcd7df5eb1d5eaa3d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I51bb4162845894f4757a0d0dc40e2c04af546f06
Diffstat (limited to 'src/activeqt/control/qaxserverbase.cpp')
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index d6af214..b131e76 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -3097,6 +3097,8 @@ HRESULT WINAPI QAxServerBase::Save(LPCOLESTR fileName, BOOL fRemember) return E_FAIL; } +Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0); + //**** IViewObject /* Draws the widget into the provided device context. @@ -3135,7 +3137,7 @@ HRESULT WINAPI QAxServerBase::Draw(DWORD dwAspect, LONG /* lindex */, void * /* ::LPtoDP(hicTargetDev, (LPPOINT)&rc, 2); const QPixmap pm = qt.widget->grab(); - HBITMAP hbm = qaxPixmapToWinHBITMAP(pm); + HBITMAP hbm = qt_pixmapToWinHBITMAP(pm); HDC hdc = CreateCompatibleDC(0); SelectObject(hdc, hbm); ::StretchBlt(hdcDraw, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, hdc, 0, 0,pm.width(), pm.height(), SRCCOPY); |