Outline and line spacing can now be reset via the UI; format dialog layout improvements

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd
index 82b5a5ff9e5eea8223ce70eeb087d2ba68617edd..3df8163d19aefffaed69391c09412ab5307f8e90 100644 (file)
--- a/src/richtext/richtextdialogs.pjd
+++ b/src/richtext/richtextdialogs.pjd
@@ -3067,7 +3067,6 @@
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>

                         <string name="proxy-type">"wbStaticTextProxy"</string>
                         <string name="proxy-Id name">"wxID_STATIC"</string>
                         <long name="proxy-Id value">5105</long>
                         <string name="proxy-type">"wbStaticTextProxy"</string>
                         <string name="proxy-Id name">"wxID_STATIC"</string>
                         <long name="proxy-Id value">5105</long>


@@ -3130,115 +3129,87 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>

-                        <string name="title">"wxBoxSizer H"</string>
+                        <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT"</string>

                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>

-                        <string name="icon-name">"sizer"</string>
+                        <string name="icon-name">"textctrl"</string>

                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>
-                        <string name="proxy-type">"wbBoxSizerProxy"</string>
-                        <string name="proxy-Orientation">"Horizontal"</string>
-                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-type">"wbTextCtrlProxy"</string>
+                        <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated"</string>
+                        <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT"</string>
+                        <long name="proxy-Id value">10103</long>
+                        <string name="proxy-Name">""</string>
+                        <string name="proxy-Class">"wxTextCtrl"</string>
+                        <string name="proxy-Base class">"wxTextCtrl"</string>
+                        <bool name="proxy-External implementation">1</bool>
+                        <bool name="proxy-Separate files">0</bool>
+                        <string name="proxy-Implementation filename">""</string>
+                        <string name="proxy-Header filename">""</string>
+                        <string name="proxy-Member variable name">"m_indentLeft"</string>
+                        <string name="proxy-Initial value">""</string>
+                        <long name="proxy-Max length">0</long>
+                        <string name="proxy-Help text">"The left indent."</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxTE_MULTILINE">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                        <bool name="proxy-wxTE_PASSWORD">0</bool>
+                        <bool name="proxy-wxTE_READONLY">0</bool>
+                        <bool name="proxy-wxTE_RICH">0</bool>
+                        <bool name="proxy-wxTE_RICH2">0</bool>
+                        <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                        <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                        <bool name="proxy-wxTE_LEFT">0</bool>
+                        <bool name="proxy-wxTE_CENTRE">0</bool>
+                        <bool name="proxy-wxTE_RIGHT">0</bool>
+                        <bool name="proxy-wxHSCROLL">0</bool>
+                        <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                        <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                        <bool name="proxy-wxTE_CAPITALIZE">0</bool>
+                        <bool name="proxy-wxNO_BORDER">0</bool>
+                        <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                        <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                        <bool name="proxy-wxBORDER_THEME">0</bool>
+                        <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                        <bool name="proxy-wxRAISED_BORDER">0</bool>
+                        <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">50</long>
+                        <long name="proxy-Height">-1</long>

                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>

-                        <bool name="proxy-wxLEFT">0</bool>
-                        <bool name="proxy-wxRIGHT">0</bool>
-                        <bool name="proxy-wxTOP">0</bool>
-                        <bool name="proxy-wxBOTTOM">0</bool>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>

                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <document>
-                          <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT"</string>
-                          <string name="type">"dialog-control-document"</string>
-                          <string name="filename">""</string>
-                          <string name="icon-name">"textctrl"</string>
-                          <long name="is-transient">0</long>
-                          <long name="owns-file">1</long>
-                          <long name="title-mode">0</long>
-                          <long name="locked">0</long>
-                          <string name="created">"3/10/2006"</string>
-                          <string name="proxy-type">"wbTextCtrlProxy"</string>
-                          <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT"</string>
-                          <long name="proxy-Id value">10103</long>
-                          <string name="proxy-Name">""</string>
-                          <string name="proxy-Class">"wxTextCtrl"</string>
-                          <string name="proxy-Base class">"wxTextCtrl"</string>
-                          <bool name="proxy-External implementation">1</bool>
-                          <bool name="proxy-Separate files">0</bool>
-                          <string name="proxy-Implementation filename">""</string>
-                          <string name="proxy-Header filename">""</string>
-                          <string name="proxy-Member variable name">"m_indentLeft"</string>
-                          <string name="proxy-Initial value">""</string>
-                          <long name="proxy-Max length">0</long>
-                          <string name="proxy-Help text">"The left indent."</string>
-                          <string name="proxy-Tooltip text">""</string>
-                          <string name="proxy-Background colour">""</string>
-                          <string name="proxy-Foreground colour">""</string>
-                          <string name="proxy-Font">""</string>
-                          <bool name="proxy-Hidden">0</bool>
-                          <bool name="proxy-Enabled">1</bool>
-                          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                          <string name="proxy-Data variable">""</string>
-                          <string name="proxy-Data validator">""</string>
-                          <string name="proxy-Data source">""</string>
-                          <string name="proxy-Data class name">""</string>
-                          <string name="proxy-Data class implementation filename">""</string>
-                          <string name="proxy-Data class header filename">""</string>
-                          <string name="proxy-Data class manager window">""</string>
-                          <bool name="proxy-wxTE_MULTILINE">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                          <bool name="proxy-wxTE_PASSWORD">0</bool>
-                          <bool name="proxy-wxTE_READONLY">0</bool>
-                          <bool name="proxy-wxTE_RICH">0</bool>
-                          <bool name="proxy-wxTE_RICH2">0</bool>
-                          <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                          <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                          <bool name="proxy-wxTE_LEFT">0</bool>
-                          <bool name="proxy-wxTE_CENTRE">0</bool>
-                          <bool name="proxy-wxTE_RIGHT">0</bool>
-                          <bool name="proxy-wxHSCROLL">0</bool>
-                          <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                          <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                          <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                          <bool name="proxy-wxNO_BORDER">0</bool>
-                          <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                          <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                          <bool name="proxy-wxBORDER_THEME">0</bool>
-                          <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                          <bool name="proxy-wxRAISED_BORDER">0</bool>
-                          <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                          <bool name="proxy-wxWANTS_CHARS">0</bool>
-                          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                          <string name="proxy-Custom styles">""</string>
-                          <long name="proxy-X">-1</long>
-                          <long name="proxy-Y">-1</long>
-                          <long name="proxy-Width">50</long>
-                          <long name="proxy-Height">-1</long>
-                          <string name="proxy-AlignH">"Centre"</string>
-                          <string name="proxy-AlignV">"Centre"</string>
-                          <long name="proxy-Stretch factor">1</long>
-                          <long name="proxy-Border">5</long>
-                          <bool name="proxy-wxLEFT">1</bool>
-                          <bool name="proxy-wxRIGHT">1</bool>
-                          <bool name="proxy-wxTOP">1</bool>
-                          <bool name="proxy-wxBOTTOM">1</bool>
-                          <bool name="proxy-wxSHAPED">0</bool>
-                          <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                          <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                          <string name="proxy-Custom arguments">""</string>
-                          <string name="proxy-Custom ctor arguments">""</string>
-                          <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                        </document>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>

                       </document>
                       <document>
                         <string name="title">"wxStaticText: wxID_STATIC"</string>
                       </document>
                       <document>
                         <string name="title">"wxStaticText: wxID_STATIC"</string>


@@ -3249,7 +3220,6 @@
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>

                         <string name="proxy-type">"wbStaticTextProxy"</string>
                         <string name="proxy-Id name">"wxID_STATIC"</string>
                         <long name="proxy-Id value">5105</long>
                         <string name="proxy-type">"wbStaticTextProxy"</string>
                         <string name="proxy-Id name">"wxID_STATIC"</string>
                         <long name="proxy-Id value">5105</long>


@@ -3312,140 +3282,29 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>

-                        <string name="title">"wxBoxSizer H"</string>
-                        <string name="type">"dialog-control-document"</string>
-                        <string name="filename">""</string>
-                        <string name="icon-name">"sizer"</string>
-                        <long name="is-transient">0</long>
-                        <long name="owns-file">1</long>
-                        <long name="title-mode">0</long>
-                        <long name="locked">0</long>
-                        <string name="created">"3/10/2006"</string>
-                        <string name="proxy-type">"wbBoxSizerProxy"</string>
-                        <string name="proxy-Orientation">"Horizontal"</string>
-                        <string name="proxy-Member variable name">""</string>
-                        <string name="proxy-AlignH">"Expand"</string>
-                        <string name="proxy-AlignV">"Centre"</string>
-                        <long name="proxy-Stretch factor">0</long>
-                        <long name="proxy-Border">5</long>
-                        <bool name="proxy-wxLEFT">0</bool>
-                        <bool name="proxy-wxRIGHT">0</bool>
-                        <bool name="proxy-wxTOP">0</bool>
-                        <bool name="proxy-wxBOTTOM">0</bool>
-                        <bool name="proxy-wxSHAPED">0</bool>
-                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <document>
-                          <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST"</string>
-                          <string name="type">"dialog-control-document"</string>
-                          <string name="filename">""</string>
-                          <string name="icon-name">"textctrl"</string>
-                          <long name="is-transient">0</long>
-                          <long name="owns-file">1</long>
-                          <long name="title-mode">0</long>
-                          <long name="locked">0</long>
-                          <string name="created">"3/10/2006"</string>
-                          <string name="proxy-type">"wbTextCtrlProxy"</string>
-                          <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftFirstUpdated"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST"</string>
-                          <long name="proxy-Id value">10104</long>
-                          <string name="proxy-Name">""</string>
-                          <string name="proxy-Class">"wxTextCtrl"</string>
-                          <string name="proxy-Base class">"wxTextCtrl"</string>
-                          <bool name="proxy-External implementation">1</bool>
-                          <bool name="proxy-Separate files">0</bool>
-                          <string name="proxy-Implementation filename">""</string>
-                          <string name="proxy-Header filename">""</string>
-                          <string name="proxy-Member variable name">"m_indentLeftFirst"</string>
-                          <string name="proxy-Initial value">""</string>
-                          <long name="proxy-Max length">0</long>
-                          <string name="proxy-Help text">"The first line indent."</string>
-                          <string name="proxy-Tooltip text">""</string>
-                          <string name="proxy-Background colour">""</string>
-                          <string name="proxy-Foreground colour">""</string>
-                          <string name="proxy-Font">""</string>
-                          <bool name="proxy-Hidden">0</bool>
-                          <bool name="proxy-Enabled">1</bool>
-                          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                          <string name="proxy-Data variable">""</string>
-                          <string name="proxy-Data validator">""</string>
-                          <string name="proxy-Data source">""</string>
-                          <string name="proxy-Data class name">""</string>
-                          <string name="proxy-Data class implementation filename">""</string>
-                          <string name="proxy-Data class header filename">""</string>
-                          <string name="proxy-Data class manager window">""</string>
-                          <bool name="proxy-wxTE_MULTILINE">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                          <bool name="proxy-wxTE_PASSWORD">0</bool>
-                          <bool name="proxy-wxTE_READONLY">0</bool>
-                          <bool name="proxy-wxTE_RICH">0</bool>
-                          <bool name="proxy-wxTE_RICH2">0</bool>
-                          <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                          <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                          <bool name="proxy-wxTE_LEFT">0</bool>
-                          <bool name="proxy-wxTE_CENTRE">0</bool>
-                          <bool name="proxy-wxTE_RIGHT">0</bool>
-                          <bool name="proxy-wxHSCROLL">0</bool>
-                          <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                          <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                          <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                          <bool name="proxy-wxNO_BORDER">0</bool>
-                          <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                          <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                          <bool name="proxy-wxBORDER_THEME">0</bool>
-                          <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                          <bool name="proxy-wxRAISED_BORDER">0</bool>
-                          <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                          <bool name="proxy-wxWANTS_CHARS">0</bool>
-                          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                          <string name="proxy-Custom styles">""</string>
-                          <long name="proxy-X">-1</long>
-                          <long name="proxy-Y">-1</long>
-                          <long name="proxy-Width">50</long>
-                          <long name="proxy-Height">-1</long>
-                          <string name="proxy-AlignH">"Centre"</string>
-                          <string name="proxy-AlignV">"Centre"</string>
-                          <long name="proxy-Stretch factor">1</long>
-                          <long name="proxy-Border">5</long>
-                          <bool name="proxy-wxLEFT">1</bool>
-                          <bool name="proxy-wxRIGHT">1</bool>
-                          <bool name="proxy-wxTOP">1</bool>
-                          <bool name="proxy-wxBOTTOM">1</bool>
-                          <bool name="proxy-wxSHAPED">0</bool>
-                          <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                          <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                          <string name="proxy-Custom arguments">""</string>
-                          <string name="proxy-Custom ctor arguments">""</string>
-                          <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                        </document>
-                      </document>
-                      <document>
-                        <string name="title">"wxStaticText: wxID_STATIC"</string>
+                        <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST"</string>

                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>

-                        <string name="icon-name">"statictext"</string>
+                        <string name="icon-name">"textctrl"</string>

                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>
-                        <string name="proxy-type">"wbStaticTextProxy"</string>
-                        <string name="proxy-Id name">"wxID_STATIC"</string>
-                        <long name="proxy-Id value">5105</long>
+                        <string name="proxy-type">"wbTextCtrlProxy"</string>
+                        <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftFirstUpdated"</string>
+                        <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST"</string>
+                        <long name="proxy-Id value">10104</long>

                         <string name="proxy-Name">""</string>
                         <string name="proxy-Name">""</string>

-                        <string name="proxy-Class">"wxStaticText"</string>
-                        <string name="proxy-Base class">"wxStaticText"</string>
+                        <string name="proxy-Class">"wxTextCtrl"</string>
+                        <string name="proxy-Base class">"wxTextCtrl"</string>

                         <bool name="proxy-External implementation">1</bool>
                         <bool name="proxy-Separate files">0</bool>
                         <string name="proxy-Implementation filename">""</string>
                         <string name="proxy-Header filename">""</string>
                         <bool name="proxy-External implementation">1</bool>
                         <bool name="proxy-Separate files">0</bool>
                         <string name="proxy-Implementation filename">""</string>
                         <string name="proxy-Header filename">""</string>

-                        <string name="proxy-Member variable name">""</string>
-                        <string name="proxy-Label">"&amp;Right:"</string>
-                        <long name="proxy-Wrapping width">-1</long>
-                        <string name="proxy-Help text">""</string>
+                        <string name="proxy-Member variable name">"m_indentLeftFirst"</string>
+                        <string name="proxy-Initial value">""</string>
+                        <long name="proxy-Max length">0</long>
+                        <string name="proxy-Help text">"The first line indent."</string>

                         <string name="proxy-Tooltip text">""</string>
                         <string name="proxy-Background colour">""</string>
                         <string name="proxy-Foreground colour">""</string>
                         <string name="proxy-Tooltip text">""</string>
                         <string name="proxy-Background colour">""</string>
                         <string name="proxy-Foreground colour">""</string>


@@ -3460,10 +3319,22 @@
                         <string name="proxy-Data class implementation filename">""</string>
                         <string name="proxy-Data class header filename">""</string>
                         <string name="proxy-Data class manager window">""</string>
                         <string name="proxy-Data class implementation filename">""</string>
                         <string name="proxy-Data class header filename">""</string>
                         <string name="proxy-Data class manager window">""</string>

-                        <bool name="proxy-wxALIGN_LEFT">0</bool>
-                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                        <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                        <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
+                        <bool name="proxy-wxTE_MULTILINE">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                        <bool name="proxy-wxTE_PASSWORD">0</bool>
+                        <bool name="proxy-wxTE_READONLY">0</bool>
+                        <bool name="proxy-wxTE_RICH">0</bool>
+                        <bool name="proxy-wxTE_RICH2">0</bool>
+                        <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                        <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                        <bool name="proxy-wxTE_LEFT">0</bool>
+                        <bool name="proxy-wxTE_CENTRE">0</bool>
+                        <bool name="proxy-wxTE_RIGHT">0</bool>
+                        <bool name="proxy-wxHSCROLL">0</bool>
+                        <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                        <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                        <bool name="proxy-wxTE_CAPITALIZE">0</bool>

                         <bool name="proxy-wxNO_BORDER">0</bool>
                         <bool name="proxy-wxSIMPLE_BORDER">0</bool>
                         <bool name="proxy-wxDOUBLE_BORDER">0</bool>
                         <bool name="proxy-wxNO_BORDER">0</bool>
                         <bool name="proxy-wxSIMPLE_BORDER">0</bool>
                         <bool name="proxy-wxDOUBLE_BORDER">0</bool>


@@ -3477,9 +3348,9 @@
                         <string name="proxy-Custom styles">""</string>
                         <long name="proxy-X">-1</long>
                         <long name="proxy-Y">-1</long>
                         <string name="proxy-Custom styles">""</string>
                         <long name="proxy-X">-1</long>
                         <long name="proxy-Y">-1</long>

-                        <long name="proxy-Width">-1</long>
+                        <long name="proxy-Width">50</long>

                         <long name="proxy-Height">-1</long>
                         <long name="proxy-Height">-1</long>

-                        <string name="proxy-AlignH">"Right"</string>
+                        <string name="proxy-AlignH">"Expand"</string>

                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>


@@ -3494,115 +3365,157 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>

-                        <string name="title">"wxBoxSizer H"</string>
+                        <string name="title">"wxStaticText: wxID_STATIC"</string>

                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>

-                        <string name="icon-name">"sizer"</string>
+                        <string name="icon-name">"statictext"</string>

                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>
-                        <string name="proxy-type">"wbBoxSizerProxy"</string>
-                        <string name="proxy-Orientation">"Horizontal"</string>
+                        <string name="proxy-type">"wbStaticTextProxy"</string>
+                        <string name="proxy-Id name">"wxID_STATIC"</string>
+                        <long name="proxy-Id value">5105</long>
+                        <string name="proxy-Name">""</string>
+                        <string name="proxy-Class">"wxStaticText"</string>
+                        <string name="proxy-Base class">"wxStaticText"</string>
+                        <bool name="proxy-External implementation">1</bool>
+                        <bool name="proxy-Separate files">0</bool>
+                        <string name="proxy-Implementation filename">""</string>
+                        <string name="proxy-Header filename">""</string>

                         <string name="proxy-Member variable name">""</string>
                         <string name="proxy-Member variable name">""</string>

-                        <string name="proxy-AlignH">"Expand"</string>
+                        <string name="proxy-Label">"&amp;Right:"</string>
+                        <long name="proxy-Wrapping width">-1</long>
+                        <string name="proxy-Help text">""</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxALIGN_LEFT">0</bool>
+                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                        <bool name="proxy-wxALIGN_CENTRE">0</bool>
+                        <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
+                        <bool name="proxy-wxNO_BORDER">0</bool>
+                        <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                        <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                        <bool name="proxy-wxBORDER_THEME">0</bool>
+                        <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                        <bool name="proxy-wxRAISED_BORDER">0</bool>
+                        <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">-1</long>
+                        <long name="proxy-Height">-1</long>
+                        <string name="proxy-AlignH">"Right"</string>

                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>

-                        <bool name="proxy-wxLEFT">0</bool>
-                        <bool name="proxy-wxRIGHT">0</bool>
-                        <bool name="proxy-wxTOP">0</bool>
-                        <bool name="proxy-wxBOTTOM">0</bool>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>

                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>

+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>
+                      </document>
+                      <document>
+                        <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT"</string>
+                        <string name="type">"dialog-control-document"</string>
+                        <string name="filename">""</string>
+                        <string name="icon-name">"textctrl"</string>
+                        <long name="is-transient">0</long>
+                        <long name="owns-file">1</long>
+                        <long name="title-mode">0</long>
+                        <long name="locked">0</long>
+                        <string name="proxy-type">"wbTextCtrlProxy"</string>
+                        <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated"</string>
+                        <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT"</string>
+                        <long name="proxy-Id value">10113</long>
+                        <string name="proxy-Name">""</string>
+                        <string name="proxy-Class">"wxTextCtrl"</string>
+                        <string name="proxy-Base class">"wxTextCtrl"</string>
+                        <bool name="proxy-External implementation">1</bool>
+                        <bool name="proxy-Separate files">0</bool>
+                        <string name="proxy-Implementation filename">""</string>
+                        <string name="proxy-Header filename">""</string>
+                        <string name="proxy-Member variable name">"m_indentRight"</string>
+                        <string name="proxy-Initial value">""</string>
+                        <long name="proxy-Max length">0</long>
+                        <string name="proxy-Help text">"The right indent."</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>

                         <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                         <string name="proxy-Platform">"&lt;Any platform&gt;"</string>

-                        <document>
-                          <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT"</string>
-                          <string name="type">"dialog-control-document"</string>
-                          <string name="filename">""</string>
-                          <string name="icon-name">"textctrl"</string>
-                          <long name="is-transient">0</long>
-                          <long name="owns-file">1</long>
-                          <long name="title-mode">0</long>
-                          <long name="locked">0</long>
-                          <string name="created">"3/10/2006"</string>
-                          <string name="proxy-type">"wbTextCtrlProxy"</string>
-                          <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT"</string>
-                          <long name="proxy-Id value">10113</long>
-                          <string name="proxy-Name">""</string>
-                          <string name="proxy-Class">"wxTextCtrl"</string>
-                          <string name="proxy-Base class">"wxTextCtrl"</string>
-                          <bool name="proxy-External implementation">1</bool>
-                          <bool name="proxy-Separate files">0</bool>
-                          <string name="proxy-Implementation filename">""</string>
-                          <string name="proxy-Header filename">""</string>
-                          <string name="proxy-Member variable name">"m_indentRight"</string>
-                          <string name="proxy-Initial value">""</string>
-                          <long name="proxy-Max length">0</long>
-                          <string name="proxy-Help text">"The right indent."</string>
-                          <string name="proxy-Tooltip text">""</string>
-                          <string name="proxy-Background colour">""</string>
-                          <string name="proxy-Foreground colour">""</string>
-                          <string name="proxy-Font">""</string>
-                          <bool name="proxy-Hidden">0</bool>
-                          <bool name="proxy-Enabled">1</bool>
-                          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                          <string name="proxy-Data variable">""</string>
-                          <string name="proxy-Data validator">""</string>
-                          <string name="proxy-Data source">""</string>
-                          <string name="proxy-Data class name">""</string>
-                          <string name="proxy-Data class implementation filename">""</string>
-                          <string name="proxy-Data class header filename">""</string>
-                          <string name="proxy-Data class manager window">""</string>
-                          <bool name="proxy-wxTE_MULTILINE">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                          <bool name="proxy-wxTE_PASSWORD">0</bool>
-                          <bool name="proxy-wxTE_READONLY">0</bool>
-                          <bool name="proxy-wxTE_RICH">0</bool>
-                          <bool name="proxy-wxTE_RICH2">0</bool>
-                          <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                          <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                          <bool name="proxy-wxTE_LEFT">0</bool>
-                          <bool name="proxy-wxTE_CENTRE">0</bool>
-                          <bool name="proxy-wxTE_RIGHT">0</bool>
-                          <bool name="proxy-wxHSCROLL">0</bool>
-                          <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                          <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                          <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                          <bool name="proxy-wxNO_BORDER">0</bool>
-                          <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                          <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                          <bool name="proxy-wxBORDER_THEME">0</bool>
-                          <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                          <bool name="proxy-wxRAISED_BORDER">0</bool>
-                          <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                          <bool name="proxy-wxWANTS_CHARS">0</bool>
-                          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                          <string name="proxy-Custom styles">""</string>
-                          <long name="proxy-X">-1</long>
-                          <long name="proxy-Y">-1</long>
-                          <long name="proxy-Width">50</long>
-                          <long name="proxy-Height">-1</long>
-                          <string name="proxy-AlignH">"Centre"</string>
-                          <string name="proxy-AlignV">"Centre"</string>
-                          <long name="proxy-Stretch factor">1</long>
-                          <long name="proxy-Border">5</long>
-                          <bool name="proxy-wxLEFT">1</bool>
-                          <bool name="proxy-wxRIGHT">1</bool>
-                          <bool name="proxy-wxTOP">1</bool>
-                          <bool name="proxy-wxBOTTOM">1</bool>
-                          <bool name="proxy-wxSHAPED">0</bool>
-                          <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                          <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                          <string name="proxy-Custom arguments">""</string>
-                          <string name="proxy-Custom ctor arguments">""</string>
-                          <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                        </document>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxTE_MULTILINE">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                        <bool name="proxy-wxTE_PASSWORD">0</bool>
+                        <bool name="proxy-wxTE_READONLY">0</bool>
+                        <bool name="proxy-wxTE_RICH">0</bool>
+                        <bool name="proxy-wxTE_RICH2">0</bool>
+                        <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                        <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                        <bool name="proxy-wxTE_LEFT">0</bool>
+                        <bool name="proxy-wxTE_CENTRE">0</bool>
+                        <bool name="proxy-wxTE_RIGHT">0</bool>
+                        <bool name="proxy-wxHSCROLL">0</bool>
+                        <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                        <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                        <bool name="proxy-wxTE_CAPITALIZE">0</bool>
+                        <bool name="proxy-wxNO_BORDER">0</bool>
+                        <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                        <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                        <bool name="proxy-wxBORDER_THEME">0</bool>
+                        <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                        <bool name="proxy-wxRAISED_BORDER">0</bool>
+                        <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">50</long>
+                        <long name="proxy-Height">-1</long>
+                        <string name="proxy-AlignH">"Expand"</string>
+                        <string name="proxy-AlignV">"Centre"</string>
+                        <long name="proxy-Stretch factor">0</long>
+                        <long name="proxy-Border">5</long>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>
+                        <bool name="proxy-wxSHAPED">0</bool>
+                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>

                       </document>
                       <document>
                         <string name="title">"wxStaticText: wxID_STATIC"</string>
                       </document>
                       <document>
                         <string name="title">"wxStaticText: wxID_STATIC"</string>


@@ -3697,8 +3610,8 @@
                         <string name="proxy-Implementation filename">""</string>
                         <string name="proxy-Header filename">""</string>
                         <string name="proxy-Member variable name">"m_outlineLevelCtrl"</string>
                         <string name="proxy-Implementation filename">""</string>
                         <string name="proxy-Header filename">""</string>
                         <string name="proxy-Member variable name">"m_outlineLevelCtrl"</string>

-                        <string name="proxy-Strings">"Normal|1|2|3|4|5|6|7|8|9"</string>
-                        <string name="proxy-Initial value">"Normal"</string>
+                        <string name="proxy-Strings">"(none)|1|2|3|4|5|6|7|8|9|10"</string>
+                        <string name="proxy-Initial value">"(none)"</string>

                         <string name="proxy-Help text">"The outline level."</string>
                         <string name="proxy-Tooltip text">""</string>
                         <string name="proxy-Background colour">""</string>
                         <string name="proxy-Help text">"The outline level."</string>
                         <string name="proxy-Tooltip text">""</string>
                         <string name="proxy-Background colour">""</string>


@@ -3725,11 +3638,11 @@
                         <string name="proxy-Custom styles">""</string>
                         <long name="proxy-X">-1</long>
                         <long name="proxy-Y">-1</long>
                         <string name="proxy-Custom styles">""</string>
                         <long name="proxy-X">-1</long>
                         <long name="proxy-Y">-1</long>

-                        <long name="proxy-Width">90</long>
+                        <long name="proxy-Width">85</long>

                         <long name="proxy-Height">-1</long>
                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Height">-1</long>
                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>

-                        <long name="proxy-Stretch factor">1</long>
+                        <long name="proxy-Stretch factor">0</long>

                         <long name="proxy-Border">5</long>
                         <bool name="proxy-wxLEFT">1</bool>
                         <bool name="proxy-wxRIGHT">1</bool>
                         <long name="proxy-Border">5</long>
                         <bool name="proxy-wxLEFT">1</bool>
                         <bool name="proxy-wxRIGHT">1</bool>


@@ -4010,7 +3923,7 @@
                       <long name="locked">0</long>
                       <string name="created">"3/10/2006"</string>
                       <string name="proxy-type">"wbFlexGridSizerProxy"</string>
                       <long name="locked">0</long>
                       <string name="created">"3/10/2006"</string>
                       <string name="proxy-type">"wbFlexGridSizerProxy"</string>

-                      <string name="proxy-GrowableColumns">"1"</string>
+                      <string name="proxy-GrowableColumns">""</string>

                       <string name="proxy-GrowableRows">""</string>
                       <long name="proxy-Columns">2</long>
                       <long name="proxy-Rows">30</long>
                       <string name="proxy-GrowableRows">""</string>
                       <long name="proxy-Columns">2</long>
                       <long name="proxy-Rows">30</long>


@@ -4038,7 +3951,6 @@
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>

                         <string name="proxy-type">"wbStaticTextProxy"</string>
                         <string name="proxy-Id name">"wxID_STATIC"</string>
                         <long name="proxy-Id value">5105</long>
                         <string name="proxy-type">"wbStaticTextProxy"</string>
                         <string name="proxy-Id name">"wxID_STATIC"</string>
                         <long name="proxy-Id value">5105</long>


@@ -4101,115 +4013,87 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>

-                        <string name="title">"wxBoxSizer H"</string>
+                        <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE"</string>

                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>

-                        <string name="icon-name">"sizer"</string>
+                        <string name="icon-name">"textctrl"</string>

                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>
-                        <string name="proxy-type">"wbBoxSizerProxy"</string>
-                        <string name="proxy-Orientation">"Horizontal"</string>
-                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-type">"wbTextCtrlProxy"</string>
+                        <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated"</string>
+                        <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE"</string>
+                        <long name="proxy-Id value">10114</long>
+                        <string name="proxy-Name">""</string>
+                        <string name="proxy-Class">"wxTextCtrl"</string>
+                        <string name="proxy-Base class">"wxTextCtrl"</string>
+                        <bool name="proxy-External implementation">1</bool>
+                        <bool name="proxy-Separate files">0</bool>
+                        <string name="proxy-Implementation filename">""</string>
+                        <string name="proxy-Header filename">""</string>
+                        <string name="proxy-Member variable name">"m_spacingBefore"</string>
+                        <string name="proxy-Initial value">""</string>
+                        <long name="proxy-Max length">0</long>
+                        <string name="proxy-Help text">"The spacing before the paragraph."</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxTE_MULTILINE">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                        <bool name="proxy-wxTE_PASSWORD">0</bool>
+                        <bool name="proxy-wxTE_READONLY">0</bool>
+                        <bool name="proxy-wxTE_RICH">0</bool>
+                        <bool name="proxy-wxTE_RICH2">0</bool>
+                        <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                        <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                        <bool name="proxy-wxTE_LEFT">0</bool>
+                        <bool name="proxy-wxTE_CENTRE">0</bool>
+                        <bool name="proxy-wxTE_RIGHT">0</bool>
+                        <bool name="proxy-wxHSCROLL">0</bool>
+                        <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                        <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                        <bool name="proxy-wxTE_CAPITALIZE">0</bool>
+                        <bool name="proxy-wxNO_BORDER">0</bool>
+                        <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                        <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                        <bool name="proxy-wxBORDER_THEME">0</bool>
+                        <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                        <bool name="proxy-wxRAISED_BORDER">0</bool>
+                        <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">50</long>
+                        <long name="proxy-Height">-1</long>

                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>

-                        <bool name="proxy-wxLEFT">0</bool>
-                        <bool name="proxy-wxRIGHT">0</bool>
-                        <bool name="proxy-wxTOP">0</bool>
-                        <bool name="proxy-wxBOTTOM">0</bool>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>

                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <document>
-                          <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE"</string>
-                          <string name="type">"dialog-control-document"</string>
-                          <string name="filename">""</string>
-                          <string name="icon-name">"textctrl"</string>
-                          <long name="is-transient">0</long>
-                          <long name="owns-file">1</long>
-                          <long name="title-mode">0</long>
-                          <long name="locked">0</long>
-                          <string name="created">"3/10/2006"</string>
-                          <string name="proxy-type">"wbTextCtrlProxy"</string>
-                          <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE"</string>
-                          <long name="proxy-Id value">10114</long>
-                          <string name="proxy-Name">""</string>
-                          <string name="proxy-Class">"wxTextCtrl"</string>
-                          <string name="proxy-Base class">"wxTextCtrl"</string>
-                          <bool name="proxy-External implementation">1</bool>
-                          <bool name="proxy-Separate files">0</bool>
-                          <string name="proxy-Implementation filename">""</string>
-                          <string name="proxy-Header filename">""</string>
-                          <string name="proxy-Member variable name">"m_spacingBefore"</string>
-                          <string name="proxy-Initial value">""</string>
-                          <long name="proxy-Max length">0</long>
-                          <string name="proxy-Help text">"The spacing before the paragraph."</string>
-                          <string name="proxy-Tooltip text">""</string>
-                          <string name="proxy-Background colour">""</string>
-                          <string name="proxy-Foreground colour">""</string>
-                          <string name="proxy-Font">""</string>
-                          <bool name="proxy-Hidden">0</bool>
-                          <bool name="proxy-Enabled">1</bool>
-                          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                          <string name="proxy-Data variable">""</string>
-                          <string name="proxy-Data validator">""</string>
-                          <string name="proxy-Data source">""</string>
-                          <string name="proxy-Data class name">""</string>
-                          <string name="proxy-Data class implementation filename">""</string>
-                          <string name="proxy-Data class header filename">""</string>
-                          <string name="proxy-Data class manager window">""</string>
-                          <bool name="proxy-wxTE_MULTILINE">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                          <bool name="proxy-wxTE_PASSWORD">0</bool>
-                          <bool name="proxy-wxTE_READONLY">0</bool>
-                          <bool name="proxy-wxTE_RICH">0</bool>
-                          <bool name="proxy-wxTE_RICH2">0</bool>
-                          <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                          <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                          <bool name="proxy-wxTE_LEFT">0</bool>
-                          <bool name="proxy-wxTE_CENTRE">0</bool>
-                          <bool name="proxy-wxTE_RIGHT">0</bool>
-                          <bool name="proxy-wxHSCROLL">0</bool>
-                          <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                          <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                          <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                          <bool name="proxy-wxNO_BORDER">0</bool>
-                          <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                          <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                          <bool name="proxy-wxBORDER_THEME">0</bool>
-                          <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                          <bool name="proxy-wxRAISED_BORDER">0</bool>
-                          <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                          <bool name="proxy-wxWANTS_CHARS">0</bool>
-                          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                          <string name="proxy-Custom styles">""</string>
-                          <long name="proxy-X">-1</long>
-                          <long name="proxy-Y">-1</long>
-                          <long name="proxy-Width">50</long>
-                          <long name="proxy-Height">-1</long>
-                          <string name="proxy-AlignH">"Centre"</string>
-                          <string name="proxy-AlignV">"Centre"</string>
-                          <long name="proxy-Stretch factor">1</long>
-                          <long name="proxy-Border">5</long>
-                          <bool name="proxy-wxLEFT">1</bool>
-                          <bool name="proxy-wxRIGHT">1</bool>
-                          <bool name="proxy-wxTOP">1</bool>
-                          <bool name="proxy-wxBOTTOM">1</bool>
-                          <bool name="proxy-wxSHAPED">0</bool>
-                          <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                          <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                          <string name="proxy-Custom arguments">""</string>
-                          <string name="proxy-Custom ctor arguments">""</string>
-                          <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                        </document>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>

                       </document>
                       <document>
                         <string name="title">"wxStaticText: wxID_STATIC"</string>
                       </document>
                       <document>
                         <string name="title">"wxStaticText: wxID_STATIC"</string>


@@ -4220,7 +4104,6 @@
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>

                         <string name="proxy-type">"wbStaticTextProxy"</string>
                         <string name="proxy-Id name">"wxID_STATIC"</string>
                         <long name="proxy-Id value">5105</long>
                         <string name="proxy-type">"wbStaticTextProxy"</string>
                         <string name="proxy-Id name">"wxID_STATIC"</string>
                         <long name="proxy-Id value">5105</long>


@@ -4283,115 +4166,87 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>

-                        <string name="title">"wxBoxSizer H"</string>
+                        <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER"</string>

                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>

-                        <string name="icon-name">"sizer"</string>
+                        <string name="icon-name">"textctrl"</string>

                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>
-                        <string name="proxy-type">"wbBoxSizerProxy"</string>
-                        <string name="proxy-Orientation">"Horizontal"</string>
-                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-type">"wbTextCtrlProxy"</string>
+                        <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated"</string>
+                        <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER"</string>
+                        <long name="proxy-Id value">10116</long>
+                        <string name="proxy-Name">""</string>
+                        <string name="proxy-Class">"wxTextCtrl"</string>
+                        <string name="proxy-Base class">"wxTextCtrl"</string>
+                        <bool name="proxy-External implementation">1</bool>
+                        <bool name="proxy-Separate files">0</bool>
+                        <string name="proxy-Implementation filename">""</string>
+                        <string name="proxy-Header filename">""</string>
+                        <string name="proxy-Member variable name">"m_spacingAfter"</string>
+                        <string name="proxy-Initial value">""</string>
+                        <long name="proxy-Max length">0</long>
+                        <string name="proxy-Help text">""</string>
+                        <string name="proxy-Tooltip text">"The spacing after the paragraph."</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxTE_MULTILINE">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                        <bool name="proxy-wxTE_PASSWORD">0</bool>
+                        <bool name="proxy-wxTE_READONLY">0</bool>
+                        <bool name="proxy-wxTE_RICH">0</bool>
+                        <bool name="proxy-wxTE_RICH2">0</bool>
+                        <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                        <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                        <bool name="proxy-wxTE_LEFT">0</bool>
+                        <bool name="proxy-wxTE_CENTRE">0</bool>
+                        <bool name="proxy-wxTE_RIGHT">0</bool>
+                        <bool name="proxy-wxHSCROLL">0</bool>
+                        <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                        <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                        <bool name="proxy-wxTE_CAPITALIZE">0</bool>
+                        <bool name="proxy-wxNO_BORDER">0</bool>
+                        <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                        <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                        <bool name="proxy-wxBORDER_THEME">0</bool>
+                        <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                        <bool name="proxy-wxRAISED_BORDER">0</bool>
+                        <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">50</long>
+                        <long name="proxy-Height">-1</long>

                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>

-                        <long name="proxy-Stretch factor">1</long>
+                        <long name="proxy-Stretch factor">0</long>

                         <long name="proxy-Border">5</long>
                         <long name="proxy-Border">5</long>

-                        <bool name="proxy-wxLEFT">0</bool>
-                        <bool name="proxy-wxRIGHT">0</bool>
-                        <bool name="proxy-wxTOP">0</bool>
-                        <bool name="proxy-wxBOTTOM">0</bool>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>

                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <document>
-                          <string name="title">"wxTextCtrl: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER"</string>
-                          <string name="type">"dialog-control-document"</string>
-                          <string name="filename">""</string>
-                          <string name="icon-name">"textctrl"</string>
-                          <long name="is-transient">0</long>
-                          <long name="owns-file">1</long>
-                          <long name="title-mode">0</long>
-                          <long name="locked">0</long>
-                          <string name="created">"3/10/2006"</string>
-                          <string name="proxy-type">"wbTextCtrlProxy"</string>
-                          <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER"</string>
-                          <long name="proxy-Id value">10116</long>
-                          <string name="proxy-Name">""</string>
-                          <string name="proxy-Class">"wxTextCtrl"</string>
-                          <string name="proxy-Base class">"wxTextCtrl"</string>
-                          <bool name="proxy-External implementation">1</bool>
-                          <bool name="proxy-Separate files">0</bool>
-                          <string name="proxy-Implementation filename">""</string>
-                          <string name="proxy-Header filename">""</string>
-                          <string name="proxy-Member variable name">"m_spacingAfter"</string>
-                          <string name="proxy-Initial value">""</string>
-                          <long name="proxy-Max length">0</long>
-                          <string name="proxy-Help text">""</string>
-                          <string name="proxy-Tooltip text">"The spacing after the paragraph."</string>
-                          <string name="proxy-Background colour">""</string>
-                          <string name="proxy-Foreground colour">""</string>
-                          <string name="proxy-Font">""</string>
-                          <bool name="proxy-Hidden">0</bool>
-                          <bool name="proxy-Enabled">1</bool>
-                          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                          <string name="proxy-Data variable">""</string>
-                          <string name="proxy-Data validator">""</string>
-                          <string name="proxy-Data source">""</string>
-                          <string name="proxy-Data class name">""</string>
-                          <string name="proxy-Data class implementation filename">""</string>
-                          <string name="proxy-Data class header filename">""</string>
-                          <string name="proxy-Data class manager window">""</string>
-                          <bool name="proxy-wxTE_MULTILINE">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                          <bool name="proxy-wxTE_PASSWORD">0</bool>
-                          <bool name="proxy-wxTE_READONLY">0</bool>
-                          <bool name="proxy-wxTE_RICH">0</bool>
-                          <bool name="proxy-wxTE_RICH2">0</bool>
-                          <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                          <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                          <bool name="proxy-wxTE_LEFT">0</bool>
-                          <bool name="proxy-wxTE_CENTRE">0</bool>
-                          <bool name="proxy-wxTE_RIGHT">0</bool>
-                          <bool name="proxy-wxHSCROLL">0</bool>
-                          <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                          <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                          <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                          <bool name="proxy-wxNO_BORDER">0</bool>
-                          <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                          <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                          <bool name="proxy-wxBORDER_THEME">0</bool>
-                          <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                          <bool name="proxy-wxRAISED_BORDER">0</bool>
-                          <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                          <bool name="proxy-wxWANTS_CHARS">0</bool>
-                          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                          <string name="proxy-Custom styles">""</string>
-                          <long name="proxy-X">-1</long>
-                          <long name="proxy-Y">-1</long>
-                          <long name="proxy-Width">50</long>
-                          <long name="proxy-Height">-1</long>
-                          <string name="proxy-AlignH">"Centre"</string>
-                          <string name="proxy-AlignV">"Centre"</string>
-                          <long name="proxy-Stretch factor">1</long>
-                          <long name="proxy-Border">5</long>
-                          <bool name="proxy-wxLEFT">1</bool>
-                          <bool name="proxy-wxRIGHT">1</bool>
-                          <bool name="proxy-wxTOP">1</bool>
-                          <bool name="proxy-wxBOTTOM">1</bool>
-                          <bool name="proxy-wxSHAPED">0</bool>
-                          <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                          <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                          <string name="proxy-Custom arguments">""</string>
-                          <string name="proxy-Custom ctor arguments">""</string>
-                          <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                        </document>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>

                       </document>
                       <document>
                         <string name="title">"wxStaticText: wxID_STATIC"</string>
                       </document>
                       <document>
                         <string name="title">"wxStaticText: wxID_STATIC"</string>


@@ -4465,96 +4320,69 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>

-                        <string name="title">"wxBoxSizer H"</string>
+                        <string name="title">"wxComboBox: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE"</string>

                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>

-                        <string name="icon-name">"sizer"</string>
+                        <string name="icon-name">"combobox"</string>

                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <long name="is-transient">0</long>
                         <long name="owns-file">1</long>
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>

-                        <string name="created">"3/10/2006"</string>
-                        <string name="proxy-type">"wbBoxSizerProxy"</string>
-                        <string name="proxy-Orientation">"Horizontal"</string>
-                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-type">"wbComboBoxProxy"</string>
+                        <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnSpacingLineSelected"</string>
+                        <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE"</string>
+                        <long name="proxy-Id value">10115</long>
+                        <string name="proxy-Name">""</string>
+                        <string name="proxy-Class">"wxComboBox"</string>
+                        <string name="proxy-Base class">"wxComboBox"</string>
+                        <bool name="proxy-External implementation">1</bool>
+                        <bool name="proxy-Separate files">0</bool>
+                        <string name="proxy-Implementation filename">""</string>
+                        <string name="proxy-Header filename">""</string>
+                        <string name="proxy-Member variable name">"m_spacingLine"</string>
+                        <string name="proxy-Strings">"(none)|Single|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2"</string>
+                        <string name="proxy-Initial value">"(none)"</string>
+                        <string name="proxy-Help text">"The line spacing."</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxCB_SIMPLE">0</bool>
+                        <bool name="proxy-wxCB_DROPDOWN">0</bool>
+                        <bool name="proxy-wxCB_READONLY">1</bool>
+                        <bool name="proxy-wxCB_SORT">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">85</long>
+                        <long name="proxy-Height">-1</long>

                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>

-                        <bool name="proxy-wxLEFT">0</bool>
-                        <bool name="proxy-wxRIGHT">0</bool>
-                        <bool name="proxy-wxTOP">0</bool>
-                        <bool name="proxy-wxBOTTOM">0</bool>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>

                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                         <bool name="proxy-wxSHAPED">0</bool>
                         <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                         <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <document>
-                          <string name="title">"wxComboBox: ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE"</string>
-                          <string name="type">"dialog-control-document"</string>
-                          <string name="filename">""</string>
-                          <string name="icon-name">"combobox"</string>
-                          <long name="is-transient">0</long>
-                          <long name="owns-file">1</long>
-                          <long name="title-mode">0</long>
-                          <long name="locked">0</long>
-                          <string name="created">"3/10/2006"</string>
-                          <string name="proxy-type">"wbComboBoxProxy"</string>
-                          <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnSpacingLineSelected"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE"</string>
-                          <long name="proxy-Id value">10115</long>
-                          <string name="proxy-Name">""</string>
-                          <string name="proxy-Class">"wxComboBox"</string>
-                          <string name="proxy-Base class">"wxComboBox"</string>
-                          <bool name="proxy-External implementation">1</bool>
-                          <bool name="proxy-Separate files">0</bool>
-                          <string name="proxy-Implementation filename">""</string>
-                          <string name="proxy-Header filename">""</string>
-                          <string name="proxy-Member variable name">"m_spacingLine"</string>
-                          <string name="proxy-Strings">"Single|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2"</string>
-                          <string name="proxy-Initial value">"Single"</string>
-                          <string name="proxy-Help text">"The line spacing."</string>
-                          <string name="proxy-Tooltip text">""</string>
-                          <string name="proxy-Background colour">""</string>
-                          <string name="proxy-Foreground colour">""</string>
-                          <string name="proxy-Font">""</string>
-                          <bool name="proxy-Hidden">0</bool>
-                          <bool name="proxy-Enabled">1</bool>
-                          <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                          <string name="proxy-Data variable">""</string>
-                          <string name="proxy-Data validator">""</string>
-                          <string name="proxy-Data source">""</string>
-                          <string name="proxy-Data class name">""</string>
-                          <string name="proxy-Data class implementation filename">""</string>
-                          <string name="proxy-Data class header filename">""</string>
-                          <string name="proxy-Data class manager window">""</string>
-                          <bool name="proxy-wxCB_SIMPLE">0</bool>
-                          <bool name="proxy-wxCB_DROPDOWN">0</bool>
-                          <bool name="proxy-wxCB_READONLY">1</bool>
-                          <bool name="proxy-wxCB_SORT">0</bool>
-                          <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                          <bool name="proxy-wxWANTS_CHARS">0</bool>
-                          <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                          <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                          <string name="proxy-Custom styles">""</string>
-                          <long name="proxy-X">-1</long>
-                          <long name="proxy-Y">-1</long>
-                          <long name="proxy-Width">90</long>
-                          <long name="proxy-Height">-1</long>
-                          <string name="proxy-AlignH">"Centre"</string>
-                          <string name="proxy-AlignV">"Centre"</string>
-                          <long name="proxy-Stretch factor">0</long>
-                          <long name="proxy-Border">5</long>
-                          <bool name="proxy-wxLEFT">1</bool>
-                          <bool name="proxy-wxRIGHT">1</bool>
-                          <bool name="proxy-wxTOP">1</bool>
-                          <bool name="proxy-wxBOTTOM">1</bool>
-                          <bool name="proxy-wxSHAPED">0</bool>
-                          <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                          <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                          <string name="proxy-Custom arguments">""</string>
-                          <string name="proxy-Custom ctor arguments">""</string>
-                        </document>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>

                       </document>
                     </document>
                   </document>
                       </document>
                     </document>
                   </document>


@@ -13222,7 +13050,6 @@
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>

                               <string name="proxy-type">"wbStaticTextProxy"</string>
                               <string name="proxy-Id name">"wxID_STATIC"</string>
                               <long name="proxy-Id value">5105</long>
                               <string name="proxy-type">"wbStaticTextProxy"</string>
                               <string name="proxy-Id name">"wxID_STATIC"</string>
                               <long name="proxy-Id value">5105</long>


@@ -13285,115 +13112,87 @@
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>

-                              <string name="title">"wxBoxSizer H"</string>
+                              <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT"</string>

                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>
                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>

-                              <string name="icon-name">"sizer"</string>
+                              <string name="icon-name">"textctrl"</string>

                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>
-                              <string name="proxy-type">"wbBoxSizerProxy"</string>
-                              <string name="proxy-Orientation">"Horizontal"</string>
-                              <string name="proxy-Member variable name">""</string>
-                              <string name="proxy-AlignH">"Centre"</string>
+                              <string name="proxy-type">"wbTextCtrlProxy"</string>
+                              <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated"</string>
+                              <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT"</string>
+                              <long name="proxy-Id value">10634</long>
+                              <string name="proxy-Name">""</string>
+                              <string name="proxy-Class">"wxTextCtrl"</string>
+                              <string name="proxy-Base class">"wxTextCtrl"</string>
+                              <bool name="proxy-External implementation">1</bool>
+                              <bool name="proxy-Separate files">0</bool>
+                              <string name="proxy-Implementation filename">""</string>
+                              <string name="proxy-Header filename">""</string>
+                              <string name="proxy-Member variable name">"m_indentLeft"</string>
+                              <string name="proxy-Initial value">""</string>
+                              <long name="proxy-Max length">0</long>
+                              <string name="proxy-Help text">"The left indent."</string>
+                              <string name="proxy-Tooltip text">""</string>
+                              <string name="proxy-Background colour">""</string>
+                              <string name="proxy-Foreground colour">""</string>
+                              <string name="proxy-Font">""</string>
+                              <bool name="proxy-Hidden">0</bool>
+                              <bool name="proxy-Enabled">1</bool>
+                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                              <string name="proxy-Data variable">""</string>
+                              <string name="proxy-Data validator">""</string>
+                              <string name="proxy-Data source">""</string>
+                              <string name="proxy-Data class name">""</string>
+                              <string name="proxy-Data class implementation filename">""</string>
+                              <string name="proxy-Data class header filename">""</string>
+                              <string name="proxy-Data class manager window">""</string>
+                              <bool name="proxy-wxTE_MULTILINE">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                              <bool name="proxy-wxTE_PASSWORD">0</bool>
+                              <bool name="proxy-wxTE_READONLY">0</bool>
+                              <bool name="proxy-wxTE_RICH">0</bool>
+                              <bool name="proxy-wxTE_RICH2">0</bool>
+                              <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                              <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                              <bool name="proxy-wxTE_LEFT">0</bool>
+                              <bool name="proxy-wxTE_CENTRE">0</bool>
+                              <bool name="proxy-wxTE_RIGHT">0</bool>
+                              <bool name="proxy-wxHSCROLL">0</bool>
+                              <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                              <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                              <bool name="proxy-wxTE_CAPITALIZE">0</bool>
+                              <bool name="proxy-wxNO_BORDER">0</bool>
+                              <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                              <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                              <bool name="proxy-wxBORDER_THEME">0</bool>
+                              <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                              <bool name="proxy-wxRAISED_BORDER">0</bool>
+                              <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                              <bool name="proxy-wxWANTS_CHARS">0</bool>
+                              <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                              <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                              <string name="proxy-Custom styles">""</string>
+                              <long name="proxy-X">-1</long>
+                              <long name="proxy-Y">-1</long>
+                              <long name="proxy-Width">50</long>
+                              <long name="proxy-Height">-1</long>
+                              <string name="proxy-AlignH">"Expand"</string>

                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>
                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>

-                              <bool name="proxy-wxLEFT">0</bool>
-                              <bool name="proxy-wxRIGHT">0</bool>
-                              <bool name="proxy-wxTOP">0</bool>
-                              <bool name="proxy-wxBOTTOM">0</bool>
+                              <bool name="proxy-wxLEFT">1</bool>
+                              <bool name="proxy-wxRIGHT">1</bool>
+                              <bool name="proxy-wxTOP">1</bool>
+                              <bool name="proxy-wxBOTTOM">1</bool>

                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                              <document>
-                                <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT"</string>
-                                <string name="type">"dialog-control-document"</string>
-                                <string name="filename">""</string>
-                                <string name="icon-name">"textctrl"</string>
-                                <long name="is-transient">0</long>
-                                <long name="owns-file">1</long>
-                                <long name="title-mode">0</long>
-                                <long name="locked">0</long>
-                                <string name="created">"18/10/2006"</string>
-                                <string name="proxy-type">"wbTextCtrlProxy"</string>
-                                <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated"</string>
-                                <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT"</string>
-                                <long name="proxy-Id value">10634</long>
-                                <string name="proxy-Name">""</string>
-                                <string name="proxy-Class">"wxTextCtrl"</string>
-                                <string name="proxy-Base class">"wxTextCtrl"</string>
-                                <bool name="proxy-External implementation">1</bool>
-                                <bool name="proxy-Separate files">0</bool>
-                                <string name="proxy-Implementation filename">""</string>
-                                <string name="proxy-Header filename">""</string>
-                                <string name="proxy-Member variable name">"m_indentLeft"</string>
-                                <string name="proxy-Initial value">""</string>
-                                <long name="proxy-Max length">0</long>
-                                <string name="proxy-Help text">"The left indent."</string>
-                                <string name="proxy-Tooltip text">""</string>
-                                <string name="proxy-Background colour">""</string>
-                                <string name="proxy-Foreground colour">""</string>
-                                <string name="proxy-Font">""</string>
-                                <bool name="proxy-Hidden">0</bool>
-                                <bool name="proxy-Enabled">1</bool>
-                                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                                <string name="proxy-Data variable">""</string>
-                                <string name="proxy-Data validator">""</string>
-                                <string name="proxy-Data source">""</string>
-                                <string name="proxy-Data class name">""</string>
-                                <string name="proxy-Data class implementation filename">""</string>
-                                <string name="proxy-Data class header filename">""</string>
-                                <string name="proxy-Data class manager window">""</string>
-                                <bool name="proxy-wxTE_MULTILINE">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                                <bool name="proxy-wxTE_PASSWORD">0</bool>
-                                <bool name="proxy-wxTE_READONLY">0</bool>
-                                <bool name="proxy-wxTE_RICH">0</bool>
-                                <bool name="proxy-wxTE_RICH2">0</bool>
-                                <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                                <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                                <bool name="proxy-wxTE_LEFT">0</bool>
-                                <bool name="proxy-wxTE_CENTRE">0</bool>
-                                <bool name="proxy-wxTE_RIGHT">0</bool>
-                                <bool name="proxy-wxHSCROLL">0</bool>
-                                <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                                <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                                <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                                <bool name="proxy-wxNO_BORDER">0</bool>
-                                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                                <bool name="proxy-wxBORDER_THEME">0</bool>
-                                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                                <string name="proxy-Custom styles">""</string>
-                                <long name="proxy-X">-1</long>
-                                <long name="proxy-Y">-1</long>
-                                <long name="proxy-Width">50</long>
-                                <long name="proxy-Height">-1</long>
-                                <string name="proxy-AlignH">"Centre"</string>
-                                <string name="proxy-AlignV">"Centre"</string>
-                                <long name="proxy-Stretch factor">0</long>
-                                <long name="proxy-Border">5</long>
-                                <bool name="proxy-wxLEFT">1</bool>
-                                <bool name="proxy-wxRIGHT">1</bool>
-                                <bool name="proxy-wxTOP">1</bool>
-                                <bool name="proxy-wxBOTTOM">1</bool>
-                                <bool name="proxy-wxSHAPED">0</bool>
-                                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                                <string name="proxy-Custom arguments">""</string>
-                                <string name="proxy-Custom ctor arguments">""</string>
-                                <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                              </document>
+                              <string name="proxy-Custom arguments">""</string>
+                              <string name="proxy-Custom ctor arguments">""</string>

                             </document>
                             <document>
                               <string name="title">"wxStaticText: wxID_STATIC"</string>
                             </document>
                             <document>
                               <string name="title">"wxStaticText: wxID_STATIC"</string>


@@ -13404,7 +13203,6 @@
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>

                               <string name="proxy-type">"wbStaticTextProxy"</string>
                               <string name="proxy-Id name">"wxID_STATIC"</string>
                               <long name="proxy-Id value">5105</long>
                               <string name="proxy-type">"wbStaticTextProxy"</string>
                               <string name="proxy-Id name">"wxID_STATIC"</string>
                               <long name="proxy-Id value">5105</long>


@@ -13467,140 +13265,183 @@
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>

-                              <string name="title">"wxBoxSizer H"</string>
+                              <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE"</string>

                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>
                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>

-                              <string name="icon-name">"sizer"</string>
+                              <string name="icon-name">"textctrl"</string>
+                              <long name="is-transient">0</long>
+                              <long name="owns-file">1</long>
+                              <long name="title-mode">0</long>
+                              <long name="locked">0</long>
+                              <string name="proxy-type">"wbTextCtrlProxy"</string>
+                              <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentFirstLineUpdated"</string>
+                              <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE"</string>
+                              <long name="proxy-Id value">10635</long>
+                              <string name="proxy-Name">""</string>
+                              <string name="proxy-Class">"wxTextCtrl"</string>
+                              <string name="proxy-Base class">"wxTextCtrl"</string>
+                              <bool name="proxy-External implementation">1</bool>
+                              <bool name="proxy-Separate files">0</bool>
+                              <string name="proxy-Implementation filename">""</string>
+                              <string name="proxy-Header filename">""</string>
+                              <string name="proxy-Member variable name">"m_indentLeftFirst"</string>
+                              <string name="proxy-Initial value">""</string>
+                              <long name="proxy-Max length">0</long>
+                              <string name="proxy-Help text">"The first line indent."</string>
+                              <string name="proxy-Tooltip text">""</string>
+                              <string name="proxy-Background colour">""</string>
+                              <string name="proxy-Foreground colour">""</string>
+                              <string name="proxy-Font">""</string>
+                              <bool name="proxy-Hidden">0</bool>
+                              <bool name="proxy-Enabled">1</bool>
+                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                              <string name="proxy-Data variable">""</string>
+                              <string name="proxy-Data validator">""</string>
+                              <string name="proxy-Data source">""</string>
+                              <string name="proxy-Data class name">""</string>
+                              <string name="proxy-Data class implementation filename">""</string>
+                              <string name="proxy-Data class header filename">""</string>
+                              <string name="proxy-Data class manager window">""</string>
+                              <bool name="proxy-wxTE_MULTILINE">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                              <bool name="proxy-wxTE_PASSWORD">0</bool>
+                              <bool name="proxy-wxTE_READONLY">0</bool>
+                              <bool name="proxy-wxTE_RICH">0</bool>
+                              <bool name="proxy-wxTE_RICH2">0</bool>
+                              <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                              <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                              <bool name="proxy-wxTE_LEFT">0</bool>
+                              <bool name="proxy-wxTE_CENTRE">0</bool>
+                              <bool name="proxy-wxTE_RIGHT">0</bool>
+                              <bool name="proxy-wxHSCROLL">0</bool>
+                              <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                              <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                              <bool name="proxy-wxTE_CAPITALIZE">0</bool>
+                              <bool name="proxy-wxNO_BORDER">0</bool>
+                              <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                              <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                              <bool name="proxy-wxBORDER_THEME">0</bool>
+                              <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                              <bool name="proxy-wxRAISED_BORDER">0</bool>
+                              <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                              <bool name="proxy-wxWANTS_CHARS">0</bool>
+                              <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                              <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                              <string name="proxy-Custom styles">""</string>
+                              <long name="proxy-X">-1</long>
+                              <long name="proxy-Y">-1</long>
+                              <long name="proxy-Width">50</long>
+                              <long name="proxy-Height">-1</long>
+                              <string name="proxy-AlignH">"Expand"</string>
+                              <string name="proxy-AlignV">"Centre"</string>
+                              <long name="proxy-Stretch factor">0</long>
+                              <long name="proxy-Border">5</long>
+                              <bool name="proxy-wxLEFT">1</bool>
+                              <bool name="proxy-wxRIGHT">1</bool>
+                              <bool name="proxy-wxTOP">1</bool>
+                              <bool name="proxy-wxBOTTOM">1</bool>
+                              <bool name="proxy-wxSHAPED">0</bool>
+                              <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                              <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                              <string name="proxy-Custom arguments">""</string>
+                              <string name="proxy-Custom ctor arguments">""</string>
+                            </document>
+                            <document>
+                              <string name="title">"wxStaticText: wxID_STATIC"</string>
+                              <string name="type">"dialog-control-document"</string>
+                              <string name="filename">""</string>
+                              <string name="icon-name">"statictext"</string>

                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <string name="created">"18/10/2006"</string>
                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <string name="created">"18/10/2006"</string>

-                              <string name="proxy-type">"wbBoxSizerProxy"</string>
-                              <string name="proxy-Orientation">"Horizontal"</string>
+                              <string name="proxy-type">"wbStaticTextProxy"</string>
+                              <string name="proxy-Id name">"wxID_STATIC"</string>
+                              <long name="proxy-Id value">5105</long>
+                              <string name="proxy-Name">""</string>
+                              <string name="proxy-Class">"wxStaticText"</string>
+                              <string name="proxy-Base class">"wxStaticText"</string>
+                              <bool name="proxy-External implementation">1</bool>
+                              <bool name="proxy-Separate files">0</bool>
+                              <string name="proxy-Implementation filename">""</string>
+                              <string name="proxy-Header filename">""</string>

                               <string name="proxy-Member variable name">""</string>
                               <string name="proxy-Member variable name">""</string>

-                              <string name="proxy-AlignH">"Centre"</string>
+                              <string name="proxy-Label">"&amp;Right:"</string>
+                              <long name="proxy-Wrapping width">-1</long>
+                              <string name="proxy-Help text">""</string>
+                              <string name="proxy-Tooltip text">""</string>
+                              <string name="proxy-Background colour">""</string>
+                              <string name="proxy-Foreground colour">""</string>
+                              <string name="proxy-Font">""</string>
+                              <bool name="proxy-Hidden">0</bool>
+                              <bool name="proxy-Enabled">1</bool>
+                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                              <string name="proxy-Data variable">""</string>
+                              <string name="proxy-Data validator">""</string>
+                              <string name="proxy-Data source">""</string>
+                              <string name="proxy-Data class name">""</string>
+                              <string name="proxy-Data class implementation filename">""</string>
+                              <string name="proxy-Data class header filename">""</string>
+                              <string name="proxy-Data class manager window">""</string>
+                              <bool name="proxy-wxALIGN_LEFT">0</bool>
+                              <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                              <bool name="proxy-wxALIGN_CENTRE">0</bool>
+                              <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
+                              <bool name="proxy-wxNO_BORDER">0</bool>
+                              <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                              <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                              <bool name="proxy-wxBORDER_THEME">0</bool>
+                              <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                              <bool name="proxy-wxRAISED_BORDER">0</bool>
+                              <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                              <bool name="proxy-wxWANTS_CHARS">0</bool>
+                              <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                              <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                              <string name="proxy-Custom styles">""</string>
+                              <long name="proxy-X">-1</long>
+                              <long name="proxy-Y">-1</long>
+                              <long name="proxy-Width">-1</long>
+                              <long name="proxy-Height">-1</long>
+                              <string name="proxy-AlignH">"Right"</string>

                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>
                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>

-                              <bool name="proxy-wxLEFT">0</bool>
-                              <bool name="proxy-wxRIGHT">0</bool>
-                              <bool name="proxy-wxTOP">0</bool>
-                              <bool name="proxy-wxBOTTOM">0</bool>
+                              <bool name="proxy-wxLEFT">1</bool>
+                              <bool name="proxy-wxRIGHT">1</bool>
+                              <bool name="proxy-wxTOP">1</bool>
+                              <bool name="proxy-wxBOTTOM">1</bool>

                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                              <document>
-                                <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE"</string>
-                                <string name="type">"dialog-control-document"</string>
-                                <string name="filename">""</string>
-                                <string name="icon-name">"textctrl"</string>
-                                <long name="is-transient">0</long>
-                                <long name="owns-file">1</long>
-                                <long name="title-mode">0</long>
-                                <long name="locked">0</long>
-                                <string name="created">"18/10/2006"</string>
-                                <string name="proxy-type">"wbTextCtrlProxy"</string>
-                                <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentFirstLineUpdated"</string>
-                                <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE"</string>
-                                <long name="proxy-Id value">10635</long>
-                                <string name="proxy-Name">""</string>
-                                <string name="proxy-Class">"wxTextCtrl"</string>
-                                <string name="proxy-Base class">"wxTextCtrl"</string>
-                                <bool name="proxy-External implementation">1</bool>
-                                <bool name="proxy-Separate files">0</bool>
-                                <string name="proxy-Implementation filename">""</string>
-                                <string name="proxy-Header filename">""</string>
-                                <string name="proxy-Member variable name">"m_indentLeftFirst"</string>
-                                <string name="proxy-Initial value">""</string>
-                                <long name="proxy-Max length">0</long>
-                                <string name="proxy-Help text">"The first line indent."</string>
-                                <string name="proxy-Tooltip text">""</string>
-                                <string name="proxy-Background colour">""</string>
-                                <string name="proxy-Foreground colour">""</string>
-                                <string name="proxy-Font">""</string>
-                                <bool name="proxy-Hidden">0</bool>
-                                <bool name="proxy-Enabled">1</bool>
-                                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                                <string name="proxy-Data variable">""</string>
-                                <string name="proxy-Data validator">""</string>
-                                <string name="proxy-Data source">""</string>
-                                <string name="proxy-Data class name">""</string>
-                                <string name="proxy-Data class implementation filename">""</string>
-                                <string name="proxy-Data class header filename">""</string>
-                                <string name="proxy-Data class manager window">""</string>
-                                <bool name="proxy-wxTE_MULTILINE">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                                <bool name="proxy-wxTE_PASSWORD">0</bool>
-                                <bool name="proxy-wxTE_READONLY">0</bool>
-                                <bool name="proxy-wxTE_RICH">0</bool>
-                                <bool name="proxy-wxTE_RICH2">0</bool>
-                                <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                                <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                                <bool name="proxy-wxTE_LEFT">0</bool>
-                                <bool name="proxy-wxTE_CENTRE">0</bool>
-                                <bool name="proxy-wxTE_RIGHT">0</bool>
-                                <bool name="proxy-wxHSCROLL">0</bool>
-                                <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                                <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                                <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                                <bool name="proxy-wxNO_BORDER">0</bool>
-                                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                                <bool name="proxy-wxBORDER_THEME">0</bool>
-                                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                                <string name="proxy-Custom styles">""</string>
-                                <long name="proxy-X">-1</long>
-                                <long name="proxy-Y">-1</long>
-                                <long name="proxy-Width">50</long>
-                                <long name="proxy-Height">-1</long>
-                                <string name="proxy-AlignH">"Centre"</string>
-                                <string name="proxy-AlignV">"Centre"</string>
-                                <long name="proxy-Stretch factor">0</long>
-                                <long name="proxy-Border">5</long>
-                                <bool name="proxy-wxLEFT">1</bool>
-                                <bool name="proxy-wxRIGHT">1</bool>
-                                <bool name="proxy-wxTOP">1</bool>
-                                <bool name="proxy-wxBOTTOM">1</bool>
-                                <bool name="proxy-wxSHAPED">0</bool>
-                                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                                <string name="proxy-Custom arguments">""</string>
-                                <string name="proxy-Custom ctor arguments">""</string>
-                                <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                              </document>
+                              <string name="proxy-Custom arguments">""</string>
+                              <string name="proxy-Custom ctor arguments">""</string>

                             </document>
                             <document>
                             </document>
                             <document>

-                              <string name="title">"wxStaticText: wxID_STATIC"</string>
+                              <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT"</string>

                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>
                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>

-                              <string name="icon-name">"statictext"</string>
+                              <string name="icon-name">"textctrl"</string>

                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>
-                              <string name="proxy-type">"wbStaticTextProxy"</string>
-                              <string name="proxy-Id name">"wxID_STATIC"</string>
-                              <long name="proxy-Id value">5105</long>
+                              <string name="proxy-type">"wbTextCtrlProxy"</string>
+                              <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated"</string>
+                              <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT"</string>
+                              <long name="proxy-Id value">10636</long>

                               <string name="proxy-Name">""</string>
                               <string name="proxy-Name">""</string>

-                              <string name="proxy-Class">"wxStaticText"</string>
-                              <string name="proxy-Base class">"wxStaticText"</string>
+                              <string name="proxy-Class">"wxTextCtrl"</string>
+                              <string name="proxy-Base class">"wxTextCtrl"</string>

                               <bool name="proxy-External implementation">1</bool>
                               <bool name="proxy-Separate files">0</bool>
                               <string name="proxy-Implementation filename">""</string>
                               <string name="proxy-Header filename">""</string>
                               <bool name="proxy-External implementation">1</bool>
                               <bool name="proxy-Separate files">0</bool>
                               <string name="proxy-Implementation filename">""</string>
                               <string name="proxy-Header filename">""</string>

-                              <string name="proxy-Member variable name">""</string>
-                              <string name="proxy-Label">"&amp;Right:"</string>
-                              <long name="proxy-Wrapping width">-1</long>
-                              <string name="proxy-Help text">""</string>
+                              <string name="proxy-Member variable name">"m_indentRight"</string>
+                              <string name="proxy-Initial value">""</string>
+                              <long name="proxy-Max length">0</long>
+                              <string name="proxy-Help text">"The right indent."</string>

                               <string name="proxy-Tooltip text">""</string>
                               <string name="proxy-Background colour">""</string>
                               <string name="proxy-Foreground colour">""</string>
                               <string name="proxy-Tooltip text">""</string>
                               <string name="proxy-Background colour">""</string>
                               <string name="proxy-Foreground colour">""</string>


@@ -13615,10 +13456,22 @@
                               <string name="proxy-Data class implementation filename">""</string>
                               <string name="proxy-Data class header filename">""</string>
                               <string name="proxy-Data class manager window">""</string>
                               <string name="proxy-Data class implementation filename">""</string>
                               <string name="proxy-Data class header filename">""</string>
                               <string name="proxy-Data class manager window">""</string>

-                              <bool name="proxy-wxALIGN_LEFT">0</bool>
-                              <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                              <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                              <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
+                              <bool name="proxy-wxTE_MULTILINE">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                              <bool name="proxy-wxTE_PASSWORD">0</bool>
+                              <bool name="proxy-wxTE_READONLY">0</bool>
+                              <bool name="proxy-wxTE_RICH">0</bool>
+                              <bool name="proxy-wxTE_RICH2">0</bool>
+                              <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                              <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                              <bool name="proxy-wxTE_LEFT">0</bool>
+                              <bool name="proxy-wxTE_CENTRE">0</bool>
+                              <bool name="proxy-wxTE_RIGHT">0</bool>
+                              <bool name="proxy-wxHSCROLL">0</bool>
+                              <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                              <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                              <bool name="proxy-wxTE_CAPITALIZE">0</bool>

                               <bool name="proxy-wxNO_BORDER">0</bool>
                               <bool name="proxy-wxSIMPLE_BORDER">0</bool>
                               <bool name="proxy-wxDOUBLE_BORDER">0</bool>
                               <bool name="proxy-wxNO_BORDER">0</bool>
                               <bool name="proxy-wxSIMPLE_BORDER">0</bool>
                               <bool name="proxy-wxDOUBLE_BORDER">0</bool>


@@ -13632,9 +13485,9 @@
                               <string name="proxy-Custom styles">""</string>
                               <long name="proxy-X">-1</long>
                               <long name="proxy-Y">-1</long>
                               <string name="proxy-Custom styles">""</string>
                               <long name="proxy-X">-1</long>
                               <long name="proxy-Y">-1</long>

-                              <long name="proxy-Width">-1</long>
+                              <long name="proxy-Width">50</long>

                               <long name="proxy-Height">-1</long>
                               <long name="proxy-Height">-1</long>

-                              <string name="proxy-AlignH">"Right"</string>
+                              <string name="proxy-AlignH">"Expand"</string>

                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>
                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>


@@ -13648,117 +13501,6 @@
                               <string name="proxy-Custom arguments">""</string>
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                               <string name="proxy-Custom arguments">""</string>
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>

-                            <document>
-                              <string name="title">"wxBoxSizer H"</string>
-                              <string name="type">"dialog-control-document"</string>
-                              <string name="filename">""</string>
-                              <string name="icon-name">"sizer"</string>
-                              <long name="is-transient">0</long>
-                              <long name="owns-file">1</long>
-                              <long name="title-mode">0</long>
-                              <long name="locked">0</long>
-                              <string name="created">"18/10/2006"</string>
-                              <string name="proxy-type">"wbBoxSizerProxy"</string>
-                              <string name="proxy-Orientation">"Horizontal"</string>
-                              <string name="proxy-Member variable name">""</string>
-                              <string name="proxy-AlignH">"Centre"</string>
-                              <string name="proxy-AlignV">"Centre"</string>
-                              <long name="proxy-Stretch factor">0</long>
-                              <long name="proxy-Border">5</long>
-                              <bool name="proxy-wxLEFT">0</bool>
-                              <bool name="proxy-wxRIGHT">0</bool>
-                              <bool name="proxy-wxTOP">0</bool>
-                              <bool name="proxy-wxBOTTOM">0</bool>
-                              <bool name="proxy-wxSHAPED">0</bool>
-                              <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                              <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                              <document>
-                                <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT"</string>
-                                <string name="type">"dialog-control-document"</string>
-                                <string name="filename">""</string>
-                                <string name="icon-name">"textctrl"</string>
-                                <long name="is-transient">0</long>
-                                <long name="owns-file">1</long>
-                                <long name="title-mode">0</long>
-                                <long name="locked">0</long>
-                                <string name="created">"18/10/2006"</string>
-                                <string name="proxy-type">"wbTextCtrlProxy"</string>
-                                <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated"</string>
-                                <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT"</string>
-                                <long name="proxy-Id value">10636</long>
-                                <string name="proxy-Name">""</string>
-                                <string name="proxy-Class">"wxTextCtrl"</string>
-                                <string name="proxy-Base class">"wxTextCtrl"</string>
-                                <bool name="proxy-External implementation">1</bool>
-                                <bool name="proxy-Separate files">0</bool>
-                                <string name="proxy-Implementation filename">""</string>
-                                <string name="proxy-Header filename">""</string>
-                                <string name="proxy-Member variable name">"m_indentRight"</string>
-                                <string name="proxy-Initial value">""</string>
-                                <long name="proxy-Max length">0</long>
-                                <string name="proxy-Help text">"The right indent."</string>
-                                <string name="proxy-Tooltip text">""</string>
-                                <string name="proxy-Background colour">""</string>
-                                <string name="proxy-Foreground colour">""</string>
-                                <string name="proxy-Font">""</string>
-                                <bool name="proxy-Hidden">0</bool>
-                                <bool name="proxy-Enabled">1</bool>
-                                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                                <string name="proxy-Data variable">""</string>
-                                <string name="proxy-Data validator">""</string>
-                                <string name="proxy-Data source">""</string>
-                                <string name="proxy-Data class name">""</string>
-                                <string name="proxy-Data class implementation filename">""</string>
-                                <string name="proxy-Data class header filename">""</string>
-                                <string name="proxy-Data class manager window">""</string>
-                                <bool name="proxy-wxTE_MULTILINE">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                                <bool name="proxy-wxTE_PASSWORD">0</bool>
-                                <bool name="proxy-wxTE_READONLY">0</bool>
-                                <bool name="proxy-wxTE_RICH">0</bool>
-                                <bool name="proxy-wxTE_RICH2">0</bool>
-                                <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                                <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                                <bool name="proxy-wxTE_LEFT">0</bool>
-                                <bool name="proxy-wxTE_CENTRE">0</bool>
-                                <bool name="proxy-wxTE_RIGHT">0</bool>
-                                <bool name="proxy-wxHSCROLL">0</bool>
-                                <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                                <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                                <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                                <bool name="proxy-wxNO_BORDER">0</bool>
-                                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                                <bool name="proxy-wxBORDER_THEME">0</bool>
-                                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                                <string name="proxy-Custom styles">""</string>
-                                <long name="proxy-X">-1</long>
-                                <long name="proxy-Y">-1</long>
-                                <long name="proxy-Width">50</long>
-                                <long name="proxy-Height">-1</long>
-                                <string name="proxy-AlignH">"Centre"</string>
-                                <string name="proxy-AlignV">"Centre"</string>
-                                <long name="proxy-Stretch factor">0</long>
-                                <long name="proxy-Border">5</long>
-                                <bool name="proxy-wxLEFT">1</bool>
-                                <bool name="proxy-wxRIGHT">1</bool>
-                                <bool name="proxy-wxTOP">1</bool>
-                                <bool name="proxy-wxBOTTOM">1</bool>
-                                <bool name="proxy-wxSHAPED">0</bool>
-                                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                                <string name="proxy-Custom arguments">""</string>
-                                <string name="proxy-Custom ctor arguments">""</string>
-                                <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                              </document>
-                            </document>

                           </document>
                         </document>
                       </document>
                           </document>
                         </document>
                       </document>


@@ -14056,7 +13798,6 @@
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>

                               <string name="proxy-type">"wbStaticTextProxy"</string>
                               <string name="proxy-Id name">"wxID_STATIC"</string>
                               <long name="proxy-Id value">5105</long>
                               <string name="proxy-type">"wbStaticTextProxy"</string>
                               <string name="proxy-Id name">"wxID_STATIC"</string>
                               <long name="proxy-Id value">5105</long>


@@ -14119,115 +13860,87 @@
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>

-                              <string name="title">"wxBoxSizer H"</string>
+                              <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE"</string>

                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>
                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>

-                              <string name="icon-name">"sizer"</string>
+                              <string name="icon-name">"textctrl"</string>

                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>
-                              <string name="proxy-type">"wbBoxSizerProxy"</string>
-                              <string name="proxy-Orientation">"Horizontal"</string>
-                              <string name="proxy-Member variable name">""</string>
-                              <string name="proxy-AlignH">"Centre"</string>
+                              <string name="proxy-type">"wbTextCtrlProxy"</string>
+                              <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated"</string>
+                              <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE"</string>
+                              <long name="proxy-Id value">10637</long>
+                              <string name="proxy-Name">""</string>
+                              <string name="proxy-Class">"wxTextCtrl"</string>
+                              <string name="proxy-Base class">"wxTextCtrl"</string>
+                              <bool name="proxy-External implementation">1</bool>
+                              <bool name="proxy-Separate files">0</bool>
+                              <string name="proxy-Implementation filename">""</string>
+                              <string name="proxy-Header filename">""</string>
+                              <string name="proxy-Member variable name">"m_spacingBefore"</string>
+                              <string name="proxy-Initial value">""</string>
+                              <long name="proxy-Max length">0</long>
+                              <string name="proxy-Help text">"The spacing before the paragraph."</string>
+                              <string name="proxy-Tooltip text">""</string>
+                              <string name="proxy-Background colour">""</string>
+                              <string name="proxy-Foreground colour">""</string>
+                              <string name="proxy-Font">""</string>
+                              <bool name="proxy-Hidden">0</bool>
+                              <bool name="proxy-Enabled">1</bool>
+                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                              <string name="proxy-Data variable">""</string>
+                              <string name="proxy-Data validator">""</string>
+                              <string name="proxy-Data source">""</string>
+                              <string name="proxy-Data class name">""</string>
+                              <string name="proxy-Data class implementation filename">""</string>
+                              <string name="proxy-Data class header filename">""</string>
+                              <string name="proxy-Data class manager window">""</string>
+                              <bool name="proxy-wxTE_MULTILINE">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                              <bool name="proxy-wxTE_PASSWORD">0</bool>
+                              <bool name="proxy-wxTE_READONLY">0</bool>
+                              <bool name="proxy-wxTE_RICH">0</bool>
+                              <bool name="proxy-wxTE_RICH2">0</bool>
+                              <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                              <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                              <bool name="proxy-wxTE_LEFT">0</bool>
+                              <bool name="proxy-wxTE_CENTRE">0</bool>
+                              <bool name="proxy-wxTE_RIGHT">0</bool>
+                              <bool name="proxy-wxHSCROLL">0</bool>
+                              <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                              <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                              <bool name="proxy-wxTE_CAPITALIZE">0</bool>
+                              <bool name="proxy-wxNO_BORDER">0</bool>
+                              <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                              <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                              <bool name="proxy-wxBORDER_THEME">0</bool>
+                              <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                              <bool name="proxy-wxRAISED_BORDER">0</bool>
+                              <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                              <bool name="proxy-wxWANTS_CHARS">0</bool>
+                              <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                              <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                              <string name="proxy-Custom styles">""</string>
+                              <long name="proxy-X">-1</long>
+                              <long name="proxy-Y">-1</long>
+                              <long name="proxy-Width">50</long>
+                              <long name="proxy-Height">-1</long>
+                              <string name="proxy-AlignH">"Expand"</string>

                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>
                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>

-                              <bool name="proxy-wxLEFT">0</bool>
-                              <bool name="proxy-wxRIGHT">0</bool>
-                              <bool name="proxy-wxTOP">0</bool>
-                              <bool name="proxy-wxBOTTOM">0</bool>
+                              <bool name="proxy-wxLEFT">1</bool>
+                              <bool name="proxy-wxRIGHT">1</bool>
+                              <bool name="proxy-wxTOP">1</bool>
+                              <bool name="proxy-wxBOTTOM">1</bool>

                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                              <document>
-                                <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE"</string>
-                                <string name="type">"dialog-control-document"</string>
-                                <string name="filename">""</string>
-                                <string name="icon-name">"textctrl"</string>
-                                <long name="is-transient">0</long>
-                                <long name="owns-file">1</long>
-                                <long name="title-mode">0</long>
-                                <long name="locked">0</long>
-                                <string name="created">"18/10/2006"</string>
-                                <string name="proxy-type">"wbTextCtrlProxy"</string>
-                                <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated"</string>
-                                <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE"</string>
-                                <long name="proxy-Id value">10637</long>
-                                <string name="proxy-Name">""</string>
-                                <string name="proxy-Class">"wxTextCtrl"</string>
-                                <string name="proxy-Base class">"wxTextCtrl"</string>
-                                <bool name="proxy-External implementation">1</bool>
-                                <bool name="proxy-Separate files">0</bool>
-                                <string name="proxy-Implementation filename">""</string>
-                                <string name="proxy-Header filename">""</string>
-                                <string name="proxy-Member variable name">"m_spacingBefore"</string>
-                                <string name="proxy-Initial value">""</string>
-                                <long name="proxy-Max length">0</long>
-                                <string name="proxy-Help text">"The spacing before the paragraph."</string>
-                                <string name="proxy-Tooltip text">""</string>
-                                <string name="proxy-Background colour">""</string>
-                                <string name="proxy-Foreground colour">""</string>
-                                <string name="proxy-Font">""</string>
-                                <bool name="proxy-Hidden">0</bool>
-                                <bool name="proxy-Enabled">1</bool>
-                                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                                <string name="proxy-Data variable">""</string>
-                                <string name="proxy-Data validator">""</string>
-                                <string name="proxy-Data source">""</string>
-                                <string name="proxy-Data class name">""</string>
-                                <string name="proxy-Data class implementation filename">""</string>
-                                <string name="proxy-Data class header filename">""</string>
-                                <string name="proxy-Data class manager window">""</string>
-                                <bool name="proxy-wxTE_MULTILINE">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                                <bool name="proxy-wxTE_PASSWORD">0</bool>
-                                <bool name="proxy-wxTE_READONLY">0</bool>
-                                <bool name="proxy-wxTE_RICH">0</bool>
-                                <bool name="proxy-wxTE_RICH2">0</bool>
-                                <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                                <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                                <bool name="proxy-wxTE_LEFT">0</bool>
-                                <bool name="proxy-wxTE_CENTRE">0</bool>
-                                <bool name="proxy-wxTE_RIGHT">0</bool>
-                                <bool name="proxy-wxHSCROLL">0</bool>
-                                <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                                <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                                <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                                <bool name="proxy-wxNO_BORDER">0</bool>
-                                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                                <bool name="proxy-wxBORDER_THEME">0</bool>
-                                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                                <string name="proxy-Custom styles">""</string>
-                                <long name="proxy-X">-1</long>
-                                <long name="proxy-Y">-1</long>
-                                <long name="proxy-Width">50</long>
-                                <long name="proxy-Height">-1</long>
-                                <string name="proxy-AlignH">"Centre"</string>
-                                <string name="proxy-AlignV">"Centre"</string>
-                                <long name="proxy-Stretch factor">0</long>
-                                <long name="proxy-Border">5</long>
-                                <bool name="proxy-wxLEFT">1</bool>
-                                <bool name="proxy-wxRIGHT">1</bool>
-                                <bool name="proxy-wxTOP">1</bool>
-                                <bool name="proxy-wxBOTTOM">1</bool>
-                                <bool name="proxy-wxSHAPED">0</bool>
-                                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                                <string name="proxy-Custom arguments">""</string>
-                                <string name="proxy-Custom ctor arguments">""</string>
-                                <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                              </document>
+                              <string name="proxy-Custom arguments">""</string>
+                              <string name="proxy-Custom ctor arguments">""</string>

                             </document>
                             <document>
                               <string name="title">"wxStaticText: wxID_STATIC"</string>
                             </document>
                             <document>
                               <string name="title">"wxStaticText: wxID_STATIC"</string>


@@ -14238,7 +13951,6 @@
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>

                               <string name="proxy-type">"wbStaticTextProxy"</string>
                               <string name="proxy-Id name">"wxID_STATIC"</string>
                               <long name="proxy-Id value">5105</long>
                               <string name="proxy-type">"wbStaticTextProxy"</string>
                               <string name="proxy-Id name">"wxID_STATIC"</string>
                               <long name="proxy-Id value">5105</long>


@@ -14301,115 +14013,87 @@
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>

-                              <string name="title">"wxBoxSizer H"</string>
+                              <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER"</string>

                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>
                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>

-                              <string name="icon-name">"sizer"</string>
+                              <string name="icon-name">"textctrl"</string>

                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>
-                              <string name="proxy-type">"wbBoxSizerProxy"</string>
-                              <string name="proxy-Orientation">"Horizontal"</string>
-                              <string name="proxy-Member variable name">""</string>
-                              <string name="proxy-AlignH">"Centre"</string>
+                              <string name="proxy-type">"wbTextCtrlProxy"</string>
+                              <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated"</string>
+                              <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER"</string>
+                              <long name="proxy-Id value">10638</long>
+                              <string name="proxy-Name">""</string>
+                              <string name="proxy-Class">"wxTextCtrl"</string>
+                              <string name="proxy-Base class">"wxTextCtrl"</string>
+                              <bool name="proxy-External implementation">1</bool>
+                              <bool name="proxy-Separate files">0</bool>
+                              <string name="proxy-Implementation filename">""</string>
+                              <string name="proxy-Header filename">""</string>
+                              <string name="proxy-Member variable name">"m_spacingAfter"</string>
+                              <string name="proxy-Initial value">""</string>
+                              <long name="proxy-Max length">0</long>
+                              <string name="proxy-Help text">"The spacing after the paragraph."</string>
+                              <string name="proxy-Tooltip text">""</string>
+                              <string name="proxy-Background colour">""</string>
+                              <string name="proxy-Foreground colour">""</string>
+                              <string name="proxy-Font">""</string>
+                              <bool name="proxy-Hidden">0</bool>
+                              <bool name="proxy-Enabled">1</bool>
+                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                              <string name="proxy-Data variable">""</string>
+                              <string name="proxy-Data validator">""</string>
+                              <string name="proxy-Data source">""</string>
+                              <string name="proxy-Data class name">""</string>
+                              <string name="proxy-Data class implementation filename">""</string>
+                              <string name="proxy-Data class header filename">""</string>
+                              <string name="proxy-Data class manager window">""</string>
+                              <bool name="proxy-wxTE_MULTILINE">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
+                              <bool name="proxy-wxTE_PASSWORD">0</bool>
+                              <bool name="proxy-wxTE_READONLY">0</bool>
+                              <bool name="proxy-wxTE_RICH">0</bool>
+                              <bool name="proxy-wxTE_RICH2">0</bool>
+                              <bool name="proxy-wxTE_AUTO_URL">0</bool>
+                              <bool name="proxy-wxTE_NOHIDESEL">0</bool>
+                              <bool name="proxy-wxTE_LEFT">0</bool>
+                              <bool name="proxy-wxTE_CENTRE">0</bool>
+                              <bool name="proxy-wxTE_RIGHT">0</bool>
+                              <bool name="proxy-wxHSCROLL">0</bool>
+                              <bool name="proxy-wxTE_CHARWRAP">0</bool>
+                              <bool name="proxy-wxTE_WORDWRAP">0</bool>
+                              <bool name="proxy-wxTE_CAPITALIZE">0</bool>
+                              <bool name="proxy-wxNO_BORDER">0</bool>
+                              <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                              <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                              <bool name="proxy-wxBORDER_THEME">0</bool>
+                              <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                              <bool name="proxy-wxRAISED_BORDER">0</bool>
+                              <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                              <bool name="proxy-wxWANTS_CHARS">0</bool>
+                              <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                              <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                              <string name="proxy-Custom styles">""</string>
+                              <long name="proxy-X">-1</long>
+                              <long name="proxy-Y">-1</long>
+                              <long name="proxy-Width">50</long>
+                              <long name="proxy-Height">-1</long>
+                              <string name="proxy-AlignH">"Expand"</string>

                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>
                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>

-                              <bool name="proxy-wxLEFT">0</bool>
-                              <bool name="proxy-wxRIGHT">0</bool>
-                              <bool name="proxy-wxTOP">0</bool>
-                              <bool name="proxy-wxBOTTOM">0</bool>
+                              <bool name="proxy-wxLEFT">1</bool>
+                              <bool name="proxy-wxRIGHT">1</bool>
+                              <bool name="proxy-wxTOP">1</bool>
+                              <bool name="proxy-wxBOTTOM">1</bool>

                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                              <document>
-                                <string name="title">"wxTextCtrl: ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER"</string>
-                                <string name="type">"dialog-control-document"</string>
-                                <string name="filename">""</string>
-                                <string name="icon-name">"textctrl"</string>
-                                <long name="is-transient">0</long>
-                                <long name="owns-file">1</long>
-                                <long name="title-mode">0</long>
-                                <long name="locked">0</long>
-                                <string name="created">"18/10/2006"</string>
-                                <string name="proxy-type">"wbTextCtrlProxy"</string>
-                                <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated"</string>
-                                <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER"</string>
-                                <long name="proxy-Id value">10638</long>
-                                <string name="proxy-Name">""</string>
-                                <string name="proxy-Class">"wxTextCtrl"</string>
-                                <string name="proxy-Base class">"wxTextCtrl"</string>
-                                <bool name="proxy-External implementation">1</bool>
-                                <bool name="proxy-Separate files">0</bool>
-                                <string name="proxy-Implementation filename">""</string>
-                                <string name="proxy-Header filename">""</string>
-                                <string name="proxy-Member variable name">"m_spacingAfter"</string>
-                                <string name="proxy-Initial value">""</string>
-                                <long name="proxy-Max length">0</long>
-                                <string name="proxy-Help text">"The spacing after the paragraph."</string>
-                                <string name="proxy-Tooltip text">""</string>
-                                <string name="proxy-Background colour">""</string>
-                                <string name="proxy-Foreground colour">""</string>
-                                <string name="proxy-Font">""</string>
-                                <bool name="proxy-Hidden">0</bool>
-                                <bool name="proxy-Enabled">1</bool>
-                                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                                <string name="proxy-Data variable">""</string>
-                                <string name="proxy-Data validator">""</string>
-                                <string name="proxy-Data source">""</string>
-                                <string name="proxy-Data class name">""</string>
-                                <string name="proxy-Data class implementation filename">""</string>
-                                <string name="proxy-Data class header filename">""</string>
-                                <string name="proxy-Data class manager window">""</string>
-                                <bool name="proxy-wxTE_MULTILINE">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                                <bool name="proxy-wxTE_PASSWORD">0</bool>
-                                <bool name="proxy-wxTE_READONLY">0</bool>
-                                <bool name="proxy-wxTE_RICH">0</bool>
-                                <bool name="proxy-wxTE_RICH2">0</bool>
-                                <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                                <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                                <bool name="proxy-wxTE_LEFT">0</bool>
-                                <bool name="proxy-wxTE_CENTRE">0</bool>
-                                <bool name="proxy-wxTE_RIGHT">0</bool>
-                                <bool name="proxy-wxHSCROLL">0</bool>
-                                <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                                <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                                <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                                <bool name="proxy-wxNO_BORDER">0</bool>
-                                <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                                <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                                <bool name="proxy-wxBORDER_THEME">0</bool>
-                                <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                                <bool name="proxy-wxRAISED_BORDER">0</bool>
-                                <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                                <string name="proxy-Custom styles">""</string>
-                                <long name="proxy-X">-1</long>
-                                <long name="proxy-Y">-1</long>
-                                <long name="proxy-Width">50</long>
-                                <long name="proxy-Height">-1</long>
-                                <string name="proxy-AlignH">"Centre"</string>
-                                <string name="proxy-AlignV">"Centre"</string>
-                                <long name="proxy-Stretch factor">0</long>
-                                <long name="proxy-Border">5</long>
-                                <bool name="proxy-wxLEFT">1</bool>
-                                <bool name="proxy-wxRIGHT">1</bool>
-                                <bool name="proxy-wxTOP">1</bool>
-                                <bool name="proxy-wxBOTTOM">1</bool>
-                                <bool name="proxy-wxSHAPED">0</bool>
-                                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                                <string name="proxy-Custom arguments">""</string>
-                                <string name="proxy-Custom ctor arguments">""</string>
-                                <bool name="proxy-wxTE_LINEWRAP">0</bool>
-                              </document>
+                              <string name="proxy-Custom arguments">""</string>
+                              <string name="proxy-Custom ctor arguments">""</string>

                             </document>
                             <document>
                               <string name="title">"wxStaticText: wxID_STATIC"</string>
                             </document>
                             <document>
                               <string name="title">"wxStaticText: wxID_STATIC"</string>


@@ -14483,96 +14167,69 @@
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>
                               <string name="proxy-Custom ctor arguments">""</string>
                             </document>
                             <document>

-                              <string name="title">"wxBoxSizer H"</string>
+                              <string name="title">"wxComboBox: ID_RICHTEXTLISTSTYLEPAGE_LINESPACING"</string>

                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>
                               <string name="type">"dialog-control-document"</string>
                               <string name="filename">""</string>

-                              <string name="icon-name">"sizer"</string>
+                              <string name="icon-name">"combobox"</string>

                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>
                               <long name="is-transient">0</long>
                               <long name="owns-file">1</long>
                               <long name="title-mode">0</long>
                               <long name="locked">0</long>

-                              <string name="created">"18/10/2006"</string>
-                              <string name="proxy-type">"wbBoxSizerProxy"</string>
-                              <string name="proxy-Orientation">"Horizontal"</string>
-                              <string name="proxy-Member variable name">""</string>
-                              <string name="proxy-AlignH">"Centre"</string>
+                              <string name="proxy-type">"wbComboBoxProxy"</string>
+                              <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnLineSpacingSelected"</string>
+                              <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_LINESPACING"</string>
+                              <long name="proxy-Id value">10639</long>
+                              <string name="proxy-Name">""</string>
+                              <string name="proxy-Class">"wxComboBox"</string>
+                              <string name="proxy-Base class">"wxComboBox"</string>
+                              <bool name="proxy-External implementation">1</bool>
+                              <bool name="proxy-Separate files">0</bool>
+                              <string name="proxy-Implementation filename">""</string>
+                              <string name="proxy-Header filename">""</string>
+                              <string name="proxy-Member variable name">"m_spacingLine"</string>
+                              <string name="proxy-Strings">"(none)|Single|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2"</string>
+                              <string name="proxy-Initial value">"(none)"</string>
+                              <string name="proxy-Help text">"The line spacing."</string>
+                              <string name="proxy-Tooltip text">""</string>
+                              <string name="proxy-Background colour">""</string>
+                              <string name="proxy-Foreground colour">""</string>
+                              <string name="proxy-Font">""</string>
+                              <bool name="proxy-Hidden">0</bool>
+                              <bool name="proxy-Enabled">1</bool>
+                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                              <string name="proxy-Data variable">""</string>
+                              <string name="proxy-Data validator">""</string>
+                              <string name="proxy-Data source">""</string>
+                              <string name="proxy-Data class name">""</string>
+                              <string name="proxy-Data class implementation filename">""</string>
+                              <string name="proxy-Data class header filename">""</string>
+                              <string name="proxy-Data class manager window">""</string>
+                              <bool name="proxy-wxCB_SIMPLE">0</bool>
+                              <bool name="proxy-wxCB_DROPDOWN">0</bool>
+                              <bool name="proxy-wxCB_READONLY">1</bool>
+                              <bool name="proxy-wxCB_SORT">0</bool>
+                              <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                              <bool name="proxy-wxWANTS_CHARS">0</bool>
+                              <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                              <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                              <string name="proxy-Custom styles">""</string>
+                              <long name="proxy-X">-1</long>
+                              <long name="proxy-Y">-1</long>
+                              <long name="proxy-Width">85</long>
+                              <long name="proxy-Height">-1</long>
+                              <string name="proxy-AlignH">"Expand"</string>

                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>
                               <string name="proxy-AlignV">"Centre"</string>
                               <long name="proxy-Stretch factor">0</long>
                               <long name="proxy-Border">5</long>

-                              <bool name="proxy-wxLEFT">0</bool>
-                              <bool name="proxy-wxRIGHT">0</bool>
-                              <bool name="proxy-wxTOP">0</bool>
-                              <bool name="proxy-wxBOTTOM">0</bool>
+                              <bool name="proxy-wxLEFT">1</bool>
+                              <bool name="proxy-wxRIGHT">1</bool>
+                              <bool name="proxy-wxTOP">1</bool>
+                              <bool name="proxy-wxBOTTOM">1</bool>

                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                               <bool name="proxy-wxSHAPED">0</bool>
                               <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                               <bool name="proxy-wxFIXED_MINSIZE">0</bool>

-                              <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                              <document>
-                                <string name="title">"wxComboBox: ID_RICHTEXTLISTSTYLEPAGE_LINESPACING"</string>
-                                <string name="type">"dialog-control-document"</string>
-                                <string name="filename">""</string>
-                                <string name="icon-name">"combobox"</string>
-                                <long name="is-transient">0</long>
-                                <long name="owns-file">1</long>
-                                <long name="title-mode">0</long>
-                                <long name="locked">0</long>
-                                <string name="created">"18/10/2006"</string>
-                                <string name="proxy-type">"wbComboBoxProxy"</string>
-                                <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnLineSpacingSelected"</string>
-                                <string name="proxy-Id name">"ID_RICHTEXTLISTSTYLEPAGE_LINESPACING"</string>
-                                <long name="proxy-Id value">10639</long>
-                                <string name="proxy-Name">""</string>
-                                <string name="proxy-Class">"wxComboBox"</string>
-                                <string name="proxy-Base class">"wxComboBox"</string>
-                                <bool name="proxy-External implementation">1</bool>
-                                <bool name="proxy-Separate files">0</bool>
-                                <string name="proxy-Implementation filename">""</string>
-                                <string name="proxy-Header filename">""</string>
-                                <string name="proxy-Member variable name">"m_spacingLine"</string>
-                                <string name="proxy-Strings">"Single|1.5|2"</string>
-                                <string name="proxy-Initial value">"Single"</string>
-                                <string name="proxy-Help text">"The line spacing."</string>
-                                <string name="proxy-Tooltip text">""</string>
-                                <string name="proxy-Background colour">""</string>
-                                <string name="proxy-Foreground colour">""</string>
-                                <string name="proxy-Font">""</string>
-                                <bool name="proxy-Hidden">0</bool>
-                                <bool name="proxy-Enabled">1</bool>
-                                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                                <string name="proxy-Data variable">""</string>
-                                <string name="proxy-Data validator">""</string>
-                                <string name="proxy-Data source">""</string>
-                                <string name="proxy-Data class name">""</string>
-                                <string name="proxy-Data class implementation filename">""</string>
-                                <string name="proxy-Data class header filename">""</string>
-                                <string name="proxy-Data class manager window">""</string>
-                                <bool name="proxy-wxCB_SIMPLE">0</bool>
-                                <bool name="proxy-wxCB_DROPDOWN">0</bool>
-                                <bool name="proxy-wxCB_READONLY">1</bool>
-                                <bool name="proxy-wxCB_SORT">0</bool>
-                                <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                                <bool name="proxy-wxWANTS_CHARS">0</bool>
-                                <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                                <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                                <string name="proxy-Custom styles">""</string>
-                                <long name="proxy-X">-1</long>
-                                <long name="proxy-Y">-1</long>
-                                <long name="proxy-Width">-1</long>
-                                <long name="proxy-Height">-1</long>
-                                <string name="proxy-AlignH">"Centre"</string>
-                                <string name="proxy-AlignV">"Centre"</string>
-                                <long name="proxy-Stretch factor">0</long>
-                                <long name="proxy-Border">5</long>
-                                <bool name="proxy-wxLEFT">1</bool>
-                                <bool name="proxy-wxRIGHT">1</bool>
-                                <bool name="proxy-wxTOP">1</bool>
-                                <bool name="proxy-wxBOTTOM">1</bool>
-                                <bool name="proxy-wxSHAPED">0</bool>
-                                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                                <string name="proxy-Custom arguments">""</string>
-                                <string name="proxy-Custom ctor arguments">""</string>
-                              </document>
+                              <string name="proxy-Custom arguments">""</string>
+                              <string name="proxy-Custom ctor arguments">""</string>

                             </document>
                           </document>
                         </document>
                             </document>
                           </document>
                         </document>


@@ -14851,6 +14508,14 @@
             <string name="proxy-type">"wbBoxSizerProxy"</string>
             <string name="proxy-Orientation">"Vertical"</string>
             <string name="proxy-Member variable name">""</string>
             <string name="proxy-type">"wbBoxSizerProxy"</string>
             <string name="proxy-Orientation">"Vertical"</string>
             <string name="proxy-Member variable name">""</string>

+            <string name="proxy-AlignH">"Centre"</string>
+            <string name="proxy-AlignV">"Centre"</string>
+            <long name="proxy-Stretch factor">0</long>
+            <long name="proxy-Border">5</long>
+            <bool name="proxy-wxLEFT">1</bool>
+            <bool name="proxy-wxRIGHT">1</bool>
+            <bool name="proxy-wxTOP">1</bool>
+            <bool name="proxy-wxBOTTOM">1</bool>

             <bool name="proxy-wxSHAPED">0</bool>
             <bool name="proxy-wxADJUST_MINSIZE">0</bool>
             <bool name="proxy-wxFIXED_MINSIZE">0</bool>
             <bool name="proxy-wxSHAPED">0</bool>
             <bool name="proxy-wxADJUST_MINSIZE">0</bool>
             <bool name="proxy-wxFIXED_MINSIZE">0</bool>

diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp
index f73bb162117faac8ef92e485d7c461f4e9e32371..626de8d2d1abe969c5dc6dc269bdab659a2ad2ff 100644 (file)
--- a/src/richtext/richtextindentspage.cpp
+++ b/src/richtext/richtextindentspage.cpp
@@ -207,44 +207,35 @@ void wxRichTextIndentsSpacingPage::CreateControls()
     wxStaticText* itemStaticText23 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemFlexGridSizer22->Add(itemStaticText23, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxStaticText* itemStaticText23 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemFlexGridSizer22->Add(itemStaticText23, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 

-    wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer22->Add(itemBoxSizer24, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
-

     m_indentLeft = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentLeft->SetHelpText(_("The left indent."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_indentLeft->SetToolTip(_("The left indent."));
     m_indentLeft = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentLeft->SetHelpText(_("The left indent."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_indentLeft->SetToolTip(_("The left indent."));

-    itemBoxSizer24->Add(m_indentLeft, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-    wxStaticText* itemStaticText26 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer22->Add(itemStaticText26, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer22->Add(m_indentLeft, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxBoxSizer* itemBoxSizer27 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer22->Add(itemBoxSizer27, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
+    wxStaticText* itemStaticText25 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer22->Add(itemStaticText25, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     m_indentLeftFirst = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentLeftFirst->SetHelpText(_("The first line indent."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_indentLeftFirst->SetToolTip(_("The first line indent."));
 
     m_indentLeftFirst = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentLeftFirst->SetHelpText(_("The first line indent."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_indentLeftFirst->SetToolTip(_("The first line indent."));

-    itemBoxSizer27->Add(m_indentLeftFirst, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-    wxStaticText* itemStaticText29 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer22->Add(itemStaticText29, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer22->Add(m_indentLeftFirst, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer22->Add(itemBoxSizer30, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
+    wxStaticText* itemStaticText27 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer22->Add(itemStaticText27, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     m_indentRight = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentRight->SetHelpText(_("The right indent."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_indentRight->SetToolTip(_("The right indent."));
 
     m_indentRight = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentRight->SetHelpText(_("The right indent."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_indentRight->SetToolTip(_("The right indent."));

-    itemBoxSizer30->Add(m_indentRight, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer22->Add(m_indentRight, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxStaticText* itemStaticText32 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Outline level:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer22->Add(itemStaticText32, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText29 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Outline level:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer22->Add(itemStaticText29, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     wxArrayString m_outlineLevelCtrlStrings;
 
     wxArrayString m_outlineLevelCtrlStrings;

-    m_outlineLevelCtrlStrings.Add(_("Normal"));
+    m_outlineLevelCtrlStrings.Add(_("(none)"));

     m_outlineLevelCtrlStrings.Add(_("1"));
     m_outlineLevelCtrlStrings.Add(_("2"));
     m_outlineLevelCtrlStrings.Add(_("3"));
     m_outlineLevelCtrlStrings.Add(_("1"));
     m_outlineLevelCtrlStrings.Add(_("2"));
     m_outlineLevelCtrlStrings.Add(_("3"));


@@ -254,65 +245,57 @@ void wxRichTextIndentsSpacingPage::CreateControls()
     m_outlineLevelCtrlStrings.Add(_("7"));
     m_outlineLevelCtrlStrings.Add(_("8"));
     m_outlineLevelCtrlStrings.Add(_("9"));
     m_outlineLevelCtrlStrings.Add(_("7"));
     m_outlineLevelCtrlStrings.Add(_("8"));
     m_outlineLevelCtrlStrings.Add(_("9"));

-    m_outlineLevelCtrl = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL, _("Normal"), wxDefaultPosition, wxSize(90, -1), m_outlineLevelCtrlStrings, wxCB_READONLY );
-    m_outlineLevelCtrl->SetStringSelection(_("Normal"));
+    m_outlineLevelCtrlStrings.Add(_("10"));
+    m_outlineLevelCtrl = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL, _("(none)"), wxDefaultPosition, wxSize(85, -1), m_outlineLevelCtrlStrings, wxCB_READONLY );
+    m_outlineLevelCtrl->SetStringSelection(_("(none)"));

     m_outlineLevelCtrl->SetHelpText(_("The outline level."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_outlineLevelCtrl->SetToolTip(_("The outline level."));
     m_outlineLevelCtrl->SetHelpText(_("The outline level."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_outlineLevelCtrl->SetToolTip(_("The outline level."));

-    itemFlexGridSizer22->Add(m_outlineLevelCtrl, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer22->Add(m_outlineLevelCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     itemBoxSizer4->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 
 
     itemBoxSizer4->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 

-    wxStaticLine* itemStaticLine35 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    itemBoxSizer4->Add(itemStaticLine35, 0, wxGROW|wxTOP|wxBOTTOM, 5);
+    wxStaticLine* itemStaticLine32 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    itemBoxSizer4->Add(itemStaticLine32, 0, wxGROW|wxTOP|wxBOTTOM, 5);

 
     itemBoxSizer4->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 
 
     itemBoxSizer4->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 

-    wxBoxSizer* itemBoxSizer37 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer4->Add(itemBoxSizer37, 0, wxGROW, 5);
-
-    wxStaticText* itemStaticText38 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer37->Add(itemStaticText38, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
+    wxBoxSizer* itemBoxSizer34 = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer4->Add(itemBoxSizer34, 0, wxGROW, 5);

 
 

-    wxBoxSizer* itemBoxSizer39 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer37->Add(itemBoxSizer39, 0, wxALIGN_LEFT|wxALL, 5);
+    wxStaticText* itemStaticText35 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer34->Add(itemStaticText35, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);

 
 

-    itemBoxSizer39->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 5);
+    wxBoxSizer* itemBoxSizer36 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer34->Add(itemBoxSizer36, 0, wxALIGN_LEFT|wxALL, 5);

 
 

-    wxFlexGridSizer* itemFlexGridSizer41 = new wxFlexGridSizer(30, 2, 0, 0);
-    itemFlexGridSizer41->AddGrowableCol(1);
-    itemBoxSizer39->Add(itemFlexGridSizer41, 0, wxALIGN_CENTER_VERTICAL, 5);
+    itemBoxSizer36->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 5);

 
 

-    wxStaticText* itemStaticText42 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer41->Add(itemStaticText42, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxFlexGridSizer* itemFlexGridSizer38 = new wxFlexGridSizer(30, 2, 0, 0);
+    itemBoxSizer36->Add(itemFlexGridSizer38, 0, wxALIGN_CENTER_VERTICAL, 5);

 
 

-    wxBoxSizer* itemBoxSizer43 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer41->Add(itemBoxSizer43, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
+    wxStaticText* itemStaticText39 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer38->Add(itemStaticText39, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     m_spacingBefore = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_spacingBefore->SetHelpText(_("The spacing before the paragraph."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_spacingBefore->SetToolTip(_("The spacing before the paragraph."));
 
     m_spacingBefore = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_spacingBefore->SetHelpText(_("The spacing before the paragraph."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_spacingBefore->SetToolTip(_("The spacing before the paragraph."));

-    itemBoxSizer43->Add(m_spacingBefore, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer38->Add(m_spacingBefore, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxStaticText* itemStaticText45 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer41->Add(itemStaticText45, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-    wxBoxSizer* itemBoxSizer46 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer41->Add(itemBoxSizer46, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
+    wxStaticText* itemStaticText41 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer38->Add(itemStaticText41, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     m_spacingAfter = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_spacingAfter->SetToolTip(_("The spacing after the paragraph."));
 
     m_spacingAfter = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_spacingAfter->SetToolTip(_("The spacing after the paragraph."));

-    itemBoxSizer46->Add(m_spacingAfter, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-    wxStaticText* itemStaticText48 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("L&ine spacing:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer41->Add(itemStaticText48, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer38->Add(m_spacingAfter, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxBoxSizer* itemBoxSizer49 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer41->Add(itemBoxSizer49, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
+    wxStaticText* itemStaticText43 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("L&ine spacing:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer38->Add(itemStaticText43, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     wxArrayString m_spacingLineStrings;
 
     wxArrayString m_spacingLineStrings;

+    m_spacingLineStrings.Add(_("(none)"));

     m_spacingLineStrings.Add(_("Single"));
     m_spacingLineStrings.Add(_("1.1"));
     m_spacingLineStrings.Add(_("1.2"));
     m_spacingLineStrings.Add(_("Single"));
     m_spacingLineStrings.Add(_("1.1"));
     m_spacingLineStrings.Add(_("1.2"));


@@ -324,12 +307,12 @@ void wxRichTextIndentsSpacingPage::CreateControls()
     m_spacingLineStrings.Add(_("1.8"));
     m_spacingLineStrings.Add(_("1.9"));
     m_spacingLineStrings.Add(_("2"));
     m_spacingLineStrings.Add(_("1.8"));
     m_spacingLineStrings.Add(_("1.9"));
     m_spacingLineStrings.Add(_("2"));

-    m_spacingLine = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE, _("Single"), wxDefaultPosition, wxSize(90, -1), m_spacingLineStrings, wxCB_READONLY );
-    m_spacingLine->SetStringSelection(_("Single"));
+    m_spacingLine = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE, _("(none)"), wxDefaultPosition, wxSize(85, -1), m_spacingLineStrings, wxCB_READONLY );
+    m_spacingLine->SetStringSelection(_("(none)"));

     m_spacingLine->SetHelpText(_("The line spacing."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_spacingLine->SetToolTip(_("The line spacing."));
     m_spacingLine->SetHelpText(_("The line spacing."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_spacingLine->SetToolTip(_("The line spacing."));

-    itemBoxSizer49->Add(m_spacingLine, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer38->Add(m_spacingLine, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5);
 
 
     itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5);
 


@@ -448,9 +431,9 @@ bool wxRichTextIndentsSpacingPage::TransferDataFromWindow()
     else
         attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_PARA_SPACING_BEFORE));
 
     else
         attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_PARA_SPACING_BEFORE));
 

-    int spacingIndex = m_spacingLine->GetSelection();
+    int spacingIndex = m_spacingLine->GetSelection() - 1;

     int lineSpacing = 0;
     int lineSpacing = 0;

-    if (spacingIndex != -1)
+    if (spacingIndex > -1)

         lineSpacing = 10 + spacingIndex;
 
     if (lineSpacing == 0)
         lineSpacing = 10 + spacingIndex;
 
     if (lineSpacing == 0)


@@ -459,8 +442,13 @@ bool wxRichTextIndentsSpacingPage::TransferDataFromWindow()
         attr->SetLineSpacing(lineSpacing);
 
     int outlineLevel = m_outlineLevelCtrl->GetSelection();
         attr->SetLineSpacing(lineSpacing);
 
     int outlineLevel = m_outlineLevelCtrl->GetSelection();

-    if (outlineLevel != wxNOT_FOUND)
-        attr->SetOutlineLevel(outlineLevel);
+    if (outlineLevel == wxNOT_FOUND || outlineLevel == 0)
+    {
+        attr->SetOutlineLevel(-1);
+        attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_OUTLINE_LEVEL));
+    }
+    else
+        attr->SetOutlineLevel(outlineLevel-1);

 
     return true;
 }
 
     return true;
 }


@@ -536,14 +524,14 @@ bool wxRichTextIndentsSpacingPage::TransferDataToWindow()
 
         int lineSpacing = attr->GetLineSpacing();
         if (lineSpacing >= 10 && lineSpacing <= 20)
 
         int lineSpacing = attr->GetLineSpacing();
         if (lineSpacing >= 10 && lineSpacing <= 20)

-            index = lineSpacing - 10;
+            index = (lineSpacing - 10) + 1;

         else
         else

-            index = -1;
+            index = 0;

 
         m_spacingLine->SetSelection(index);
     }
     else
 
         m_spacingLine->SetSelection(index);
     }
     else

-        m_spacingLine->SetSelection(-1);
+        m_spacingLine->SetSelection(0);

 
     if (attr->HasOutlineLevel())
     {
 
     if (attr->HasOutlineLevel())
     {


@@ -553,10 +541,10 @@ bool wxRichTextIndentsSpacingPage::TransferDataToWindow()
         if (outlineLevel > 9)
             outlineLevel = 9;
 
         if (outlineLevel > 9)
             outlineLevel = 9;
 

-        m_outlineLevelCtrl->SetSelection(outlineLevel);
+        m_outlineLevelCtrl->SetSelection(outlineLevel+1);

     }
     else
     }
     else

-        m_outlineLevelCtrl->SetSelection(-1);
+        m_outlineLevelCtrl->SetSelection(0);

 
     UpdatePreview();
 
 
     UpdatePreview();
 

diff --git a/src/richtext/richtextliststylepage.cpp b/src/richtext/richtextliststylepage.cpp
index ec7a360cde88b0c1c8b0f61d65360609d2957fce..9f7710fe82c21edfc67c74fcec3b307abfc15769 100644 (file)
--- a/src/richtext/richtextliststylepage.cpp
+++ b/src/richtext/richtextliststylepage.cpp
@@ -382,91 +382,88 @@ void wxRichTextListStylePage::CreateControls()
     wxStaticText* itemStaticText58 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemFlexGridSizer57->Add(itemStaticText58, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxStaticText* itemStaticText58 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 );
     itemFlexGridSizer57->Add(itemStaticText58, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 

-    wxBoxSizer* itemBoxSizer59 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer57->Add(itemBoxSizer59, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);

     m_indentLeft = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentLeft->SetHelpText(_("The left indent."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_indentLeft->SetToolTip(_("The left indent."));
     m_indentLeft = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentLeft->SetHelpText(_("The left indent."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_indentLeft->SetToolTip(_("The left indent."));

-    itemBoxSizer59->Add(m_indentLeft, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer57->Add(m_indentLeft, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxStaticText* itemStaticText61 = new wxStaticText( itemPanel37, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer57->Add(itemStaticText61, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText60 = new wxStaticText( itemPanel37, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer57->Add(itemStaticText60, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxBoxSizer* itemBoxSizer62 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer57->Add(itemBoxSizer62, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);

     m_indentLeftFirst = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentLeftFirst->SetHelpText(_("The first line indent."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_indentLeftFirst->SetToolTip(_("The first line indent."));
     m_indentLeftFirst = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentLeftFirst->SetHelpText(_("The first line indent."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_indentLeftFirst->SetToolTip(_("The first line indent."));

-    itemBoxSizer62->Add(m_indentLeftFirst, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer57->Add(m_indentLeftFirst, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxStaticText* itemStaticText64 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer57->Add(itemStaticText64, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText62 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer57->Add(itemStaticText62, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxBoxSizer* itemBoxSizer65 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer57->Add(itemBoxSizer65, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);

     m_indentRight = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentRight->SetHelpText(_("The right indent."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_indentRight->SetToolTip(_("The right indent."));
     m_indentRight = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_indentRight->SetHelpText(_("The right indent."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_indentRight->SetToolTip(_("The right indent."));

-    itemBoxSizer65->Add(m_indentRight, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer57->Add(m_indentRight, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     itemBoxSizer39->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 
 
     itemBoxSizer39->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 

-    wxStaticLine* itemStaticLine68 = new wxStaticLine( itemPanel37, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    itemBoxSizer39->Add(itemStaticLine68, 0, wxGROW|wxTOP|wxBOTTOM, 5);
+    wxStaticLine* itemStaticLine65 = new wxStaticLine( itemPanel37, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    itemBoxSizer39->Add(itemStaticLine65, 0, wxGROW|wxTOP|wxBOTTOM, 5);

 
     itemBoxSizer39->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 
 
     itemBoxSizer39->Add(2, 1, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
 

-    wxBoxSizer* itemBoxSizer70 = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer39->Add(itemBoxSizer70, 0, wxGROW, 5);
-    wxStaticText* itemStaticText71 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemBoxSizer70->Add(itemStaticText71, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
+    wxBoxSizer* itemBoxSizer67 = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer39->Add(itemBoxSizer67, 0, wxGROW, 5);
+    wxStaticText* itemStaticText68 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer67->Add(itemStaticText68, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);

 
 

-    wxBoxSizer* itemBoxSizer72 = new wxBoxSizer(wxHORIZONTAL);
-    itemBoxSizer70->Add(itemBoxSizer72, 0, wxALIGN_LEFT|wxALL, 5);
-    itemBoxSizer72->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 5);
+    wxBoxSizer* itemBoxSizer69 = new wxBoxSizer(wxHORIZONTAL);
+    itemBoxSizer67->Add(itemBoxSizer69, 0, wxALIGN_LEFT|wxALL, 5);
+    itemBoxSizer69->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL, 5);

 
 

-    wxFlexGridSizer* itemFlexGridSizer74 = new wxFlexGridSizer(0, 2, 0, 0);
-    itemBoxSizer72->Add(itemFlexGridSizer74, 0, wxALIGN_CENTER_VERTICAL, 5);
-    wxStaticText* itemStaticText75 = new wxStaticText( itemPanel37, wxID_STATIC, _("Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer74->Add(itemStaticText75, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxFlexGridSizer* itemFlexGridSizer71 = new wxFlexGridSizer(0, 2, 0, 0);
+    itemBoxSizer69->Add(itemFlexGridSizer71, 0, wxALIGN_CENTER_VERTICAL, 5);
+    wxStaticText* itemStaticText72 = new wxStaticText( itemPanel37, wxID_STATIC, _("Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer71->Add(itemStaticText72, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxBoxSizer* itemBoxSizer76 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer74->Add(itemBoxSizer76, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);

     m_spacingBefore = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_spacingBefore->SetHelpText(_("The spacing before the paragraph."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_spacingBefore->SetToolTip(_("The spacing before the paragraph."));
     m_spacingBefore = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_spacingBefore->SetHelpText(_("The spacing before the paragraph."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_spacingBefore->SetToolTip(_("The spacing before the paragraph."));

-    itemBoxSizer76->Add(m_spacingBefore, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer71->Add(m_spacingBefore, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxStaticText* itemStaticText78 = new wxStaticText( itemPanel37, wxID_STATIC, _("After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer74->Add(itemStaticText78, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText74 = new wxStaticText( itemPanel37, wxID_STATIC, _("After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer71->Add(itemStaticText74, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxBoxSizer* itemBoxSizer79 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer74->Add(itemBoxSizer79, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);

     m_spacingAfter = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_spacingAfter->SetHelpText(_("The spacing after the paragraph."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_spacingAfter->SetToolTip(_("The spacing after the paragraph."));
     m_spacingAfter = new wxTextCtrl( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
     m_spacingAfter->SetHelpText(_("The spacing after the paragraph."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_spacingAfter->SetToolTip(_("The spacing after the paragraph."));

-    itemBoxSizer79->Add(m_spacingAfter, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer71->Add(m_spacingAfter, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxStaticText* itemStaticText81 = new wxStaticText( itemPanel37, wxID_STATIC, _("Line spacing:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer74->Add(itemStaticText81, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText76 = new wxStaticText( itemPanel37, wxID_STATIC, _("Line spacing:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer71->Add(itemStaticText76, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
 

-    wxBoxSizer* itemBoxSizer82 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer74->Add(itemBoxSizer82, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);

     wxArrayString m_spacingLineStrings;
     wxArrayString m_spacingLineStrings;

+    m_spacingLineStrings.Add(_("(none)"));

     m_spacingLineStrings.Add(_("Single"));
     m_spacingLineStrings.Add(_("Single"));

+    m_spacingLineStrings.Add(_("1.1"));
+    m_spacingLineStrings.Add(_("1.2"));
+    m_spacingLineStrings.Add(_("1.3"));
+    m_spacingLineStrings.Add(_("1.4"));

     m_spacingLineStrings.Add(_("1.5"));
     m_spacingLineStrings.Add(_("1.5"));

+    m_spacingLineStrings.Add(_("1.6"));
+    m_spacingLineStrings.Add(_("1.7"));
+    m_spacingLineStrings.Add(_("1.8"));
+    m_spacingLineStrings.Add(_("1.9"));

     m_spacingLineStrings.Add(_("2"));
     m_spacingLineStrings.Add(_("2"));

-    m_spacingLine = new wxComboBox( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_LINESPACING, _("Single"), wxDefaultPosition, wxDefaultSize, m_spacingLineStrings, wxCB_READONLY );
-    m_spacingLine->SetStringSelection(_("Single"));
+    m_spacingLine = new wxComboBox( itemPanel37, ID_RICHTEXTLISTSTYLEPAGE_LINESPACING, _("(none)"), wxDefaultPosition, wxSize(85, -1), m_spacingLineStrings, wxCB_READONLY );
+    m_spacingLine->SetStringSelection(_("(none)"));

     m_spacingLine->SetHelpText(_("The line spacing."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_spacingLine->SetToolTip(_("The line spacing."));
     m_spacingLine->SetHelpText(_("The line spacing."));
     if (wxRichTextListStylePage::ShowToolTips())
         m_spacingLine->SetToolTip(_("The line spacing."));

-    itemBoxSizer82->Add(m_spacingLine, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer71->Add(m_spacingLine, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);

 
     itemNotebook9->AddPage(itemPanel37, _("Spacing"));
 
 
     itemNotebook9->AddPage(itemPanel37, _("Spacing"));
 


@@ -631,14 +628,10 @@ bool wxRichTextListStylePage::TransferDataFromWindow()
     else
         attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_PARA_SPACING_BEFORE));
 
     else
         attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_PARA_SPACING_BEFORE));
 

-    int spacingIndex = m_spacingLine->GetSelection();
+    int spacingIndex = m_spacingLine->GetSelection() - 1;

     int lineSpacing = 0;
     int lineSpacing = 0;

-    if (spacingIndex == 0)
-        lineSpacing = 10;
-    else if (spacingIndex == 1)
-        lineSpacing = 15;
-    else if (spacingIndex == 2)
-        lineSpacing = 20;
+    if (spacingIndex > -1)
+        lineSpacing = 10 + spacingIndex;

 
     if (lineSpacing == 0)
         attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_LINE_SPACING));
 
     if (lineSpacing == 0)
         attr->SetFlags(attr->GetFlags() & (~wxTEXT_ATTR_LINE_SPACING));


@@ -785,19 +778,15 @@ void wxRichTextListStylePage::DoTransferDataToWindow()
         int index = 0;
 
         int lineSpacing = attr->GetLineSpacing();
         int index = 0;
 
         int lineSpacing = attr->GetLineSpacing();

-        if (lineSpacing == 10)
-            index = 0;
-        else if (lineSpacing == 15)
-            index = 1;
-        else if (lineSpacing == 20)
-            index = 2;
+        if (lineSpacing >= 10 && lineSpacing <= 20)
+            index = (lineSpacing - 10) + 1;

         else
         else

-            index = -1;
+            index = 0;

 
         m_spacingLine->SetSelection(index);
     }
     else
 
         m_spacingLine->SetSelection(index);
     }
     else

-        m_spacingLine->SetSelection(-1);
+        m_spacingLine->SetSelection(0);

 
     /// BULLETS
     if (attr->HasBulletStyle())
 
     /// BULLETS
     if (attr->HasBulletStyle())