>From 2b250e46f64ac48a43923fc54c02c2163f1a916e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 7 Apr 2015 18:47:21 +0200 Subject: [PATCH] Fix XRC validation errors. Remove illegal elements: - and can only appear inside , not inside 80,20 - 0 + 0 @@ -438,7 +438,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 diff --git a/mec.xrc b/mec.xrc index b956435..6ee33e2 100644 --- a/mec.xrc +++ b/mec.xrc @@ -334,7 +334,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 @@ -440,7 +440,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 diff --git a/skin.xrc b/skin.xrc index 7cacab2..71204a6 100644 --- a/skin.xrc +++ b/skin.xrc @@ -337,7 +337,6 @@ wxALIGN_LEFT|wxALIGN_TOP|wxALL 2 - wxGROW|wxALL wxVERTICAL @@ -665,7 +664,6 @@ wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -784,7 +782,6 @@ wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -893,7 +890,6 @@ wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -1361,7 +1357,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 @@ -1714,7 +1710,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 @@ -2161,7 +2157,6 @@ here, but it looks weird if we don't make this look like its siblings. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL @@ -2284,7 +2279,6 @@ here, but it looks weird if we don't make this look like its siblings. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL @@ -2342,7 +2336,6 @@ here, but it looks weird if we don't make this look like its siblings. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxHORIZONTAL @@ -2556,7 +2549,6 @@ the other is perforce ignored. wxALIGN_CENTER_VERTICAL - wxALIGN_CENTER_VERTICAL wxVERTICAL @@ -2808,14 +2800,11 @@ the other is perforce ignored. 1 0 0,1,2,3 - wxGROW|wxALIGN_LEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL|wxALL - 4 wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL @@ -2860,7 +2849,6 @@ the other is perforce ignored. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL @@ -2905,7 +2893,6 @@ the other is perforce ignored. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL @@ -2961,7 +2948,6 @@ the other is perforce ignored. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL @@ -3005,14 +2991,11 @@ the other is perforce ignored. 1 0 0,1 - wxGROW|wxALIGN_RIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALL - 4 wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL @@ -3113,7 +3096,6 @@ the other is perforce ignored. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL diff --git a/skin_coli_boli.xrc b/skin_coli_boli.xrc index f7588a2..9defab2 100644 --- a/skin_coli_boli.xrc +++ b/skin_coli_boli.xrc @@ -1002,7 +1002,6 @@ 2 wxHORIZONTAL - 2 wxALIGN_TOP|wxALL @@ -1510,7 +1509,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 @@ -1863,7 +1862,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 diff --git a/skin_group_carveout.xrc b/skin_group_carveout.xrc index 8b494e9..fc57bb8 100644 --- a/skin_group_carveout.xrc +++ b/skin_group_carveout.xrc @@ -682,7 +682,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 @@ -1035,7 +1035,7 @@ It's unusual to place a checkbox's "label" on the left, as is simulated here, but it looks weird if we don't make this look like its siblings. --> 80,20 - 0 + 0 @@ -1616,7 +1616,6 @@ here, but it looks weird if we don't make this look like its siblings. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxALL wxVERTICAL @@ -2329,7 +2328,6 @@ here, but it looks weird if we don't make this look like its siblings. wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -2453,7 +2451,6 @@ here, but it looks weird if we don't make this look like its siblings. wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -2565,7 +2562,6 @@ here, but it looks weird if we don't make this look like its siblings. wxGROW|wxALL - wxGROW|wxALL wxVERTICAL diff --git a/skin_group_carveout2.xrc b/skin_group_carveout2.xrc index e552d4f..1f93c56 100644 --- a/skin_group_carveout2.xrc +++ b/skin_group_carveout2.xrc @@ -937,7 +937,6 @@ wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxALL wxVERTICAL @@ -1649,7 +1648,6 @@ wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -1773,7 +1771,6 @@ wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -1885,7 +1882,6 @@ wxGROW|wxALL - wxGROW|wxALL wxVERTICAL diff --git a/skin_reg_d.xrc b/skin_reg_d.xrc index 2e6a6c0..918c1c3 100644 --- a/skin_reg_d.xrc +++ b/skin_reg_d.xrc @@ -415,8 +415,6 @@ - Plan - 1 1 2 @@ -740,8 +738,6 @@ - Assumptions - 1 1 3 diff --git a/skin_single_premium.xrc b/skin_single_premium.xrc index b5858c9..29d3b23 100644 --- a/skin_single_premium.xrc +++ b/skin_single_premium.xrc @@ -327,7 +327,6 @@ wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -438,7 +437,6 @@ wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -559,7 +557,6 @@ appropriate input. wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -873,7 +870,6 @@ appropriate input. wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL wxVERTICAL diff --git a/skin_variable_annuity.xrc b/skin_variable_annuity.xrc index 054e1c1..a41e3d7 100644 --- a/skin_variable_annuity.xrc +++ b/skin_variable_annuity.xrc @@ -32,8 +32,6 @@ --> - Plan - 1 1 0 @@ -497,7 +495,6 @@ useful in the future. wxGROW|wxALL - wxGROW|wxALL wxVERTICAL @@ -527,7 +524,6 @@ useful in the future. wxGROW|wxALL - wxGROW|wxALL wxVERTICAL -- 2.1.0