summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qwindowsurface_raster_p.h
diff options
context:
space:
mode:
authorNorwegian Rock Cat <qt-info@nokia.com>2009-07-01 10:09:48 (GMT)
committerNorwegian Rock Cat <qt-info@nokia.com>2009-07-01 10:09:48 (GMT)
commit6097501c9b324c08ae5b5c3dee3c64d385d3c5ac (patch)
treeb3ccf51aed15f9e9a94a502947d91128160123eb /src/gui/painting/qwindowsurface_raster_p.h
parent3618227de7036a091ea8187a20434470c0c792dc (diff)
parenta6e32ae1c84984041107a83db9307caffbda9849 (diff)
downloadQt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.zip
Qt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.tar.gz
Qt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/painting/qwindowsurface_raster_p.h')
-rw-r--r--src/gui/painting/qwindowsurface_raster_p.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h
index 897ed8d..996aaef 100644
--- a/src/gui/painting/qwindowsurface_raster_p.h
+++ b/src/gui/painting/qwindowsurface_raster_p.h
@@ -64,13 +64,6 @@ QT_BEGIN_NAMESPACE
#define Q_ULW_ALPHA 0x00000002 // copied from ULW_ALPHA in winuser.h
#define Q_AC_SRC_ALPHA 0x00000001 // copied from AC_SRC_ALPHA in winuser.h
-struct Q_BLENDFUNCTION {
- BYTE BlendOp;
- BYTE BlendFlags;
- BYTE SourceConstantAlpha;
- BYTE AlphaFormat;
-};
-
struct Q_UPDATELAYEREDWINDOWINFO {
DWORD cbSize;
HDC hdcDst;
@@ -79,12 +72,16 @@ struct Q_UPDATELAYEREDWINDOWINFO {
HDC hdcSrc;
const POINT *pptSrc;
COLORREF crKey;
- const Q_BLENDFUNCTION *pblend;
+ const BLENDFUNCTION *pblend;
DWORD dwFlags;
const RECT *prcDirty;
};
+typedef BOOL (WINAPI *PtrUpdateLayeredWindow)(HWND hwnd, HDC hdcDst, const POINT *pptDst,
+ const SIZE *psize, HDC hdcSrc, const POINT *pptSrc, COLORREF crKey,
+ const BLENDFUNCTION *pblend, DWORD dwflags);
typedef BOOL (WINAPI *PtrUpdateLayeredWindowIndirect)(HWND hwnd, const Q_UPDATELAYEREDWINDOWINFO *pULWInfo);
+extern PtrUpdateLayeredWindow ptrUpdateLayeredWindow;
extern PtrUpdateLayeredWindowIndirect ptrUpdateLayeredWindowIndirect;
#endif