diff options
Diffstat (limited to '')
-rw-r--r-- | src/WixToolset.Core/Compiler_UI.cs | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs index 5c2400e4..5066ff1a 100644 --- a/src/WixToolset.Core/Compiler_UI.cs +++ b/src/WixToolset.Core/Compiler_UI.cs | |||
@@ -700,11 +700,6 @@ namespace WixToolset.Core | |||
700 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Action")); | 700 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Action")); |
701 | } | 701 | } |
702 | 702 | ||
703 | if (null == message) | ||
704 | { | ||
705 | message = Common.GetInnerText(node); | ||
706 | } | ||
707 | |||
708 | this.Core.ParseForExtensionElements(node); | 703 | this.Core.ParseForExtensionElements(node); |
709 | 704 | ||
710 | if (!this.Core.EncounteredError) | 705 | if (!this.Core.EncounteredError) |
@@ -751,11 +746,6 @@ namespace WixToolset.Core | |||
751 | } | 746 | } |
752 | } | 747 | } |
753 | 748 | ||
754 | if (null == text) | ||
755 | { | ||
756 | text = Common.GetInnerText(node); | ||
757 | } | ||
758 | |||
759 | if (null == id) | 749 | if (null == id) |
760 | { | 750 | { |
761 | id = this.Core.CreateIdentifier("txt", text); | 751 | id = this.Core.CreateIdentifier("txt", text); |
@@ -1270,26 +1260,6 @@ namespace WixToolset.Core | |||
1270 | this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, iconSizeValue, "16", "32", "48")); | 1260 | this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, iconSizeValue, "16", "32", "48")); |
1271 | break; | 1261 | break; |
1272 | } | 1262 | } |
1273 | //if (0 < iconSizeValue.Length) | ||
1274 | //{ | ||
1275 | // var iconsSizeType = Wix.Control.ParseIconSizeType(iconSizeValue); | ||
1276 | // switch (iconsSizeType) | ||
1277 | // { | ||
1278 | // case Wix.Control.IconSizeType.Item16: | ||
1279 | // this.Core.TrySetBitFromName(specialAttributes, "Icon16", YesNoType.Yes, bits, 16); | ||
1280 | // break; | ||
1281 | // case Wix.Control.IconSizeType.Item32: | ||
1282 | // this.Core.TrySetBitFromName(specialAttributes, "Icon32", YesNoType.Yes, bits, 16); | ||
1283 | // break; | ||
1284 | // case Wix.Control.IconSizeType.Item48: | ||
1285 | // this.Core.TrySetBitFromName(specialAttributes, "Icon16", YesNoType.Yes, bits, 16); | ||
1286 | // this.Core.TrySetBitFromName(specialAttributes, "Icon32", YesNoType.Yes, bits, 16); | ||
1287 | // break; | ||
1288 | // default: | ||
1289 | // this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, iconSizeValue, "16", "32", "48")); | ||
1290 | // break; | ||
1291 | // } | ||
1292 | //} | ||
1293 | } | 1263 | } |
1294 | else | 1264 | else |
1295 | { | 1265 | { |
@@ -1411,9 +1381,6 @@ namespace WixToolset.Core | |||
1411 | case "ComboBox": | 1381 | case "ComboBox": |
1412 | this.ParseControlGroupElement(child, TupleDefinitionType.ComboBox, "ListItem"); | 1382 | this.ParseControlGroupElement(child, TupleDefinitionType.ComboBox, "ListItem"); |
1413 | break; | 1383 | break; |
1414 | case "Condition": | ||
1415 | this.ParseConditionElement(child, node.Name.LocalName, controlId.Id, dialog); | ||
1416 | break; | ||
1417 | case "ListBox": | 1384 | case "ListBox": |
1418 | this.ParseControlGroupElement(child, TupleDefinitionType.ListBox, "ListItem"); | 1385 | this.ParseControlGroupElement(child, TupleDefinitionType.ListBox, "ListItem"); |
1419 | break; | 1386 | break; |
@@ -1456,11 +1423,6 @@ namespace WixToolset.Core | |||
1456 | } | 1423 | } |
1457 | } | 1424 | } |
1458 | 1425 | ||
1459 | if (null == text) | ||
1460 | { | ||
1461 | text = Common.GetInnerText(child); | ||
1462 | } | ||
1463 | |||
1464 | if (!String.IsNullOrEmpty(text) && null != sourceFile) | 1426 | if (!String.IsNullOrEmpty(text) && null != sourceFile) |
1465 | { | 1427 | { |
1466 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(childSourceLineNumbers, child.Name.LocalName, "SourceFile", "Text")); | 1428 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(childSourceLineNumbers, child.Name.LocalName, "SourceFile", "Text")); |
@@ -1728,11 +1690,6 @@ namespace WixToolset.Core | |||
1728 | } | 1690 | } |
1729 | } | 1691 | } |
1730 | 1692 | ||
1731 | if (null == condition) | ||
1732 | { | ||
1733 | condition = this.Core.GetConditionInnerText(node); | ||
1734 | } | ||
1735 | |||
1736 | if (null == control) | 1693 | if (null == control) |
1737 | { | 1694 | { |
1738 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control")); | 1695 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control")); |