[PATCH v2 1/2] uxtheme: Define a constant for default transparent colour.

[Paul Gofman]

From: Paul Gofman

---
 dlls/uxtheme/draw.c     | 7 +++----
 dlls/uxtheme/msstyles.h | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c
index 3286d70d4d1..eb400571197 100644
--- a/dlls/uxtheme/draw.c
+++ b/dlls/uxtheme/draw.c
@@ -502,7 +502,7 @@ static inline void get_transparency (HTHEME hTheme, int iPartId, int iStateId,
     if (hasImageAlpha)
     {
         *transparent = ALPHABLEND_FULL;
-        *transparentcolor = RGB (255, 0, 255);
+        *transparentcolor = DEFAULT_TRANSPARENT_COLOR;
     }
     else
     {
@@ -514,8 +514,7 @@ static inline void get_transparency (HTHEME hTheme, int iPartId, int iStateId,
             if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, 
                 glyph ? TMT_GLYPHTRANSPARENTCOLOR : TMT_TRANSPARENTCOLOR, 
                 transparentcolor))) {
-                /* If image is transparent, but no color was specified, use magenta */
-                *transparentcolor = RGB(255, 0, 255);
+                *transparentcolor = DEFAULT_TRANSPARENT_COLOR;
             }
         }
         else
@@ -1968,7 +1967,7 @@ static HRESULT create_image_bg_region(HTHEME theme, int part, int state, const R
     OffsetRect(&r, -r.left, -r.top);

if (FAILED(GetThemeColor(theme, part, state, TMT_TRANSPARENTCOLOR, &transcolour)))
-        transcolour = RGB(255, 0, 255); /* defaults to magenta */
+        transcolour = DEFAULT_TRANSPARENT_COLOR;

dc = CreateCompatibleDC(NULL);
     if (!dc) {
diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h
index b2b0e0d8f22..7de41340b86 100644
--- a/dlls/uxtheme/msstyles.h
+++ b/dlls/uxtheme/msstyles.h
@@ -27,6 +27,8 @@
 #define MAX_THEME_CLASS_NAME 60
 #define MAX_THEME_VALUE_NAME 60

+#define DEFAULT_TRANSPARENT_COLOR RGB(255, 0, 255)
+
 typedef struct _THEME_PROPERTY {
     int iPrimitiveType;
     int iPropertyId;