aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler_UI.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Compiler_UI.cs')
-rw-r--r--src/WixToolset.Core/Compiler_UI.cs10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs
index 5cc9b5a0..d712ec91 100644
--- a/src/WixToolset.Core/Compiler_UI.cs
+++ b/src/WixToolset.Core/Compiler_UI.cs
@@ -700,8 +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 this.Core.VerifyNoInnerText(sourceLineNumbers, node);
704
705 this.Core.ParseForExtensionElements(node); 703 this.Core.ParseForExtensionElements(node);
706 704
707 if (!this.Core.EncounteredError) 705 if (!this.Core.EncounteredError)
@@ -748,8 +746,6 @@ namespace WixToolset.Core
748 } 746 }
749 } 747 }
750 748
751 this.Core.VerifyNoInnerText(sourceLineNumbers, node);
752
753 if (null == id) 749 if (null == id)
754 { 750 {
755 id = this.Core.CreateIdentifier("txt", text); 751 id = this.Core.CreateIdentifier("txt", text);
@@ -1425,7 +1421,7 @@ namespace WixToolset.Core
1425 } 1421 }
1426 } 1422 }
1427 1423
1428 this.Core.VerifyNoInnerText(sourceLineNumbers, node); 1424 this.Core.InnerTextDisallowed(child);
1429 1425
1430 if (!String.IsNullOrEmpty(text) && null != sourceFile) 1426 if (!String.IsNullOrEmpty(text) && null != sourceFile)
1431 { 1427 {
@@ -1443,6 +1439,8 @@ namespace WixToolset.Core
1443 } 1439 }
1444 } 1440 }
1445 1441
1442 this.Core.InnerTextDisallowed(node);
1443
1446 // If the radio buttons have icons, then we need to add the icon attribute. 1444 // If the radio buttons have icons, then we need to add the icon attribute.
1447 switch (radioButtonsType) 1445 switch (radioButtonsType)
1448 { 1446 {
@@ -1694,8 +1692,6 @@ namespace WixToolset.Core
1694 } 1692 }
1695 } 1693 }
1696 1694
1697 this.Core.VerifyNoInnerText(sourceLineNumbers, node);
1698
1699 if (null == control) 1695 if (null == control)
1700 { 1696 {
1701 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control")); 1697 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control"));