>From eafa8e6ec9f16e1fe23e427c42ea11a32c1c0706 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Apr 2015 17:09:10 +0200 Subject: [PATCH 2/8] Remove invalid alignment flags from box sizers in XRC files. Remove vertical/horizontal alignment flags from in vertical/horizontal box sizers as they are simply ignored. Also remove horizontal/vertical alignment flags from the sizer items using wxGROW flag as it overrides alignment anyhow. --- skin.xrc | 8 +++----- skin_coli_boli.xrc | 8 ++++---- skin_group_carveout.xrc | 8 ++++---- skin_group_carveout2.xrc | 8 ++++---- skin_reg_d.xrc | 6 +++--- skin_single_premium.xrc | 2 +- skin_variable_annuity.xrc | 8 ++++---- 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/skin.xrc b/skin.xrc index 71204a6..4b6e9fd 100644 --- a/skin.xrc +++ b/skin.xrc @@ -2160,7 +2160,7 @@ here, but it looks weird if we don't make this look like its siblings. wxVERTICAL - wxGROW|wxALIGN_CENTER_VERTICAL|wxALL + wxGROW|wxALL 4 1 @@ -2282,7 +2282,7 @@ here, but it looks weird if we don't make this look like its siblings. wxVERTICAL - wxGROW|wxALIGN_CENTER_VERTICAL|wxALL + wxGROW|wxALL 4 1 @@ -2339,7 +2339,7 @@ here, but it looks weird if we don't make this look like its siblings. wxHORIZONTAL - wxGROW|wxALIGN_CENTER_VERTICAL|wxALL + wxGROW|wxALL 4 3 @@ -2552,7 +2552,6 @@ the other is perforce ignored. wxVERTICAL - wxALIGN_CENTER_VERTICAL Fund allocation @@ -2564,7 +2563,6 @@ the other is perforce ignored. - wxALIGN_CENTER_VERTICAL 1 1 diff --git a/skin_coli_boli.xrc b/skin_coli_boli.xrc index 9defab2..cc46fa8 100644 --- a/skin_coli_boli.xrc +++ b/skin_coli_boli.xrc @@ -373,7 +373,7 @@ - wxALIGN_LEFT|wxALIGN_TOP|wxLEFT|wxTOP + wxALIGN_LEFT|wxLEFT|wxTOP 2 Include this individual in any group composite @@ -517,7 +517,7 @@ wxHORIZONTAL - wxALIGN_LEFT|wxALL + wxALL 4 Use partial mortality (for group composite only) @@ -526,7 +526,7 @@ - wxALIGN_LEFT + wxALL 4 Partial mortality table @@ -3368,7 +3368,7 @@ here, but it looks weird if we don't make this look like its siblings. wxVERTICAL - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 2 2 diff --git a/skin_group_carveout.xrc b/skin_group_carveout.xrc index fc57bb8..2fa6d0f 100644 --- a/skin_group_carveout.xrc +++ b/skin_group_carveout.xrc @@ -143,7 +143,7 @@ - wxALIGN_LEFT|wxALIGN_TOP|wxLEFT|wxTOP + wxALIGN_LEFT|wxLEFT|wxTOP 2 Include this individual in any group composite @@ -392,7 +392,7 @@ wxVERTICAL - wxGROW|wxALIGN_LEFT|wxALL + wxGROW|wxALL 2 0 @@ -1619,7 +1619,7 @@ here, but it looks weird if we don't make this look like its siblings. wxVERTICAL - wxGROW|wxALIGN_CENTER_VERTICAL|wxALL + wxGROW|wxALL 4 1 @@ -2692,7 +2692,7 @@ here, but it looks weird if we don't make this look like its siblings. wxVERTICAL - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 2 2 diff --git a/skin_group_carveout2.xrc b/skin_group_carveout2.xrc index 1f93c56..a0008bc 100644 --- a/skin_group_carveout2.xrc +++ b/skin_group_carveout2.xrc @@ -119,7 +119,7 @@ - wxALIGN_LEFT|wxALIGN_TOP|wxLEFT|wxTOP + wxALIGN_LEFT|wxLEFT|wxTOP 2 Include this individual in any group composite @@ -374,7 +374,7 @@ wxVERTICAL - wxGROW|wxALIGN_LEFT|wxALL + wxGROW|wxALL 2 0 @@ -940,7 +940,7 @@ wxVERTICAL - wxGROW|wxALIGN_CENTER_VERTICAL|wxALL + wxGROW|wxALL 4 1 @@ -2012,7 +2012,7 @@ wxVERTICAL - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 2 2 diff --git a/skin_reg_d.xrc b/skin_reg_d.xrc index 918c1c3..bac551d 100644 --- a/skin_reg_d.xrc +++ b/skin_reg_d.xrc @@ -1550,7 +1550,7 @@ wxVERTICAL - wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT + wxGROW|wxRIGHT 4 2 @@ -1695,7 +1695,7 @@ wxVERTICAL - wxGROW|wxALIGN_CENTER_VERTICAL|wxALL + wxGROW|wxALL 2 2 @@ -1984,7 +1984,7 @@ wxVERTICAL - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 2 2 diff --git a/skin_single_premium.xrc b/skin_single_premium.xrc index 29d3b23..9bb07b6 100644 --- a/skin_single_premium.xrc +++ b/skin_single_premium.xrc @@ -873,7 +873,7 @@ appropriate input. wxVERTICAL - wxGROW|wxALIGN_CENTER_VERTICAL|wxALL + wxGROW|wxALL 4 3 diff --git a/skin_variable_annuity.xrc b/skin_variable_annuity.xrc index a41e3d7..2c3a59e 100644 --- a/skin_variable_annuity.xrc +++ b/skin_variable_annuity.xrc @@ -342,7 +342,7 @@ useful in the future. wxVERTICAL - wxGROW|wxALIGN_RIGHT|wxALL + wxGROW|wxALL 4 2 @@ -387,7 +387,7 @@ useful in the future. wxVERTICAL - wxGROW|wxALIGN_RIGHT|wxALL + wxGROW|wxALL 4 2 @@ -431,7 +431,7 @@ useful in the future. wxVERTICAL - wxGROW|wxALIGN_RIGHT|wxALL + wxGROW|wxALL 4 2 @@ -653,7 +653,7 @@ useful in the future. wxVERTICAL - wxALIGN_CENTER_VERTICAL|wxALL + wxALL 2 2 -- 2.1.0