Merge pull request #176 from rseanhall/4598

Fix doc bug 4598 while backporting some things from wix4.
wixtoolset · Nov 23, 2014 · e4fb7bf · e4fb7bf
2 parents 59d6e99 + efb023a
commit e4fb7bf
Show file tree

Hide file tree

Showing 6 changed files with 377 additions and 167 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,5 @@
+* SeanHall: WIXBUG:4598 - Fix thmutil documentation.  Also backport some thmutil features/fixes from wix4.
+
 * BobArnson: WIXBUG:4580 - Check bit mask appropriately for Burn system variables.
 
 * SamuelS: WIXFEAT:4543 - Allow Pyro to exclude empty patch transforms.

diff --git a/src/ext/SqlExtension/wixlib/SqlExtension.wixproj b/src/ext/SqlExtension/wixlib/SqlExtension.wixproj
@@ -32,8 +32,8 @@
     <EmbeddedResource Include="en-us.wxl" />
     <EmbeddedResource Include="es-es.wxl" />
     <EmbeddedResource Include="ja-jp.wxl" />
-	<EmbeddedResource Include="pt-pt.wxl" />
-	<EmbeddedResource Include="pt-br.wxl" />
+    <EmbeddedResource Include="pt-pt.wxl" />
+    <EmbeddedResource Include="pt-br.wxl" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/libs/dutil/dutil.vcxproj b/src/libs/dutil/dutil.vcxproj
@@ -54,6 +54,7 @@
     <TargetName>dutil</TargetName>
     <MultiTargetLibrary>true</MultiTargetLibrary>
   </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
   <ItemGroup>
     <ClCompile Include="acl2util.cpp" />
     <ClCompile Include="aclutil.cpp" />

diff --git a/src/libs/dutil/inc/thmutil.h b/src/libs/dutil/inc/thmutil.h
@@ -54,7 +54,9 @@ struct THEME_COLUMN
 {
     LPWSTR pszName;
     UINT uStringId;
+    int nBaseWidth;
     int nWidth;
+    BOOL fExpands;
 };
 
 
@@ -155,12 +157,16 @@ struct THEME
 {
     WORD wId;
 
+    BOOL fAutoResize;
+
     DWORD dwStyle;
     DWORD dwFontId;
     HANDLE hIcon;
     LPWSTR sczCaption;
     int nHeight;
+    int nMinimumHeight;
     int nWidth;
+    int nMinimumWidth;
     int nSourceX;
     int nSourceY;
     UINT uStringId;
@@ -248,7 +254,7 @@ DAPI_(void) ThemeUnloadControls(
     );
 
 /********************************************************************
- ThemeLocalize - Localizes all of the strings in the them.
+ ThemeLocalize - Localizes all of the strings in the theme.
 
 *******************************************************************/
 DAPI_(HRESULT) ThemeLocalize(