src/gui: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support

Also - Make winPeekMessage() & winPostMessage() obsolete
     - FlashWindowEx, IsValidLanguageGroup functions no longer resolved
       dynamically (available on >= Windows 2000)
     - LoadIcon/LoadCursor -> LoadImage w/LR_SHARED for system
       icons/cursors
     - qsystemtrayicon_win: use Shell_NotifyIconGetRect if available
       (Windows 7)

Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>

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