[desk]

- Use GdiGradientFill and GdiTransparentBlt instead of GradientFill and TransparentBlt
- Do not link to msimg32

svn path=/branches/GSoC_2011/ThemesSupport/; revision=53309

Author: yagoulas

dll/cpl/desk/CMakeLists.txt

@@ -41,7 +41,6 @@ add_importlibs(desk
     ole32
     setupapi
     shell32
-    msimg32
     kernel32
     ntdll)
 

dll/cpl/desk/background.c

@@ -649,14 +649,14 @@ DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PDATA pData)
         }
     }
 
-    TransparentBlt(draw->hDC,
-                   draw->rcItem.left, draw->rcItem.top,
-                   draw->rcItem.right-draw->rcItem.left+1,
-                   draw->rcItem.bottom-draw->rcItem.top+1,
-                   hDC,
-                   0, 0,
-                   pData->cxSource, pData->cySource,
-                   0xFF00FF);
+    GdiTransparentBlt(draw->hDC,
+                      draw->rcItem.left, draw->rcItem.top,
+                      draw->rcItem.right-draw->rcItem.left+1,
+                      draw->rcItem.bottom-draw->rcItem.top+1,
+                      hDC,
+                      0, 0,
+                      pData->cxSource, pData->cySource,
+                      0xFF00FF);
 
     SelectObject(hDC, hOldObj);
     DeleteDC(hDC);

dll/cpl/desk/desk.rbuild

@@ -13,7 +13,6 @@
 	<library>setupapi</library>
 	<library>shell32</library>
 	<library>ntdll</library>
-	<library>msimg32</library>
 	<library>uuid</library>
 	<file>advmon.c</file>
 	<file>appearance.c</file>

dll/cpl/desk/draw.c

@@ -475,7 +475,7 @@ MyDrawCaptionTemp(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon
 		vert[1].Blue = (WORD)(Colors[1]>>8) & 0xFF00;
 		vert[1].Alpha = 0;
 
-		GradientFill(hdc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H);
+		GdiGradientFill(hdc, vert, 2, &gcap, 1, GRADIENT_FILL_RECT_H);
 	}
 	else
 	{