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/container | |
parent | 05808fb8b011c760a2af6dd520b781447db4a0ba (diff) | |
parent | 7c5d5ab0d6ab20f0052dedddcd7df5eb1d5eaa3d (diff) | |
download | qtactiveqt-7477c86107ac0f5d344b380b38118c3a90f994a7.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I51bb4162845894f4757a0d0dc40e2c04af546f06
Diffstat (limited to 'src/activeqt/container')
-rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 22febc9..2dd4c31 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -1779,6 +1779,8 @@ void QAxHostWidget::focusOutEvent(QFocusEvent *e) axhost->m_spInPlaceObject->UIDeactivate(); } +Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0); +Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); void QAxHostWidget::paintEvent(QPaintEvent*) { @@ -1797,7 +1799,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*) QPixmap pm(qaxNativeWidgetSize(this)); pm.fill(); - HBITMAP hBmp = qaxPixmapToWinHBITMAP(pm); + HBITMAP hBmp = qt_pixmapToWinHBITMAP(pm); HDC hBmp_hdc = CreateCompatibleDC(qt_win_display_dc()); HGDIOBJ old_hBmp = SelectObject(hBmp_hdc, hBmp); @@ -1811,7 +1813,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*) view->Release(); QPainter painter(this); - QPixmap pixmap = qaxPixmapFromWinHBITMAP(hBmp); + QPixmap pixmap = qt_pixmapFromWinHBITMAP(hBmp); pixmap.setDevicePixelRatio(devicePixelRatioF()); painter.drawPixmap(0, 0, pixmap); |