From: Giannis Adamopoulos Date: Mon, 19 Sep 2011 12:51:42 +0000 (+0000) Subject: [uxtheme] X-Git-Tag: backups/icu4ros-bringup@60647~248 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=84ffa0b5f9c6632adf433dad45e6e403349bf59c [uxtheme] - Merge from the themes branch svn path=/trunk/; revision=53748 --- 84ffa0b5f9c6632adf433dad45e6e403349bf59c diff --cc reactos/dll/win32/uxtheme/CMakeLists.txt index 8d7631fdbdb,00000000000..ff0b7108459 mode 100644,000000..100644 --- a/reactos/dll/win32/uxtheme/CMakeLists.txt +++ b/reactos/dll/win32/uxtheme/CMakeLists.txt @@@ -1,28 -1,0 +1,31 @@@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__WINESRC__) +set_rc_compiler() + +spec2def(uxtheme.dll uxtheme.spec) + +list(APPEND SOURCE + buffer.c + draw.c + main.c + metric.c + msstyles.c ++ ncscrollbar.c ++ nonclient.c + property.c + stylemap.c + system.c ++ themehooks.c + uxini.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def) + +add_library(uxtheme SHARED ${SOURCE}) +set_module_type(uxtheme win32dll) +target_link_libraries(uxtheme wine) +add_delay_importlibs(uxtheme msimg32) +add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) +add_importlib_target(uxtheme.spec) diff --cc reactos/dll/win32/uxtheme/ncscrollbar.c index 00000000000,f8f729fd73c..f8f729fd73c mode 000000,100644..100644 --- a/reactos/dll/win32/uxtheme/ncscrollbar.c +++ b/reactos/dll/win32/uxtheme/ncscrollbar.c diff --cc reactos/dll/win32/uxtheme/ncthm.h index 00000000000,4b9e76bf5a9..4b9e76bf5a9 mode 000000,100644..100644 --- a/reactos/dll/win32/uxtheme/ncthm.h +++ b/reactos/dll/win32/uxtheme/ncthm.h diff --cc reactos/dll/win32/uxtheme/nonclient.c index 00000000000,ffcbb36d61d..ffcbb36d61d mode 000000,100644..100644 --- a/reactos/dll/win32/uxtheme/nonclient.c +++ b/reactos/dll/win32/uxtheme/nonclient.c diff --cc reactos/dll/win32/uxtheme/themehooks.c index 00000000000,94df23a4418..94df23a4418 mode 000000,100644..100644 --- a/reactos/dll/win32/uxtheme/themehooks.c +++ b/reactos/dll/win32/uxtheme/themehooks.c