From: Zhiyi Zhang zzhang@codeweavers.com
--- dlls/comctl32/hotkey.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index a3a8a8ce6b4..1a4e5cf9cc7 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -38,7 +38,9 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" +#if __WINE_COMCTL32_VERSION == 6 #include "uxtheme.h" +#endif #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(hotkey); @@ -424,6 +426,7 @@ HOTKEY_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) return DefWindowProcW (infoPtr->hwndSelf, WM_NCCREATE, 0, (LPARAM)lpcs); }
+#if __WINE_COMCTL32_VERSION == 6 static LRESULT HOTKEY_NCPaint (HWND hwnd, HRGN region) { @@ -467,6 +470,7 @@ HOTKEY_NCPaint (HWND hwnd, HRGN region) DeleteObject(clipRgn); return 0; } +#endif
static LRESULT HOTKEY_SetFocus (HOTKEY_INFO *infoPtr) @@ -568,8 +572,10 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NCCREATE: return HOTKEY_NCCreate (hwnd, (LPCREATESTRUCTW)lParam);
+#if __WINE_COMCTL32_VERSION == 6 case WM_NCPAINT: return HOTKEY_NCPaint (hwnd, (HRGN)wParam); +#endif
case WM_PRINTCLIENT: case WM_PAINT: