[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lmi] patch to fix asserts for invalid growable column/row indices w
|
From: |
Vaclav Slavik |
|
Subject: |
Re: [lmi] patch to fix asserts for invalid growable column/row indices with latest wx svn |
|
Date: |
Sun, 03 May 2009 14:31:34 +0200 |
On Sun, 2009-03-01 at 14:09 +0000, Greg Chicares wrote:
> > really complicates the debugging and, besides, even if these invalid
> > indices are mostly harmless, it still seems wrong to use them. I did my
> > best to ensure that the patch doesn't change anything and only removes the
> > invalid indices.
>
> We have five other skins as well.
Below is a patch to fix the other skins too (together with newly added
bugs in skin.xrc that I found thanks to wx2.9's XRC errors reporting).
Also included is a patch that updates namespace and XRC version of LMI's
XRC files to current values (no deprecated features of XRC format were
used by LMI, so no other changes were needed).
Vaclav
==== Patch to fix the namespace ====
=== modified file 'menus.xrc'
--- menus.xrc 2009-01-12 18:55:18 +0000
+++ menus.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Life insurance illustrations: wxWindows xml resources.
=== modified file 'policy_view.xrc'
--- policy_view.xrc 2008-12-27 02:57:00 +0000
+++ policy_view.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml resources for policy editor.
=== modified file 'preferences_view.xrc'
--- preferences_view.xrc 2008-12-27 02:57:00 +0000
+++ preferences_view.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml resources for user preferences.
=== modified file 'rounding_view.xrc'
--- rounding_view.xrc 2008-12-27 02:57:00 +0000
+++ rounding_view.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml resources for rounding rules editor.
=== modified file 'skin.xrc'
--- skin.xrc 2009-03-26 09:19:40 +0000
+++ skin.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml input-notebook resources.
=== modified file 'skin_coli_boli.xrc'
--- skin_coli_boli.xrc 2009-03-20 13:42:23 +0000
+++ skin_coli_boli.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml input-notebook resources.
=== modified file 'skin_group_carveout.xrc'
--- skin_group_carveout.xrc 2009-03-20 13:42:23 +0000
+++ skin_group_carveout.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml input-notebook resources.
=== modified file 'skin_group_carveout2.xrc'
--- skin_group_carveout2.xrc 2009-04-24 15:49:33 +0000
+++ skin_group_carveout2.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml input-notebook resources.
=== modified file 'skin_reg_d.xrc'
--- skin_reg_d.xrc 2009-03-20 13:42:23 +0000
+++ skin_reg_d.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml input-notebook resources.
=== modified file 'skin_single_premium.xrc'
--- skin_single_premium.xrc 2008-12-27 02:57:00 +0000
+++ skin_single_premium.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml input-notebook resources.
=== modified file 'skin_variable_annuity.xrc'
--- skin_variable_annuity.xrc 2008-12-27 02:57:00 +0000
+++ skin_variable_annuity.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Let me illustrate...: wxWindows xml input-notebook resources.
=== modified file 'toolbar.xrc'
--- toolbar.xrc 2008-12-27 02:57:00 +0000
+++ toolbar.xrc 2009-05-03 07:19:56 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<resource xmlns="http://www.wxwindows.org/wxxrc"; version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc"; version="2.5.3.0">
<!--
Life insurance illustrations: wxWindows xml resources.
==== Patch to fix XRC errors ====
=== modified file 'skin.xrc'
--- skin.xrc 2009-05-03 07:19:56 +0000
+++ skin.xrc 2009-05-03 12:05:38 +0000
@@ -2669,7 +2669,6 @@
<border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<border>4</border>
@@ -2715,7 +2714,6 @@
<border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<border>4</border>
=== modified file 'skin_coli_boli.xrc'
--- skin_coli_boli.xrc 2009-05-03 07:19:56 +0000
+++ skin_coli_boli.xrc 2009-05-03 12:05:38 +0000
@@ -34,7 +34,7 @@
<object class="wxPanel" name="plan_panel">
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>2</rows>
+ <growablecols>1</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxALL</flag>
@@ -75,8 +75,7 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>0</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_BOTTOM|wxALL</flag>
@@ -115,9 +114,8 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>1</rows>
<growablecols>0</growablecols>
- <growablerows>1,2,3,4</growablerows>
+ <growablerows>1,2</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
@@ -172,7 +170,7 @@
<cols>1</cols>
<rows>2</rows>
<growablecols>0</growablecols>
- <growablerows>0,1,2,3,4</growablerows>
+ <growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxTOP</flag>
<border>4</border>
@@ -484,7 +482,7 @@
<object class="wxFlexGridSizer">
<cols>0</cols>
<rows>1</rows>
- <growablecols>4</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxGROW|wxALL</flag>
<border>4</border>
@@ -718,9 +716,8 @@
<flag>wxGROW|wxALL</flag>
<border>2</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>1,3,5</growablecols>
+ <growablecols>1</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
@@ -741,9 +738,8 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>1,3,9</growablecols>
+ <growablecols>1,3</growablecols>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
@@ -808,9 +804,8 @@
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>1,5</growablecols>
+ <growablecols>1</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
@@ -933,7 +928,7 @@
<cols>0</cols>
<rows>1</rows>
<growablecols>0</growablecols>
- <growablerows>0,1</growablerows>
+ <growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_TOP|wxALL</flag>
<border>4</border>
@@ -1012,9 +1007,8 @@
<flag>wxGROW|wxALL</flag>
<border>2</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>0,1,2,3</growablecols>
+ <growablecols>0,1,2</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
<border>2</border>
@@ -1104,7 +1098,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxGROW|wxALL</flag>
<border>2</border>
@@ -1132,9 +1126,8 @@
<flag>wxGROW|wxALIGN_TOP</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>1,3,7,9</growablecols>
+ <growablecols>1,3,7</growablecols>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
@@ -1202,7 +1195,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>3</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxALL</flag>
<border>4</border>
@@ -1232,9 +1225,8 @@
<flag>wxGROW|wxALL</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>1,3,7,9</growablecols>
+ <growablecols>1,3,7</growablecols>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
@@ -1299,9 +1291,8 @@
<flag>wxGROW|wxALL</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>1,3,5</growablecols>
+ <growablecols>1,3</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
@@ -1848,7 +1839,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -1927,7 +1918,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -1989,7 +1980,7 @@
<cols>1</cols>
<rows>0</rows>
<growablecols>0</growablecols>
- <growablerows>0,1,2</growablerows>
+ <growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxALL</flag>
<border>2</border>
@@ -2011,8 +2002,7 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>2</rows>
- <growablecols>0,1,2</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxGROW|wxALL</flag>
<border>2</border>
@@ -2064,7 +2054,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -2166,7 +2156,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
@@ -2225,7 +2215,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>3</cols>
- <rows>2</rows>
<growablecols>1,2</growablecols>
<growablerows>0,1,2,3,4</growablerows>
<object class="sizeritem">
@@ -2436,10 +2425,7 @@
<flag>wxALIGN_TOP|wxLEFT|wxRIGHT|wxBOTTOM</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>0</growablecols>
- <growablerows>2</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxLEFT|wxBOTTOM</flag>
<border>4</border>
@@ -2568,9 +2554,9 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>2</rows>
+ <rows>3</rows>
<growablecols>0</growablecols>
- <growablerows>1</growablerows>
+ <growablerows>2</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
<border>4</border>
@@ -2705,7 +2691,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -2842,9 +2828,9 @@
<flag>wxGROW|wxALL</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
+ <cols>1</cols>
<rows>3</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0,1,2</growablerows>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_TOP</flag>
=== modified file 'skin_group_carveout.xrc'
--- skin_group_carveout.xrc 2009-05-03 07:19:56 +0000
+++ skin_group_carveout.xrc 2009-05-03 12:05:38 +0000
@@ -34,7 +34,6 @@
<object class="wxPanel" name="plan_panel">
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>2</rows>
<growablerows>0</growablerows>
<growablecols>1</growablecols>
<object class="sizeritem">
@@ -68,7 +67,7 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <growablerows>0,1</growablerows>
+ <growablerows>0</growablerows>
<growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxLEFT|wxTOP|wxBOTTOM</flag>
@@ -76,7 +75,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<growablerows>0,1</growablerows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
@@ -239,7 +238,7 @@
<flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablecols>0,1,2,3</growablecols>
+ <growablecols>0,1,2</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -364,8 +363,7 @@
<border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablerows>1</growablerows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<border>4</border>
<flag>wxGROW|wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -393,7 +391,6 @@
<border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablerows>1</growablerows>
<growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_LEFT|wxALL</flag>
@@ -924,7 +921,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -1003,7 +999,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -1068,9 +1063,8 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>0</rows>
<growablecols>0</growablecols>
- <growablerows>0,1,2</growablerows>
+ <growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxLEFT|wxRIGHT</flag>
<border>2</border>
@@ -1091,7 +1085,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1,2</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxGROW|wxALL</flag>
<border>2</border>
@@ -1143,7 +1137,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -1267,7 +1260,7 @@
<object class="wxFlexGridSizer">
<cols>2</cols>
<rows>2</rows>
- <growablecols>1,2</growablecols>
+ <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
@@ -1315,7 +1308,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<growablecols>0</growablecols>
- <growablerows>0,1,2,3,4</growablerows>
+ <growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
@@ -1383,7 +1376,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>3</cols>
- <rows>2</rows>
<growablecols>1,2</growablecols>
<growablerows>0,1,2,3,4</growablerows>
<object class="sizeritem">
@@ -1641,7 +1633,6 @@
<cols>0</cols>
<rows>1</rows>
<growablecols>0</growablecols>
- <growablerows>2</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxLEFT|wxBOTTOM</flag>
<border>4</border>
@@ -1770,7 +1761,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>2</rows>
<growablecols>0</growablecols>
<growablerows>1</growablerows>
<object class="sizeritem">
@@ -1847,7 +1837,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -2261,7 +2251,6 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <growablecols>1,3</growablecols>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
=== modified file 'skin_group_carveout2.xrc'
--- skin_group_carveout2.xrc 2009-05-03 07:19:56 +0000
+++ skin_group_carveout2.xrc 2009-05-03 12:05:38 +0000
@@ -42,7 +42,7 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <growablerows>0,1</growablerows>
+ <growablerows>0</growablerows>
<growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxLEFT|wxTOP|wxBOTTOM</flag>
@@ -50,7 +50,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<growablerows>0,1</growablerows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
@@ -219,7 +219,7 @@
<flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablecols>0,1,2,3</growablecols>
+ <growablecols>0,1,2</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -344,8 +344,7 @@
<border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablerows>1</growablerows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<border>4</border>
<flag>wxGROW|wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -373,7 +372,6 @@
<border>2</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablerows>1</growablerows>
<growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_LEFT|wxALL</flag>
@@ -475,7 +473,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -554,7 +551,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -619,9 +615,8 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>0</rows>
<growablecols>0</growablecols>
- <growablerows>0,1,2</growablerows>
+ <growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxLEFT|wxRIGHT</flag>
<border>2</border>
@@ -642,7 +637,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1,2</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxGROW|wxALL</flag>
<border>2</border>
@@ -694,7 +689,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -818,7 +812,7 @@
<object class="wxFlexGridSizer">
<cols>2</cols>
<rows>2</rows>
- <growablecols>1,2</growablecols>
+ <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
@@ -866,7 +860,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<growablecols>0</growablecols>
- <growablerows>0,1,2,3,4</growablerows>
+ <growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
@@ -934,7 +928,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>3</cols>
- <rows>2</rows>
<growablecols>1,2</growablecols>
<growablerows>0,1,2,3,4</growablerows>
<object class="sizeritem">
@@ -1189,10 +1182,8 @@
<flag>wxALIGN_TOP|wxLEFT|wxRIGHT|wxBOTTOM</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
<growablecols>0</growablecols>
- <growablerows>2</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxLEFT|wxBOTTOM</flag>
<border>4</border>
@@ -1321,7 +1312,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>2</rows>
<growablecols>0</growablecols>
<growablerows>1</growablerows>
<object class="sizeritem">
@@ -1398,7 +1388,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -1812,7 +1802,6 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <growablecols>1,3</growablecols>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
=== modified file 'skin_reg_d.xrc'
--- skin_reg_d.xrc 2009-05-03 07:19:56 +0000
+++ skin_reg_d.xrc 2009-05-03 12:05:38 +0000
@@ -283,7 +283,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>3</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxALL</flag>
<border>2</border>
@@ -313,9 +313,8 @@
<flag>wxGROW|wxALL</flag>
<border>2</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>1,3,7,9</growablecols>
+ <growablecols>1,3,7</growablecols>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
@@ -380,9 +379,8 @@
<flag>wxGROW|wxALL</flag>
<border>2</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>1,3,5</growablecols>
+ <growablecols>1,3</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
@@ -422,15 +420,14 @@
<cols>1</cols>
<rows>2</rows>
<growablecols>0</growablecols>
- <growablerows>0,1,2,3</growablerows>
+ <growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
<growablecols>1,2</growablecols>
- <growablerows>0,1</growablerows>
+ <growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxGROW|wxLEFT|wxTOP</flag>
<border>4</border>
@@ -865,7 +862,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>3</cols>
- <rows>2</rows>
<growablecols>1,2</growablecols>
<growablerows>0,1,2,3,4</growablerows>
<object class="sizeritem">
@@ -1067,7 +1063,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -1174,7 +1170,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -1253,7 +1248,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -1318,9 +1312,8 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>0</rows>
<growablecols>0</growablecols>
- <growablerows>0,1,2</growablerows>
+ <growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_TOP|wxLEFT|wxRIGHT</flag>
<border>2</border>
@@ -1341,7 +1334,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1,2</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxGROW|wxALL</flag>
<border>2</border>
@@ -1393,7 +1386,6 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>1</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_BOTTOM|wxBOTTOM</flag>
@@ -1458,7 +1450,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>2</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>2</border>
@@ -1563,9 +1555,8 @@
<border>15</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>2</rows>
<growablecols>1</growablecols>
-
<growablerows>0,1,2,3,4,5,6,7,8,9,10,11</growablerows>
+
<growablerows>0,1,2,3,4,5,6,7</growablerows>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT</flag>
<border>4</border>
@@ -1698,7 +1689,7 @@
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>0</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxLEFT|wxRIGHT</flag>
<border>2</border>
@@ -1709,7 +1700,6 @@
<border>17</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>1</rows>
<growablecols>1</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
@@ -1810,7 +1800,6 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>1</rows>
<growablecols>1</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
@@ -1865,7 +1854,6 @@
<border>15</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>1</rows>
<growablecols>1</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
=== modified file 'skin_single_premium.xrc'
--- skin_single_premium.xrc 2009-05-03 07:19:56 +0000
+++ skin_single_premium.xrc 2009-05-03 12:05:38 +0000
@@ -33,7 +33,7 @@
<object class="wxPanel" name="plan_panel">
<object class="wxFlexGridSizer">
<rows>2</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
@@ -132,7 +132,7 @@
<flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0,1,2</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -202,7 +202,7 @@
<flag>wxGROW|wxALL</flag>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0,1</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALL</flag>
@@ -563,7 +563,7 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <growablecols>1,3</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
@@ -725,7 +725,7 @@
<flag>wxGROW|wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <growablecols>0,1,2,3</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_LEFT|wxALIGN_TOP|wxALL</flag>
@@ -856,7 +856,7 @@
<border>4</border>
<object class="wxFlexGridSizer">
<rows>1</rows>
- <growablecols>0,1,2</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
=== modified file 'skin_variable_annuity.xrc'
--- skin_variable_annuity.xrc 2009-05-03 07:19:56 +0000
+++ skin_variable_annuity.xrc 2009-05-03 12:05:38 +0000
@@ -36,7 +36,6 @@
<centered>1</centered>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <rows>2</rows>
<growablecols>0</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
@@ -46,7 +45,7 @@
<cols>3</cols>
<rows>0</rows>
<growablecols>0,1,2</growablecols>
- <growablerows>0,1</growablerows>
+ <growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxLEFT|wxTOP</flag>
<object class="wxFlexGridSizer">
@@ -219,9 +218,8 @@
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT</flag>
<border>4</border>
<object class="wxFlexGridSizer">
- <cols>0</cols>
<rows>1</rows>
- <growablecols>0,1</growablecols>
+ <growablecols>0</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
@@ -232,9 +230,8 @@
<flag>wxGROW</flag>
<object class="wxFlexGridSizer">
<cols>3</cols>
- <rows>2</rows>
<growablecols>1,2</growablecols>
- <growablerows>0,1,2,3,4</growablerows>
+ <growablerows>0,1,2,3</growablerows>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>4</border>
@@ -341,7 +338,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>1</rows>
<growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_RIGHT|wxALL</flag>
@@ -385,7 +381,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>1</rows>
<growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
@@ -428,7 +423,6 @@
<border>4</border>
<object class="wxFlexGridSizer">
<cols>2</cols>
- <rows>1</rows>
<growablecols>1</growablecols>
<object class="sizeritem">
<flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT</flag>
@@ -530,7 +524,7 @@
<border>2</border>
<object class="wxFlexGridSizer">
<cols>1</cols>
- <growablecols>1,3</growablecols>
+ <growablecols>0</growablecols>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM</flag>
<border>4</border>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [lmi] patch to fix asserts for invalid growable column/row indices with latest wx svn,
Vaclav Slavik <=