[CALC] Explicitly link against comctl32. Patch by Carlo Bramini. CORE-10727

svn path=/trunk/; revision=74976

diff --git a/reactos/base/applications/calc/CMakeLists.txt b/reactos/base/applications/calc/CMakeLists.txt
index 31560ba..2d0d605 100644 (file)
--- a/reactos/base/applications/calc/CMakeLists.txt
+++ b/reactos/base/applications/calc/CMakeLists.txt
@@ -13,7 +13,7 @@ file(GLOB calc_rc_deps res/*.*)
 add_rc_deps(resource.rc ${calc_rc_deps})
 add_executable(calc ${SOURCE} resource.rc)
 set_module_type(calc win32gui UNICODE)
-add_importlibs(calc advapi32 user32 shell32 gdi32 msvcrt kernel32)
+add_importlibs(calc advapi32 comctl32 user32 shell32 gdi32 msvcrt kernel32)
 
 if(MSVC)
     add_importlibs(calc ntdll)

diff --git a/reactos/base/applications/calc/winmain.c b/reactos/base/applications/calc/winmain.c
index ca44d45..3f49a54 100644 (file)
--- a/reactos/base/applications/calc/winmain.c
+++ b/reactos/base/applications/calc/winmain.c
@@ -4,6 +4,7 @@
 #include <wingdi.h>
 #include <winreg.h>
 #include <shellapi.h>
+#include <commctrl.h>
 
 #define HTMLHELP_PATH(_pt)  TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt)
 
@@ -1785,6 +1786,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
     MSG msg;
     DWORD dwLayout;
 
+    InitCommonControls();
+
     calc.hInstance = hInstance;
 
     calc.x_coord = -1;