From: Zhiyi Zhang zzhang@codeweavers.com
--- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/comctl32.h | 2 ++ dlls/comctl32/commctrl.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index d041f09cf32..a89ed5136ed 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_COMCTL32_ -D__WINE_COMCTL32_VERSION=5 MODULE = comctl32.dll IMPORTLIB = comctl32 IMPORTS = uuid user32 gdi32 advapi32 imm32 kernelbase oleaut32 -DELAYIMPORTS = oleacc winmm uxtheme +DELAYIMPORTS = oleacc winmm
SOURCES = \ animate.c \ diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index ca68906be62..a3b683d4410 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -34,9 +34,11 @@ #include "winuser.h" #include "winnls.h" #include "commctrl.h" +#if __WINE_COMCTL32_VERSION == 6 #include "uxtheme.h" #include "vsstyle.h" #include "vssym32.h" +#endif
extern HMODULE COMCTL32_hModule; extern HBRUSH COMCTL32_hPattern55AABrush; diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 2aa31ca47f2..9bf342ea800 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -3209,5 +3209,9 @@ LRESULT COMCTL32_NCPaint(HWND hwnd, WPARAM wp, LPARAM lp, const WCHAR *theme_cla
BOOL COMCTL32_IsThemed(HWND hwnd) { +#if __WINE_COMCTL32_VERSION == 6 return !!GetWindowTheme(hwnd); +#else + return FALSE; +#endif }