X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/404b319a85dadd7decf7a5a5331020520031a41c..ad653fa23069c5d9378247084f03c9a718c3ad62:/src/richtext/richtextdialogs.pjd?ds=sidebyside

diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd
index c137410858..b3c60d1a00 100644
--- a/src/richtext/richtextdialogs.pjd
+++ b/src/richtext/richtextdialogs.pjd
@@ -2502,14 +2502,6 @@
             <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>
@@ -3908,7 +3900,7 @@
                         <long name="locked">0</long>
                         <string name="created">"10/11/2006"</string>
                         <string name="proxy-type">"wbComboBoxProxy"</string>
-                        <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlinelevelSelected"</string>
+                        <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlinelevelSelected|||wxRichTextIndentsSpacingPage"</string>
                         <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL"</string>
                         <long name="proxy-Id value">10105</long>
                         <string name="proxy-Name">""</string>
@@ -3919,8 +3911,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-Strings">"(none)|1|2|3|4|5|6|7|8|9|10"</string>
-                        <string name="proxy-Initial value">"(none)"</string>
+                        <string name="proxy-Strings">""</string>
+                        <string name="proxy-Initial value">""</string>
                         <string name="proxy-Help text">"The outline level."</string>
                         <string name="proxy-Tooltip text">""</string>
                         <string name="proxy-Background colour">""</string>
@@ -8023,9 +8015,9 @@
           <long name="use-xrc">0</long>
           <long name="working-mode">0</long>
           <string name="variable-0">"m_fontName|wxString|FontName||0"</string>
-          <string name="variable-1">"m_symbol|wxString|Symbol||0"</string>
-          <string name="variable-2">"m_fromUnicode|bool|FromUnicode|true|0"</string>
-          <string name="variable-3">"m_normalTextFontName|wxString|NormalTextFontName|"</string>
+          <string name="variable-1">"m_fromUnicode|bool|FromUnicode|true|0"</string>
+          <string name="variable-2">"m_normalTextFontName|wxString|NormalTextFontName|"</string>
+          <string name="variable-3">"m_symbol|wxString|Symbol||0"</string>
           <string name="proxy-Id name">"ID_SYMBOLPICKERDIALOG"</string>
           <long name="proxy-Id value">10600</long>
           <string name="proxy-Class">"wxSymbolPickerDialog"</string>
@@ -9195,6 +9187,8 @@
                   <long name="title-mode">0</long>
                   <long name="locked">1</long>
                   <string name="proxy-type">"wbButtonProxy"</string>
+                  <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnHelpClick|NONE||wxSymbolPickerDialog"</string>
+                  <string name="event-handler-1">"wxEVT_UPDATE_UI|OnHelpUpdate|NONE||"</string>
                   <string name="proxy-Id name">"wxID_HELP"</string>
                   <long name="proxy-Id value">5009</long>
                   <string name="proxy-Name">""</string>
@@ -10791,6 +10785,7 @@
                     <long name="title-mode">0</long>
                     <long name="locked">1</long>
                     <string name="proxy-type">"wbButtonProxy"</string>
+                    <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnHelpClick|NONE||wxRichTextStyleOrganiserDialog"</string>
                     <string name="proxy-Id name">"wxID_HELP"</string>
                     <long name="proxy-Id value">5009</long>
                     <string name="proxy-Name">""</string>
@@ -15158,6 +15153,14 @@
             <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>
@@ -15227,7 +15230,7 @@
                   <string name="proxy-Member variable name">"m_floatingSizer"</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>
                   <bool name="proxy-wxLEFT">0</bool>
                   <bool name="proxy-wxRIGHT">0</bool>
@@ -15544,20 +15547,20 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
-                        <string name="title">"wxComboBox: ID_RICHTEXT_FLOATING_MODE"</string>
+                        <string name="title">"wxChoice: ID_RICHTEXT_FLOATING_MODE"</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
-                        <string name="icon-name">"combobox"</string>
+                        <string name="icon-name">"choice"</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">"wbComboBoxProxy"</string>
+                        <string name="proxy-type">"wbChoiceProxy"</string>
                         <string name="proxy-Id name">"ID_RICHTEXT_FLOATING_MODE"</string>
                         <long name="proxy-Id value">10701</long>
                         <string name="proxy-Name">""</string>
-                        <string name="proxy-Class">"wxComboBox"</string>
-                        <string name="proxy-Base class">"wxComboBox"</string>
+                        <string name="proxy-Class">"wxChoice"</string>
+                        <string name="proxy-Base class">"wxChoice"</string>
                         <bool name="proxy-External implementation">1</bool>
                         <bool name="proxy-Separate files">0</bool>
                         <string name="proxy-Implementation filename">""</string>
@@ -15580,11 +15583,6 @@
                         <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>
@@ -15611,6 +15609,32 @@
                     </document>
                   </document>
                 </document>
+                <document>
+                  <string name="title">"Spacer"</string>
+                  <string name="type">"dialog-control-document"</string>
+                  <string name="filename">""</string>
+                  <string name="icon-name">"spacer"</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">"wbSpacerProxy"</string>
+                  <long name="proxy-Width">0</long>
+                  <long name="proxy-Height">0</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">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>
+                  <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                </document>
                 <document>
                   <string name="title">"wxBoxSizer V"</string>
                   <string name="type">"dialog-control-document"</string>
@@ -15625,7 +15649,7 @@
                   <string name="proxy-Member variable name">"m_alignmentSizer"</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>
                   <bool name="proxy-wxLEFT">0</bool>
                   <bool name="proxy-wxRIGHT">0</bool>
@@ -15905,21 +15929,21 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                     <document>
-                      <string name="title">"wxComboBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX"</string>
+                      <string name="title">"wxChoice: ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
-                      <string name="icon-name">"combobox"</string>
+                      <string name="icon-name">"choice"</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">"wbComboBoxProxy"</string>
+                      <string name="proxy-type">"wbChoiceProxy"</string>
                       <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextVerticalAlignmentComboboxUpdate|NONE||wxRichTextSizePage"</string>
                       <string name="proxy-Id name">"ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX"</string>
                       <long name="proxy-Id value">10709</long>
                       <string name="proxy-Name">""</string>
-                      <string name="proxy-Class">"wxComboBox"</string>
-                      <string name="proxy-Base class">"wxComboBox"</string>
+                      <string name="proxy-Class">"wxChoice"</string>
+                      <string name="proxy-Base class">"wxChoice"</string>
                       <bool name="proxy-External implementation">1</bool>
                       <bool name="proxy-Separate files">0</bool>
                       <string name="proxy-Implementation filename">""</string>
@@ -15942,11 +15966,6 @@
                       <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>
@@ -16193,7 +16212,7 @@
                   <long name="proxy-Rows">0</long>
                   <long name="proxy-ColumnSpacing">0</long>
                   <long name="proxy-RowSpacing">0</long>
-                  <string name="proxy-Member variable name">""</string>
+                  <string name="proxy-Member variable name">"m_sizeSizer"</string>
                   <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   <string name="proxy-AlignH">"Expand"</string>
                   <string name="proxy-AlignV">"Centre"</string>
@@ -16208,68 +16227,165 @@
                   <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                   <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
                   <document>
-                    <string name="title">"wxCheckBox: ID_RICHTEXT_WIDTH_CHECKBOX"</string>
+                    <string name="title">"wxBoxSizer H"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
-                    <string name="icon-name">"checkbox"</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="proxy-type">"wbCheckBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_RICHTEXT_WIDTH_CHECKBOX"</string>
-                    <long name="proxy-Id value">10702</long>
-                    <string name="proxy-Name">""</string>
-                    <string name="proxy-Class">"wxCheckBox"</string>
-                    <string name="proxy-Base class">"wxCheckBox"</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_widthCheckbox"</string>
-                    <string name="proxy-Label">"&amp;Width:"</string>
-                    <bool name="proxy-Initial value">0</bool>
-                    <string name="proxy-Help text">"Enable the width value."</string>
-                    <string name="proxy-Tooltip text">""</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>
-                    <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>
-                    <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxCHK_2STATE">0</bool>
-                    <bool name="proxy-wxCHK_3STATE">0</bool>
-                    <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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-type">"wbBoxSizerProxy"</string>
+                    <string name="proxy-Orientation">"Horizontal"</string>
+                    <string name="proxy-Member variable name">"m_widthSizer"</string>
                     <string name="proxy-AlignH">"Left"</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-wxLEFT">0</bool>
                     <bool name="proxy-wxRIGHT">0</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</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>
                     <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
-                    <string name="proxy-Custom arguments">""</string>
-                    <string name="proxy-Custom ctor arguments">""</string>
+                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                    <document>
+                      <string name="title">"wxCheckBox: ID_RICHTEXT_WIDTH_CHECKBOX"</string>
+                      <string name="type">"dialog-control-document"</string>
+                      <string name="filename">""</string>
+                      <string name="icon-name">"checkbox"</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">"wbCheckBoxProxy"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_WIDTH_CHECKBOX"</string>
+                      <long name="proxy-Id value">10702</long>
+                      <string name="proxy-Name">""</string>
+                      <string name="proxy-Class">"wxCheckBox"</string>
+                      <string name="proxy-Base class">"wxCheckBox"</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_widthCheckbox"</string>
+                      <string name="proxy-Label">"&amp;Width:"</string>
+                      <bool name="proxy-Initial value">0</bool>
+                      <string name="proxy-Help text">"Enable the width value."</string>
+                      <string name="proxy-Tooltip text">""</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>
+                      <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>
+                      <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                      <bool name="proxy-wxCHK_2STATE">0</bool>
+                      <bool name="proxy-wxCHK_3STATE">0</bool>
+                      <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">"Left"</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">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="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">"m_widthLabel"</string>
+                      <string name="proxy-Label">"&amp;Width:"</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">1</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">"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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                      <string name="proxy-Custom arguments">""</string>
+                      <string name="proxy-Custom ctor arguments">""</string>
+                    </document>
                   </document>
                   <document>
                     <string name="title">"wxBoxSizer H"</string>
@@ -16390,7 +16506,7 @@
                       <long name="title-mode">0</long>
                       <long name="locked">0</long>
                       <string name="proxy-type">"wbComboBoxProxy"</string>
-                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextWidthUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextWidthUnitsUpdate|NONE||wxRichTextSizePage"</string>
                       <string name="proxy-Id name">"ID_RICHTEXT_UNITS_W"</string>
                       <long name="proxy-Id value">10704</long>
                       <string name="proxy-Name">""</string>
@@ -16448,68 +16564,165 @@
                     </document>
                   </document>
                   <document>
-                    <string name="title">"wxCheckBox: ID_RICHTEXT_HEIGHT_CHECKBOX"</string>
+                    <string name="title">"wxBoxSizer H"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
-                    <string name="icon-name">"checkbox"</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="proxy-type">"wbCheckBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_RICHTEXT_HEIGHT_CHECKBOX"</string>
-                    <long name="proxy-Id value">10705</long>
-                    <string name="proxy-Name">""</string>
-                    <string name="proxy-Class">"wxCheckBox"</string>
-                    <string name="proxy-Base class">"wxCheckBox"</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_heightCheckbox"</string>
-                    <string name="proxy-Label">"&amp;Height:"</string>
-                    <bool name="proxy-Initial value">0</bool>
-                    <string name="proxy-Help text">"Enable the height value."</string>
-                    <string name="proxy-Tooltip text">""</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>
-                    <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>
-                    <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxCHK_2STATE">0</bool>
-                    <bool name="proxy-wxCHK_3STATE">0</bool>
-                    <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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-type">"wbBoxSizerProxy"</string>
+                    <string name="proxy-Orientation">"Horizontal"</string>
+                    <string name="proxy-Member variable name">"m_heightSizer"</string>
                     <string name="proxy-AlignH">"Left"</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-wxLEFT">0</bool>
                     <bool name="proxy-wxRIGHT">0</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</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>
                     <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
-                    <string name="proxy-Custom arguments">""</string>
-                    <string name="proxy-Custom ctor arguments">""</string>
+                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                    <document>
+                      <string name="title">"wxCheckBox: ID_RICHTEXT_HEIGHT_CHECKBOX"</string>
+                      <string name="type">"dialog-control-document"</string>
+                      <string name="filename">""</string>
+                      <string name="icon-name">"checkbox"</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">"wbCheckBoxProxy"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_HEIGHT_CHECKBOX"</string>
+                      <long name="proxy-Id value">10705</long>
+                      <string name="proxy-Name">""</string>
+                      <string name="proxy-Class">"wxCheckBox"</string>
+                      <string name="proxy-Base class">"wxCheckBox"</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_heightCheckbox"</string>
+                      <string name="proxy-Label">"&amp;Height:"</string>
+                      <bool name="proxy-Initial value">0</bool>
+                      <string name="proxy-Help text">"Enable the height value."</string>
+                      <string name="proxy-Tooltip text">""</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>
+                      <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>
+                      <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                      <bool name="proxy-wxCHK_2STATE">0</bool>
+                      <bool name="proxy-wxCHK_3STATE">0</bool>
+                      <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">"Left"</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">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="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">"m_heightLabel"</string>
+                      <string name="proxy-Label">"&amp;Height:"</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">1</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">"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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                      <string name="proxy-Custom arguments">""</string>
+                      <string name="proxy-Custom ctor arguments">""</string>
+                    </document>
                   </document>
                   <document>
                     <string name="title">"wxBoxSizer H"</string>
@@ -16630,7 +16843,7 @@
                       <long name="title-mode">0</long>
                       <long name="locked">0</long>
                       <string name="proxy-type">"wbComboBoxProxy"</string>
-                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextHeightUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextHeightUnitsUpdate|NONE||wxRichTextSizePage"</string>
                       <string name="proxy-Id name">"ID_RICHTEXT_UNITS_H"</string>
                       <long name="proxy-Id value">10707</long>
                       <string name="proxy-Name">""</string>
@@ -16762,7 +16975,7 @@
                     <long name="locked">0</long>
                     <string name="proxy-type">"wbBoxSizerProxy"</string>
                     <string name="proxy-Orientation">"Horizontal"</string>
-                    <string name="proxy-Member variable name">""</string>
+                    <string name="proxy-Member variable name">"m_minWidthSizer"</string>
                     <string name="proxy-AlignH">"Left"</string>
                     <string name="proxy-AlignV">"Centre"</string>
                     <long name="proxy-Stretch factor">0</long>
@@ -17002,7 +17215,7 @@
                     <long name="locked">0</long>
                     <string name="proxy-type">"wbBoxSizerProxy"</string>
                     <string name="proxy-Orientation">"Horizontal"</string>
-                    <string name="proxy-Member variable name">""</string>
+                    <string name="proxy-Member variable name">"m_minHeightSizer"</string>
                     <string name="proxy-AlignH">"Left"</string>
                     <string name="proxy-AlignV">"Centre"</string>
                     <long name="proxy-Stretch factor">0</long>
@@ -17242,7 +17455,7 @@
                     <long name="locked">0</long>
                     <string name="proxy-type">"wbBoxSizerProxy"</string>
                     <string name="proxy-Orientation">"Horizontal"</string>
-                    <string name="proxy-Member variable name">""</string>
+                    <string name="proxy-Member variable name">"m_maxWidthSizer"</string>
                     <string name="proxy-AlignH">"Left"</string>
                     <string name="proxy-AlignV">"Centre"</string>
                     <long name="proxy-Stretch factor">0</long>
@@ -17482,7 +17695,7 @@
                     <long name="locked">0</long>
                     <string name="proxy-type">"wbBoxSizerProxy"</string>
                     <string name="proxy-Orientation">"Horizontal"</string>
-                    <string name="proxy-Member variable name">""</string>
+                    <string name="proxy-Member variable name">"m_maxHeightSizer"</string>
                     <string name="proxy-AlignH">"Left"</string>
                     <string name="proxy-AlignV">"Centre"</string>
                     <long name="proxy-Stretch factor">0</long>
@@ -18000,20 +18213,20 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
-                        <string name="title">"wxComboBox: ID_RICHTEXT_POSITION_MODE"</string>
+                        <string name="title">"wxChoice: ID_RICHTEXT_POSITION_MODE"</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
-                        <string name="icon-name">"combobox"</string>
+                        <string name="icon-name">"choice"</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">"wbComboBoxProxy"</string>
+                        <string name="proxy-type">"wbChoiceProxy"</string>
                         <string name="proxy-Id name">"ID_RICHTEXT_POSITION_MODE"</string>
                         <long name="proxy-Id value">10735</long>
                         <string name="proxy-Name">""</string>
-                        <string name="proxy-Class">"wxComboBox"</string>
-                        <string name="proxy-Base class">"wxComboBox"</string>
+                        <string name="proxy-Class">"wxChoice"</string>
+                        <string name="proxy-Base class">"wxChoice"</string>
                         <bool name="proxy-External implementation">1</bool>
                         <bool name="proxy-Separate files">0</bool>
                         <string name="proxy-Implementation filename">""</string>
@@ -18036,11 +18249,6 @@
                         <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>
@@ -18095,70 +18303,6 @@
                       <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                       <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                       <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
-                      <document>
-                        <string name="title">"wxCheckBox: ID_RICHTEXT_LEFT_CHECKBOX"</string>
-                        <string name="type">"dialog-control-document"</string>
-                        <string name="filename">""</string>
-                        <string name="icon-name">"checkbox"</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">"wbCheckBoxProxy"</string>
-                        <string name="proxy-Id name">"ID_RICHTEXT_LEFT_CHECKBOX"</string>
-                        <long name="proxy-Id value">10710</long>
-                        <string name="proxy-Name">""</string>
-                        <string name="proxy-Class">"wxCheckBox"</string>
-                        <string name="proxy-Base class">"wxCheckBox"</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_positionLeftCheckbox"</string>
-                        <string name="proxy-Label">"&amp;Left:"</string>
-                        <bool name="proxy-Initial value">0</bool>
-                        <string name="proxy-Help text">"The left position."</string>
-                        <string name="proxy-Tooltip text">""</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>
-                        <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>
-                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                        <bool name="proxy-wxCHK_2STATE">0</bool>
-                        <bool name="proxy-wxCHK_3STATE">0</bool>
-                        <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">"Left"</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
-                        <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>
@@ -18170,8 +18314,8 @@
                         <long name="locked">0</long>
                         <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-Member variable name">"m_leftSizer"</string>
+                        <string name="proxy-AlignH">"Left"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
@@ -18185,36 +18329,29 @@
                         <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
                         <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                         <document>
-                          <string name="title">"wxTextCtrl: ID_RICHTEXT_LEFT"</string>
+                          <string name="title">"wxCheckBox: ID_RICHTEXT_LEFT_CHECKBOX"</string>
                           <string name="type">"dialog-control-document"</string>
                           <string name="filename">""</string>
-                          <string name="icon-name">"textctrl"</string>
+                          <string name="icon-name">"checkbox"</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_UPDATE_UI|OnRichtextLeftUpdate|NONE||wxRichTextSizePage"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXT_LEFT"</string>
-                          <long name="proxy-Id value">10711</long>
+                          <string name="proxy-type">"wbCheckBoxProxy"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_LEFT_CHECKBOX"</string>
+                          <long name="proxy-Id value">10710</long>
                           <string name="proxy-Name">""</string>
-                          <string name="proxy-Class">"wxTextCtrl"</string>
-                          <string name="proxy-Base class">"wxTextCtrl"</string>
+                          <string name="proxy-Class">"wxCheckBox"</string>
+                          <string name="proxy-Base class">"wxCheckBox"</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_left"</string>
-                          <string name="proxy-Initial value">""</string>
-                          <long name="proxy-Max length">10</long>
+                          <string name="proxy-Member variable name">"m_positionLeftCheckbox"</string>
+                          <string name="proxy-Label">"&amp;Left:"</string>
+                          <bool name="proxy-Initial value">0</bool>
                           <string name="proxy-Help text">"The left position."</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>
@@ -18222,9 +18359,177 @@
                           <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>
+                          <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>
+                          <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                          <bool name="proxy-wxCHK_2STATE">0</bool>
+                          <bool name="proxy-wxCHK_3STATE">0</bool>
+                          <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">"Left"</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">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="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">"m_leftLabel"</string>
+                          <string name="proxy-Label">"&amp;Left:"</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">1</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">"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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
+                      </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="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>
+                        <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <document>
+                          <string name="title">"wxTextCtrl: ID_RICHTEXT_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="proxy-type">"wbTextCtrlProxy"</string>
+                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextLeftUpdate|NONE||wxRichTextSizePage"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_LEFT"</string>
+                          <long name="proxy-Id value">10711</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_left"</string>
+                          <string name="proxy-Initial value">""</string>
+                          <long name="proxy-Max length">10</long>
+                          <string name="proxy-Help text">"The left position."</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>
@@ -18278,7 +18583,7 @@
                           <long name="title-mode">0</long>
                           <long name="locked">0</long>
                           <string name="proxy-type">"wbComboBoxProxy"</string>
-                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextTopUpdate|NONE||wxRichTextSizePage"</string>
+                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextLeftUnitsUpdate|NONE||wxRichTextSizePage"</string>
                           <string name="proxy-Id name">"ID_RICHTEXT_LEFT_UNITS"</string>
                           <long name="proxy-Id value">10712</long>
                           <string name="proxy-Name">""</string>
@@ -18336,68 +18641,502 @@
                         </document>
                       </document>
                       <document>
-                        <string name="title">"wxCheckBox: ID_RICHTEXT_TOP_CHECKBOX"</string>
+                        <string name="title">"wxBoxSizer H"</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
-                        <string name="icon-name">"checkbox"</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="proxy-type">"wbCheckBoxProxy"</string>
-                        <string name="proxy-Id name">"ID_RICHTEXT_TOP_CHECKBOX"</string>
-                        <long name="proxy-Id value">10710</long>
-                        <string name="proxy-Name">""</string>
-                        <string name="proxy-Class">"wxCheckBox"</string>
-                        <string name="proxy-Base class">"wxCheckBox"</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_positionTopCheckbox"</string>
-                        <string name="proxy-Label">"&amp;Top:"</string>
-                        <bool name="proxy-Initial value">0</bool>
-                        <string name="proxy-Help text">"The top position."</string>
-                        <string name="proxy-Tooltip text">""</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>
-                        <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>
-                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                        <bool name="proxy-wxCHK_2STATE">0</bool>
-                        <bool name="proxy-wxCHK_3STATE">0</bool>
-                        <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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-type">"wbBoxSizerProxy"</string>
+                        <string name="proxy-Orientation">"Horizontal"</string>
+                        <string name="proxy-Member variable name">"m_topSizer"</string>
                         <string name="proxy-AlignH">"Left"</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-wxLEFT">0</bool>
                         <bool name="proxy-wxRIGHT">0</bool>
-                        <bool name="proxy-wxTOP">1</bool>
-                        <bool name="proxy-wxBOTTOM">1</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>
                         <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
-                        <string name="proxy-Custom arguments">""</string>
-                        <string name="proxy-Custom ctor arguments">""</string>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <document>
+                          <string name="title">"wxCheckBox: ID_RICHTEXT_TOP_CHECKBOX"</string>
+                          <string name="type">"dialog-control-document"</string>
+                          <string name="filename">""</string>
+                          <string name="icon-name">"checkbox"</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">"wbCheckBoxProxy"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_TOP_CHECKBOX"</string>
+                          <long name="proxy-Id value">10710</long>
+                          <string name="proxy-Name">""</string>
+                          <string name="proxy-Class">"wxCheckBox"</string>
+                          <string name="proxy-Base class">"wxCheckBox"</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_positionTopCheckbox"</string>
+                          <string name="proxy-Label">"&amp;Top:"</string>
+                          <bool name="proxy-Initial value">0</bool>
+                          <string name="proxy-Help text">"The top position."</string>
+                          <string name="proxy-Tooltip text">""</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>
+                          <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>
+                          <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                          <bool name="proxy-wxCHK_2STATE">0</bool>
+                          <bool name="proxy-wxCHK_3STATE">0</bool>
+                          <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">"Left"</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">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="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">"m_topLabel"</string>
+                          <string name="proxy-Label">"&amp;Top:"</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">1</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">"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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
+                      </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="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>
+                        <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <document>
+                          <string name="title">"wxTextCtrl: ID_RICHTEXT_TOP"</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_UPDATE_UI|OnRichtextTopUpdate|NONE||wxRichTextSizePage"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_TOP"</string>
+                          <long name="proxy-Id value">10728</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_top"</string>
+                          <string name="proxy-Initial value">""</string>
+                          <long name="proxy-Max length">10</long>
+                          <string name="proxy-Help text">"The top position."</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">65</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
+                        <document>
+                          <string name="title">"wxComboBox: ID_RICHTEXT_TOP_UNITS"</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="proxy-type">"wbComboBoxProxy"</string>
+                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextTopUnitsUpdate|NONE||wxRichTextSizePage"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_TOP_UNITS"</string>
+                          <long name="proxy-Id value">10729</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_unitsTop"</string>
+                          <string name="proxy-Strings">"px|cm|percent"</string>
+                          <string name="proxy-Initial value">"px"</string>
+                          <string name="proxy-Help text">"Units for the top position."</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">60</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>
+                          <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
+                      </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="proxy-type">"wbBoxSizerProxy"</string>
+                        <string name="proxy-Orientation">"Horizontal"</string>
+                        <string name="proxy-Member variable name">"m_rightSizer"</string>
+                        <string name="proxy-AlignH">"Left"</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>
+                        <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <document>
+                          <string name="title">"wxCheckBox: ID_RICHTEXT_RIGHT_CHECKBOX"</string>
+                          <string name="type">"dialog-control-document"</string>
+                          <string name="filename">""</string>
+                          <string name="icon-name">"checkbox"</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">"wbCheckBoxProxy"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_RIGHT_CHECKBOX"</string>
+                          <long name="proxy-Id value">10727</long>
+                          <string name="proxy-Name">""</string>
+                          <string name="proxy-Class">"wxCheckBox"</string>
+                          <string name="proxy-Base class">"wxCheckBox"</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_positionRightCheckbox"</string>
+                          <string name="proxy-Label">"&amp;Right:"</string>
+                          <bool name="proxy-Initial value">0</bool>
+                          <string name="proxy-Help text">"The right position."</string>
+                          <string name="proxy-Tooltip text">""</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>
+                          <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>
+                          <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                          <bool name="proxy-wxCHK_2STATE">0</bool>
+                          <bool name="proxy-wxCHK_3STATE">0</bool>
+                          <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">"Left"</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">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="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">"m_rightLabel"</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">1</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">"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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
                       </document>
                       <document>
                         <string name="title">"wxBoxSizer H"</string>
@@ -18410,7 +19149,7 @@
                         <long name="locked">0</long>
                         <string name="proxy-type">"wbBoxSizerProxy"</string>
                         <string name="proxy-Orientation">"Horizontal"</string>
-                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-Member variable name">"m_rightPositionSizer"</string>
                         <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
@@ -18425,7 +19164,7 @@
                         <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
                         <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                         <document>
-                          <string name="title">"wxTextCtrl: ID_RICHTEXT_TOP"</string>
+                          <string name="title">"wxTextCtrl: ID_RICHTEXT_RIGHT"</string>
                           <string name="type">"dialog-control-document"</string>
                           <string name="filename">""</string>
                           <string name="icon-name">"textctrl"</string>
@@ -18434,9 +19173,9 @@
                           <long name="title-mode">0</long>
                           <long name="locked">0</long>
                           <string name="proxy-type">"wbTextCtrlProxy"</string>
-                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextTopUpdate|NONE||wxRichTextSizePage"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXT_TOP"</string>
-                          <long name="proxy-Id value">10728</long>
+                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextRightUpdate|NONE||wxRichTextSizePage"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_RIGHT"</string>
+                          <long name="proxy-Id value">10730</long>
                           <string name="proxy-Name">""</string>
                           <string name="proxy-Class">"wxTextCtrl"</string>
                           <string name="proxy-Base class">"wxTextCtrl"</string>
@@ -18444,10 +19183,10 @@
                           <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_top"</string>
+                          <string name="proxy-Member variable name">"m_right"</string>
                           <string name="proxy-Initial value">""</string>
                           <long name="proxy-Max length">10</long>
-                          <string name="proxy-Help text">"The top position."</string>
+                          <string name="proxy-Help text">"The right position."</string>
                           <string name="proxy-Tooltip text">""</string>
                           <string name="proxy-Background colour">""</string>
                           <string name="proxy-Foreground colour">""</string>
@@ -18509,7 +19248,7 @@
                           <string name="proxy-Custom ctor arguments">""</string>
                         </document>
                         <document>
-                          <string name="title">"wxComboBox: ID_RICHTEXT_TOP_UNITS"</string>
+                          <string name="title">"wxComboBox: ID_RICHTEXT_RIGHT_UNITS"</string>
                           <string name="type">"dialog-control-document"</string>
                           <string name="filename">""</string>
                           <string name="icon-name">"combobox"</string>
@@ -18518,9 +19257,9 @@
                           <long name="title-mode">0</long>
                           <long name="locked">0</long>
                           <string name="proxy-type">"wbComboBoxProxy"</string>
-                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextTopUpdate|NONE||wxRichTextSizePage"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXT_TOP_UNITS"</string>
-                          <long name="proxy-Id value">10729</long>
+                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextRightUnitsUpdate|NONE||wxRichTextSizePage"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_RIGHT_UNITS"</string>
+                          <long name="proxy-Id value">10731</long>
                           <string name="proxy-Name">""</string>
                           <string name="proxy-Class">"wxComboBox"</string>
                           <string name="proxy-Base class">"wxComboBox"</string>
@@ -18528,10 +19267,10 @@
                           <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_unitsTop"</string>
+                          <string name="proxy-Member variable name">"m_unitsRight"</string>
                           <string name="proxy-Strings">"px|cm|percent"</string>
                           <string name="proxy-Initial value">"px"</string>
-                          <string name="proxy-Help text">"Units for the top position."</string>
+                          <string name="proxy-Help text">"Units for the right position."</string>
                           <string name="proxy-Tooltip text">""</string>
                           <string name="proxy-Background colour">""</string>
                           <string name="proxy-Foreground colour">""</string>
@@ -18575,70 +19314,6 @@
                           <string name="proxy-Custom ctor arguments">""</string>
                         </document>
                       </document>
-                      <document>
-                        <string name="title">"wxCheckBox: ID_RICHTEXT_RIGHT_CHECKBOX"</string>
-                        <string name="type">"dialog-control-document"</string>
-                        <string name="filename">""</string>
-                        <string name="icon-name">"checkbox"</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">"wbCheckBoxProxy"</string>
-                        <string name="proxy-Id name">"ID_RICHTEXT_RIGHT_CHECKBOX"</string>
-                        <long name="proxy-Id value">10727</long>
-                        <string name="proxy-Name">""</string>
-                        <string name="proxy-Class">"wxCheckBox"</string>
-                        <string name="proxy-Base class">"wxCheckBox"</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_positionRightCheckbox"</string>
-                        <string name="proxy-Label">"&amp;Right:"</string>
-                        <bool name="proxy-Initial value">0</bool>
-                        <string name="proxy-Help text">"The right position."</string>
-                        <string name="proxy-Tooltip text">""</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>
-                        <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>
-                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                        <bool name="proxy-wxCHK_2STATE">0</bool>
-                        <bool name="proxy-wxCHK_3STATE">0</bool>
-                        <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">"Left"</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
-                        <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>
@@ -18650,8 +19325,8 @@
                         <long name="locked">0</long>
                         <string name="proxy-type">"wbBoxSizerProxy"</string>
                         <string name="proxy-Orientation">"Horizontal"</string>
-                        <string name="proxy-Member variable name">"m_rightPositionSizer"</string>
-                        <string name="proxy-AlignH">"Expand"</string>
+                        <string name="proxy-Member variable name">"m_bottomSizer"</string>
+                        <string name="proxy-AlignH">"Left"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
@@ -18665,36 +19340,29 @@
                         <bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
                         <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                         <document>
-                          <string name="title">"wxTextCtrl: ID_RICHTEXT_RIGHT"</string>
+                          <string name="title">"wxCheckBox: ID_RICHTEXT_BOTTOM_CHECKBOX"</string>
                           <string name="type">"dialog-control-document"</string>
                           <string name="filename">""</string>
-                          <string name="icon-name">"textctrl"</string>
+                          <string name="icon-name">"checkbox"</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_UPDATE_UI|OnRichtextRightUpdate|NONE||wxRichTextSizePage"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXT_RIGHT"</string>
-                          <long name="proxy-Id value">10730</long>
+                          <string name="proxy-type">"wbCheckBoxProxy"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_BOTTOM_CHECKBOX"</string>
+                          <long name="proxy-Id value">10732</long>
                           <string name="proxy-Name">""</string>
-                          <string name="proxy-Class">"wxTextCtrl"</string>
-                          <string name="proxy-Base class">"wxTextCtrl"</string>
+                          <string name="proxy-Class">"wxCheckBox"</string>
+                          <string name="proxy-Base class">"wxCheckBox"</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_right"</string>
-                          <string name="proxy-Initial value">""</string>
-                          <long name="proxy-Max length">10</long>
-                          <string name="proxy-Help text">"The right position."</string>
+                          <string name="proxy-Member variable name">"m_positionBottomCheckbox"</string>
+                          <string name="proxy-Label">"&amp;Bottom:"</string>
+                          <bool name="proxy-Initial value">0</bool>
+                          <string name="proxy-Help text">"The bottom position."</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>
@@ -18702,38 +19370,25 @@
                           <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>
+                          <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>
+                          <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                          <bool name="proxy-wxCHK_2STATE">0</bool>
+                          <bool name="proxy-wxCHK_3STATE">0</bool>
+                          <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">65</long>
+                          <long name="proxy-Width">-1</long>
                           <long name="proxy-Height">-1</long>
-                          <string name="proxy-AlignH">"Centre"</string>
+                          <string name="proxy-AlignH">"Left"</string>
                           <string name="proxy-AlignV">"Centre"</string>
                           <long name="proxy-Stretch factor">0</long>
                           <long name="proxy-Border">5</long>
@@ -18749,34 +19404,33 @@
                           <string name="proxy-Custom ctor arguments">""</string>
                         </document>
                         <document>
-                          <string name="title">"wxComboBox: ID_RICHTEXT_RIGHT_UNITS"</string>
+                          <string name="title">"wxStaticText: wxID_STATIC"</string>
                           <string name="type">"dialog-control-document"</string>
                           <string name="filename">""</string>
-                          <string name="icon-name">"combobox"</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="proxy-type">"wbComboBoxProxy"</string>
-                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextRightUpdate|NONE||wxRichTextSizePage"</string>
-                          <string name="proxy-Id name">"ID_RICHTEXT_RIGHT_UNITS"</string>
-                          <long name="proxy-Id value">10731</long>
+                          <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">"wxComboBox"</string>
-                          <string name="proxy-Base class">"wxComboBox"</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">"m_unitsRight"</string>
-                          <string name="proxy-Strings">"px|cm|percent"</string>
-                          <string name="proxy-Initial value">"px"</string>
-                          <string name="proxy-Help text">"Units for the right position."</string>
+                          <string name="proxy-Member variable name">"m_bottomLabel"</string>
+                          <string name="proxy-Label">"&amp;Bottom:"</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-Hidden">1</bool>
                           <bool name="proxy-Enabled">1</bool>
                           <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                           <string name="proxy-Data variable">""</string>
@@ -18786,18 +19440,24 @@
                           <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-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">60</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>
@@ -18815,70 +19475,6 @@
                           <string name="proxy-Custom ctor arguments">""</string>
                         </document>
                       </document>
-                      <document>
-                        <string name="title">"wxCheckBox: ID_RICHTEXT_BOTTOM_CHECKBOX"</string>
-                        <string name="type">"dialog-control-document"</string>
-                        <string name="filename">""</string>
-                        <string name="icon-name">"checkbox"</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">"wbCheckBoxProxy"</string>
-                        <string name="proxy-Id name">"ID_RICHTEXT_BOTTOM_CHECKBOX"</string>
-                        <long name="proxy-Id value">10732</long>
-                        <string name="proxy-Name">""</string>
-                        <string name="proxy-Class">"wxCheckBox"</string>
-                        <string name="proxy-Base class">"wxCheckBox"</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_positionBottomCheckbox"</string>
-                        <string name="proxy-Label">"&amp;Bottom:"</string>
-                        <bool name="proxy-Initial value">0</bool>
-                        <string name="proxy-Help text">"The bottom position."</string>
-                        <string name="proxy-Tooltip text">""</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>
-                        <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>
-                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                        <bool name="proxy-wxCHK_2STATE">0</bool>
-                        <bool name="proxy-wxCHK_3STATE">0</bool>
-                        <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">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">"Left"</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">0</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-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
-                        <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>
@@ -18998,7 +19594,7 @@
                           <long name="title-mode">0</long>
                           <long name="locked">0</long>
                           <string name="proxy-type">"wbComboBoxProxy"</string>
-                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextBottomUpdate|NONE||wxRichTextSizePage"</string>
+                          <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextBottomUnitsUpdate|NONE||wxRichTextSizePage"</string>
                           <string name="proxy-Id name">"ID_RICHTEXT_BOTTOM_UNITS"</string>
                           <long name="proxy-Id value">10734</long>
                           <string name="proxy-Name">""</string>