diff options
author | Rob Mensching <rob@firegiant.com> | 2020-01-24 15:27:20 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2020-02-05 16:15:47 -0800 |
commit | 6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d (patch) | |
tree | c717333cd10d5592e59dfb898b391275bba1f389 /src/WixToolset.Core/Compiler_UI.cs | |
parent | 6e2e67ab55c75f4655397588c0dcc64f50d22f92 (diff) | |
download | wix-6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d.tar.gz wix-6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d.tar.bz2 wix-6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d.zip |
Start on new patch infrastructure
Diffstat (limited to 'src/WixToolset.Core/Compiler_UI.cs')
-rw-r--r-- | src/WixToolset.Core/Compiler_UI.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs index 30bb7ab6..8a425fd4 100644 --- a/src/WixToolset.Core/Compiler_UI.cs +++ b/src/WixToolset.Core/Compiler_UI.cs | |||
@@ -470,7 +470,7 @@ namespace WixToolset.Core | |||
470 | string defaultControl = null; | 470 | string defaultControl = null; |
471 | string cancelControl = null; | 471 | string cancelControl = null; |
472 | 472 | ||
473 | this.ParseControlElement(child, id.Id, TupleDefinitionType.BBControl, ref lastTabRow, ref firstControl, ref defaultControl, ref cancelControl, false); | 473 | this.ParseControlElement(child, id.Id, TupleDefinitionType.BBControl, ref lastTabRow, ref firstControl, ref defaultControl, ref cancelControl); |
474 | break; | 474 | break; |
475 | default: | 475 | default: |
476 | this.Core.UnexpectedElement(node, child); | 476 | this.Core.UnexpectedElement(node, child); |
@@ -966,7 +966,7 @@ namespace WixToolset.Core | |||
966 | switch (child.Name.LocalName) | 966 | switch (child.Name.LocalName) |
967 | { | 967 | { |
968 | case "Control": | 968 | case "Control": |
969 | this.ParseControlElement(child, id.Id, TupleDefinitionType.Control, ref lastTabRow, ref firstControl, ref defaultControl, ref cancelControl, trackDiskSpace); | 969 | this.ParseControlElement(child, id.Id, TupleDefinitionType.Control, ref lastTabRow, ref firstControl, ref defaultControl, ref cancelControl); |
970 | break; | 970 | break; |
971 | default: | 971 | default: |
972 | this.Core.UnexpectedElement(node, child); | 972 | this.Core.UnexpectedElement(node, child); |
@@ -1032,7 +1032,7 @@ namespace WixToolset.Core | |||
1032 | /// <param name="defaultControl">Name of the default control.</param> | 1032 | /// <param name="defaultControl">Name of the default control.</param> |
1033 | /// <param name="cancelControl">Name of the candle control.</param> | 1033 | /// <param name="cancelControl">Name of the candle control.</param> |
1034 | /// <param name="trackDiskSpace">True if the containing dialog tracks disk space.</param> | 1034 | /// <param name="trackDiskSpace">True if the containing dialog tracks disk space.</param> |
1035 | private void ParseControlElement(XElement node, string dialog, TupleDefinitionType tupleType, ref IntermediateTuple lastTabTuple, ref string firstControl, ref string defaultControl, ref string cancelControl, bool trackDiskSpace) | 1035 | private void ParseControlElement(XElement node, string dialog, TupleDefinitionType tupleType, ref IntermediateTuple lastTabTuple, ref string firstControl, ref string defaultControl, ref string cancelControl) |
1036 | { | 1036 | { |
1037 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 1037 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
1038 | Identifier controlId = null; | 1038 | Identifier controlId = null; |