>From 26bae60346733d7f89d1618a1993a099235b0b31 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 8 Apr 2015 17:52:16 +0200 Subject: [PATCH 6/8] Fix incorrect uses of wxGROW in XRC. With the latest versions of wxWidgets, it is possible to combine wxGROW with alignment flags for wx(Flex)GridSizer elements (for the older versions, the alignment is ignored if wxGROW is also specified and so nothing changes for them), so use this to make elements such as wxTextCtrl and InputSequenceEntry expand only horizontally, but not vertically, as this is not needed for them and looks bad. Also remove wxGROW and replace it with alignment flags for the elements for which it was inappropriate as they don't expand anyhow, e.g. wxStaticText or wxCheckBox. --- gpt.xrc | 8 ++--- mec.xrc | 8 ++--- policy_view.xrc | 86 +++++++++++++++++++++++------------------------ skin.xrc | 24 ++++++------- skin_coli_boli.xrc | 22 ++++++------ skin_group_carveout.xrc | 26 +++++++------- skin_group_carveout2.xrc | 28 +++++++-------- skin_reg_d.xrc | 8 ++--- skin_single_premium.xrc | 10 +++--- skin_variable_annuity.xrc | 34 +++++++++---------- 10 files changed, 127 insertions(+), 127 deletions(-) diff --git a/gpt.xrc b/gpt.xrc index a8332ef..9da6f89 100644 --- a/gpt.xrc +++ b/gpt.xrc @@ -852,7 +852,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 External 1035 exchange amount @@ -883,7 +883,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 Internal 1035 exchange amount @@ -914,7 +914,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 Payment @@ -929,7 +929,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 Decrement to 7702(f)(1) 'premiums paid' diff --git a/mec.xrc b/mec.xrc index 00d5e87..df33a15 100644 --- a/mec.xrc +++ b/mec.xrc @@ -605,7 +605,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 External 1035 exchange amount @@ -636,7 +636,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 Internal 1035 exchange amount @@ -667,7 +667,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 Payment @@ -682,7 +682,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 7702A "benefit" (either specified amount or death benefit) diff --git a/policy_view.xrc b/policy_view.xrc index af817c1..8f5e86b 100644 --- a/policy_view.xrc +++ b/policy_view.xrc @@ -59,7 +59,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -70,7 +70,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -81,7 +81,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -92,7 +92,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -103,7 +103,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -114,7 +114,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -125,7 +125,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -136,7 +136,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -147,7 +147,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -158,7 +158,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -169,7 +169,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -180,7 +180,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -191,7 +191,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -202,7 +202,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -213,7 +213,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -224,7 +224,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -235,7 +235,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -246,7 +246,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -257,7 +257,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -268,7 +268,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -279,7 +279,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -290,7 +290,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -301,7 +301,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -322,7 +322,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -333,7 +333,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -344,7 +344,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -355,7 +355,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -366,7 +366,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -377,7 +377,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -388,7 +388,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -399,7 +399,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -410,7 +410,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -421,7 +421,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -432,7 +432,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -443,7 +443,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -454,7 +454,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -465,7 +465,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -476,7 +476,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -487,7 +487,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -498,7 +498,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -509,7 +509,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -520,7 +520,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 @@ -531,7 +531,7 @@ - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL 160,-1 diff --git a/skin.xrc b/skin.xrc index 4660a7b..a0f1399 100644 --- a/skin.xrc +++ b/skin.xrc @@ -2367,7 +2367,7 @@ the other is perforce ignored. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 First-year lump-sum payment other than 1035 exchange @@ -2403,7 +2403,7 @@ the other is perforce ignored. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 External 1035 exchange amount @@ -2411,7 +2411,7 @@ the other is perforce ignored. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 Internal 1035 exchange amount @@ -2426,7 +2426,7 @@ the other is perforce ignored. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 Tax basis for external 1035 exchange @@ -2434,7 +2434,7 @@ the other is perforce ignored. - wxGROW|wxLEFT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT 4 Tax basis for internal 1035 exchange @@ -2574,7 +2574,7 @@ the other is perforce ignored. - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL Investment management fee for custom fund @@ -2604,7 +2604,7 @@ the other is perforce ignored. - wxGROW + wxGROW|wxALIGN_CENTER_VERTICAL Cash-value enhancement rate Cash-value enhancement rate (negative surrender charge) @@ -2619,7 +2619,7 @@ the other is perforce ignored. - wxGROW + wxALIGN_LEFT 8 Use current general-account declared rate @@ -2644,7 +2644,7 @@ the other is perforce ignored. 1 0 - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 8 General-account interest rate @@ -2677,7 +2677,7 @@ the other is perforce ignored. 1 0 - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 8 Separate-account interest rate @@ -2710,7 +2710,7 @@ the other is perforce ignored. 1 0 - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 8 Loan interest rate @@ -2740,7 +2740,7 @@ the other is perforce ignored. 0 0 - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL Switch withdrawals to loans after tax basis has been recovered diff --git a/skin_coli_boli.xrc b/skin_coli_boli.xrc index aba0523..88a378f 100644 --- a/skin_coli_boli.xrc +++ b/skin_coli_boli.xrc @@ -541,7 +541,7 @@ - wxGROW|wxALL + wxALIGN_CENTER|wxALL 4 Use experience rating (composite only)--available only with both partial mortality and month-by-month @@ -550,7 +550,7 @@ - wxGROW|wxALL + wxALIGN_CENTER|wxALL 4 Override experience-rating reserve rate @@ -564,14 +564,14 @@ 2 2 - wxGROW|wxTOP|wxRIGHT + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 4 - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 2 Experience-rating reserve rate @@ -579,14 +579,14 @@ - wxGROW|wxTOP|wxRIGHT + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT 4 - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 2 Initial k factor for experience rating @@ -933,7 +933,7 @@ - wxGROW|wxLEFT|wxTOP|wxBOTTOM + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM 4 Date of birth @@ -1138,7 +1138,7 @@ - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 2 Corporation name @@ -2794,7 +2794,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxTOP|wxLEFT + wxALIGN_LEFT|wxTOP|wxLEFT 8 Use current general-account declared rate @@ -2823,7 +2823,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxTOP|wxBOTTOM + wxGROW|wxALIGN_BOTTOM|wxTOP|wxBOTTOM 4 General-account interest rate @@ -3124,7 +3124,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxLEFT|wxRIGHT|wxTOP + wxALIGN_RIGHT|wxLEFT|wxRIGHT|wxTOP 0 -1,20 diff --git a/skin_group_carveout.xrc b/skin_group_carveout.xrc index 4210c5d..2944f55 100644 --- a/skin_group_carveout.xrc +++ b/skin_group_carveout.xrc @@ -154,7 +154,7 @@ - wxGROW|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 4 Let individuals enroll after their retirement @@ -163,7 +163,7 @@ - wxGROW|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 4 Set effective date to current date @@ -176,7 +176,7 @@ 1 - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 @@ -198,7 +198,7 @@ 1 - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 @@ -429,7 +429,7 @@ - wxGROW|wxLEFT|wxTOP|wxBOTTOM + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM 4 Date of birth @@ -460,7 +460,7 @@ - wxGROW + wxALIGN_RIGHT Insurance age on date of retirement 50,-1 @@ -477,14 +477,14 @@ 1 1 - wxGROW|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 2 Substandard table rating @@ -2087,14 +2087,14 @@ here, but it looks weird if we don't make this look like its siblings. 0 1 - wxALIGN_LEFT|wxALIGN_TOP|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxTOP|wxLEFT + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT 8 Use current general-account declared rate @@ -2123,7 +2123,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 2 General-account interest rate @@ -2222,7 +2222,7 @@ here, but it looks weird if we don't make this look like its siblings. 0 0,1,2,3 - wxGROW|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 4 Accidental death benefit @@ -2231,7 +2231,7 @@ here, but it looks weird if we don't make this look like its siblings. - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 4 Waiver diff --git a/skin_group_carveout2.xrc b/skin_group_carveout2.xrc index e3bca57..d70c02f 100644 --- a/skin_group_carveout2.xrc +++ b/skin_group_carveout2.xrc @@ -130,7 +130,7 @@ - wxGROW|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 4 Let individuals enroll after their retirement @@ -139,7 +139,7 @@ - wxGROW|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 4 Set effective date to current date @@ -152,14 +152,14 @@ 1 - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW + wxALIGN_CENTER_VERTICAL|wxALL 4 Effective date @@ -174,7 +174,7 @@ 1 - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 @@ -411,7 +411,7 @@ - wxGROW|wxLEFT|wxTOP|wxBOTTOM + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM 4 Date of birth @@ -436,13 +436,13 @@ 1 - wxALIGN_RIGHT|wxALL + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL - wxGROW + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL Insurance age on date of retirement 50,-1 @@ -459,14 +459,14 @@ 1 1 - wxGROW|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 4 - wxGROW|wxALL + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 2 Substandard table rating @@ -1414,7 +1414,7 @@ - wxGROW|wxTOP|wxLEFT + wxALIGN_LEFT|wxTOP|wxLEFT 8 Use current general-account declared rate @@ -1443,7 +1443,7 @@ - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 2 General-account interest rate @@ -1542,7 +1542,7 @@ 0 0,1,2,3 - wxGROW|wxALL + wxALIGN_LEFT|wxALL 4 Accidental death benefit @@ -1551,7 +1551,7 @@ - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 4 Waiver diff --git a/skin_reg_d.xrc b/skin_reg_d.xrc index a33e640..d0bba67 100644 --- a/skin_reg_d.xrc +++ b/skin_reg_d.xrc @@ -136,7 +136,7 @@ - wxGROW|wxLEFT|wxTOP|wxBOTTOM + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM 4 Date of birth @@ -216,7 +216,7 @@ - wxGROW|wxALL + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 4 Underwriting class @@ -1029,7 +1029,7 @@ - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 4 Investment management fee for custom fund @@ -2200,7 +2200,7 @@ 0 0 - wxGROW | wxALL + wxGROW|wxALL 4 diff --git a/skin_single_premium.xrc b/skin_single_premium.xrc index b30bb5a..42d96ce 100644 --- a/skin_single_premium.xrc +++ b/skin_single_premium.xrc @@ -778,7 +778,7 @@ appropriate input. - wxGROW|wxLEFT|wxTOP|wxBOTTOM + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM 4 Date of birth @@ -826,7 +826,7 @@ appropriate input. - wxGROW|wxALL + wxALIGN_RIGHT|wxALL 2 Substandard table rating @@ -834,14 +834,14 @@ appropriate input. - wxALIGN_RIGHT|wxALL + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxALL + wxGROW|wxALIGN_CENTER_VERTICAL|wxALL 2 Annual flat extra per thousand @@ -970,7 +970,7 @@ appropriate input. - wxGROW|wxALL + wxALIGN_LEFT|wxALL 8 Use current general-account declared rate diff --git a/skin_variable_annuity.xrc b/skin_variable_annuity.xrc index d4d6364..b38ce82 100644 --- a/skin_variable_annuity.xrc +++ b/skin_variable_annuity.xrc @@ -114,7 +114,7 @@ useful in the future. - wxGROW|wxALL + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 2 State that approves policy form and rate filing, and governs everything else except premium tax @@ -130,7 +130,7 @@ useful in the future. - wxGROW|wxALL + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 2 State to which premium tax is paid--affects premium load if the tax is passed through @@ -141,7 +141,7 @@ useful in the future. - wxGROW|wxALL + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL 2 Set effective date to current date @@ -348,14 +348,14 @@ useful in the future. 2 1 - wxGROW|wxALL + wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxLEFT|wxRIGHT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 2 Individual payment amount @@ -363,14 +363,14 @@ useful in the future. - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxLEFT|wxRIGHT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 2 Individual payment mode @@ -393,14 +393,14 @@ useful in the future. 2 1 - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxLEFT|wxRIGHT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 2 Additional premium load @@ -408,14 +408,14 @@ useful in the future. - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxLEFT|wxRIGHT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 2 Additional separate-account asset charge @@ -437,14 +437,14 @@ useful in the future. 2 1 - wxGROW|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT 2 - wxGROW|wxLEFT|wxRIGHT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 2 Separate-account interest rate @@ -452,14 +452,14 @@ useful in the future. - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxLEFT|wxRIGHT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 2 Withdrawal amount @@ -467,14 +467,14 @@ useful in the future. - wxGROW|wxALL + wxALIGN_CENTER_VERTICAL|wxALL 2 - wxGROW|wxLEFT|wxRIGHT + wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 2 Freeform comments -- 2.1.0