aboutsummaryrefslogtreecommitdiff
path: root/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-06-04 13:37:30 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-06-04 14:57:11 -0500
commit700b48c723531bfc38bab185f237d932144f3b26 (patch)
tree0a7acc65b0de9f47e6b2d2fa3a2994809cfcbfa6 /src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
parent34639850c2c07a35c1e502e174866cd8630eb8ec (diff)
downloadwix-700b48c723531bfc38bab185f237d932144f3b26.tar.gz
wix-700b48c723531bfc38bab185f237d932144f3b26.tar.bz2
wix-700b48c723531bfc38bab185f237d932144f3b26.zip
Add thmutil Image element to allow specifying multiple resolutions.
Rename previous Image element to ImageListItem. Last partial fix for #6155
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/inc/thmutil.h')
-rw-r--r--src/libs/dutil/WixToolset.DUtil/inc/thmutil.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
index c8c6b340..6ac3711f 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
@@ -110,6 +110,7 @@ struct THEME_COLUMN
110struct THEME_IMAGE_REFERENCE 110struct THEME_IMAGE_REFERENCE
111{ 111{
112 THEME_IMAGE_REFERENCE_TYPE type; 112 THEME_IMAGE_REFERENCE_TYPE type;
113 DWORD dwImageIndex;
113 DWORD dwImageInstanceIndex; 114 DWORD dwImageInstanceIndex;
114 int nX; 115 int nX;
115 int nY; 116 int nY;
@@ -122,6 +123,15 @@ struct THEME_IMAGE_INSTANCE
122 Gdiplus::Bitmap* pBitmap; 123 Gdiplus::Bitmap* pBitmap;
123}; 124};
124 125
126struct THEME_IMAGE
127{
128 LPWSTR sczId;
129 DWORD dwIndex;
130
131 DWORD cImageInstances;
132 THEME_IMAGE_INSTANCE* rgImageInstances;
133};
134
125 135
126struct THEME_TAB 136struct THEME_TAB
127{ 137{
@@ -342,6 +352,9 @@ struct THEME
342 DWORD cFonts; 352 DWORD cFonts;
343 THEME_FONT* rgFonts; 353 THEME_FONT* rgFonts;
344 354
355 DWORD cImages;
356 THEME_IMAGE* rgImages;
357
345 DWORD cStandaloneImages; 358 DWORD cStandaloneImages;
346 THEME_IMAGE_INSTANCE* rgStandaloneImages; 359 THEME_IMAGE_INSTANCE* rgStandaloneImages;
347 360
@@ -356,6 +369,7 @@ struct THEME
356 369
357 // internal state variables -- do not use outside ThmUtil.cpp 370 // internal state variables -- do not use outside ThmUtil.cpp
358 STRINGDICT_HANDLE sdhFontDictionary; 371 STRINGDICT_HANDLE sdhFontDictionary;
372 STRINGDICT_HANDLE sdhImageDictionary;
359 HWND hwndParent; // parent for loaded controls 373 HWND hwndParent; // parent for loaded controls
360 HWND hwndHover; // current hwnd hovered over 374 HWND hwndHover; // current hwnd hovered over
361 DWORD dwCurrentPageId; 375 DWORD dwCurrentPageId;