]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e4bbd0)
The object size page now has full position attribute editing.
authorJulian Smart <julian@anthemion.co.uk>
Wed, 16 May 2012 10:59:30 +0000 (10:59 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Wed, 16 May 2012 10:59:30 +0000 (10:59 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/richtext/richtextbuffer.h patch | blob | blame | history
include/wx/richtext/richtextsizepage.h patch | blob | blame | history
interface/wx/richtext/richtextbuffer.h patch | blob | blame | history
src/richtext/richtextdialogs.pjd patch | blob | blame | history
src/richtext/richtextsizepage.cpp patch | blob | blame | history

diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h
index 24656faa51875f0e0ed0a9913717e05bb16f8a60..b9c7dfdc8a2a3cfe6eb130f86798aacf49dc65ce 100644 (file)
--- a/include/wx/richtext/richtextbuffer.h
+++ b/include/wx/richtext/richtextbuffer.h
@@ -335,7 +335,8 @@ enum wxTextBoxAttrPosition
 {
     wxTEXT_BOX_ATTR_POSITION_STATIC         = 0x0000, // Default is static, i.e. as per normal layout
     wxTEXT_BOX_ATTR_POSITION_RELATIVE       = 0x0010, // Relative to the relevant edge
-    wxTEXT_BOX_ATTR_POSITION_ABSOLUTE       = 0x0020,
+    wxTEXT_BOX_ATTR_POSITION_ABSOLUTE       = 0x0020, // Relative to the parent
+    wxTEXT_BOX_ATTR_POSITION_FIXED          = 0x0040, // Relative to the top-level window
 
     wxTEXT_BOX_ATTR_POSITION_MASK           = 0x00F0
 };
@@ -502,7 +503,7 @@ public:
     bool EqPartial(const wxTextAttrDimensions& dims) const;
 
     /**
-        Apply border to 'this', but not if the same as @a compareWith.
+        Apply to 'this', but not if the same as @a compareWith.
 
     */
     bool Apply(const wxTextAttrDimensions& dims, const wxTextAttrDimensions* compareWith = NULL);
@@ -592,7 +593,7 @@ public:
     bool EqPartial(const wxTextAttrSize& dims) const;
 
     /**
-        Apply border to this object, but not if the same as @a compareWith.
+        Apply to this object, but not if the same as @a compareWith.
     */
     bool Apply(const wxTextAttrSize& dims, const wxTextAttrSize* compareWith = NULL);
 
diff --git a/include/wx/richtext/richtextsizepage.h b/include/wx/richtext/richtextsizepage.h
index a840f63a39d544cba0bd2032571f3a62d6113dc0..72b9ccfecc6696f0e35399434e377740116ace1d 100644 (file)
--- a/include/wx/richtext/richtextsizepage.h
+++ b/include/wx/richtext/richtextsizepage.h
@@ -21,6 +21,7 @@
 
 ////@begin includes
 #include "wx/statline.h"
+#include "wx/valgen.h"
 ////@end includes
 
 /*!
@@ -83,6 +84,9 @@ public:
 
 ////@begin wxRichTextSizePage event handler declarations
 
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX
+    void OnRichtextVerticalAlignmentComboboxUpdate( wxUpdateUIEvent& event );
+
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_WIDTH
     void OnRichtextWidthUpdate( wxUpdateUIEvent& event );
 
@@ -101,11 +105,17 @@ public:
     /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_MAX_HEIGHT
     void OnRichtextMaxHeightUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX
-    void OnRichtextVerticalAlignmentComboboxUpdate( wxUpdateUIEvent& event );
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_LEFT
+    void OnRichtextLeftUpdate( wxUpdateUIEvent& event );
 
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OFFSET
-    void OnRichtextOffsetUpdate( wxUpdateUIEvent& event );
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_LEFT_UNITS
+    void OnRichtextTopUpdate( wxUpdateUIEvent& event );
+
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_RIGHT
+    void OnRichtextRightUpdate( wxUpdateUIEvent& event );
+
+    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BOTTOM
+    void OnRichtextBottomUpdate( wxUpdateUIEvent& event );
 
     /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXT_PARA_UP
     void OnRichtextParaUpClick( wxCommandEvent& event );
@@ -117,6 +127,9 @@ public:
 
 ////@begin wxRichTextSizePage member function declarations
 
+    int GetPositionMode() const { return m_positionMode ; }
+    void SetPositionMode(int value) { m_positionMode = value ; }
+
     /// Retrieves bitmap resources
     wxBitmap GetBitmapResource( const wxString& name );
 
@@ -131,6 +144,9 @@ public:
     wxBoxSizer* m_parentSizer;
     wxBoxSizer* m_floatingControls;
     wxComboBox* m_float;
+    wxBoxSizer* m_alignmentControls;
+    wxCheckBox* m_verticalAlignmentCheckbox;
+    wxComboBox* m_verticalAlignmentComboBox;
     wxCheckBox* m_widthCheckbox;
     wxTextCtrl* m_width;
     wxComboBox* m_unitsW;
@@ -149,19 +165,29 @@ public:
     wxCheckBox* m_maxHeightCheckbox;
     wxTextCtrl* m_maxHeight;
     wxComboBox* m_unitsMaxH;
-    wxBoxSizer* m_alignmentControls;
-    wxCheckBox* m_verticalAlignmentCheckbox;
-    wxComboBox* m_verticalAlignmentComboBox;
     wxBoxSizer* m_positionControls;
     wxBoxSizer* m_moveObjectParentSizer;
-    wxCheckBox* m_offsetYCheckbox;
-    wxTextCtrl* m_offset;
-    wxComboBox* m_unitsOffset;
+    wxComboBox* m_positionModeCtrl;
+    wxCheckBox* m_positionLeftCheckbox;
+    wxTextCtrl* m_left;
+    wxComboBox* m_unitsLeft;
+    wxCheckBox* m_positionTopCheckbox;
+    wxTextCtrl* m_top;
+    wxComboBox* m_unitsTop;
+    wxCheckBox* m_positionRightCheckbox;
+    wxTextCtrl* m_right;
+    wxComboBox* m_unitsRight;
+    wxCheckBox* m_positionBottomCheckbox;
+    wxTextCtrl* m_bottom;
+    wxComboBox* m_unitsBottom;
     wxBoxSizer* m_moveObjectSizer;
+    int m_positionMode;
     /// Control identifiers
     enum {
         ID_WXRICHTEXTSIZEPAGE = 10700,
         ID_RICHTEXT_FLOATING_MODE = 10701,
+        ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX = 10708,
+        ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX = 10709,
         ID_RICHTEXT_WIDTH_CHECKBOX = 10702,
         ID_RICHTEXT_WIDTH = 10703,
         ID_RICHTEXT_UNITS_W = 10704,
@@ -180,11 +206,19 @@ public:
         ID_RICHTEXT_MAX_HEIGHT_CHECKBOX = 10724,
         ID_RICHTEXT_MAX_HEIGHT = 10725,
         ID_RICHTEXT_UNITS_MAX_H = 10726,
-        ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX = 10708,
-        ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX = 10709,
-        ID_RICHTEXT_OFFSET_CHECKBOX = 10710,
-        ID_RICHTEXT_OFFSET = 10711,
-        ID_RICHTEXT_OFFSET_UNITS = 10712,
+        ID_RICHTEXT_POSITION_MODE = 10735,
+        ID_RICHTEXT_LEFT_CHECKBOX = 10710,
+        ID_RICHTEXT_LEFT = 10711,
+        ID_RICHTEXT_LEFT_UNITS = 10712,
+        ID_RICHTEXT_TOP_CHECKBOX = 10710,
+        ID_RICHTEXT_TOP = 10728,
+        ID_RICHTEXT_TOP_UNITS = 10729,
+        ID_RICHTEXT_RIGHT_CHECKBOX = 10727,
+        ID_RICHTEXT_RIGHT = 10730,
+        ID_RICHTEXT_RIGHT_UNITS = 10731,
+        ID_RICHTEXT_BOTTOM_CHECKBOX = 10732,
+        ID_RICHTEXT_BOTTOM = 10733,
+        ID_RICHTEXT_BOTTOM_UNITS = 10734,
         ID_RICHTEXT_PARA_UP = 10713,
         ID_RICHTEXT_PARA_DOWN = 10714
     };
diff --git a/interface/wx/richtext/richtextbuffer.h b/interface/wx/richtext/richtextbuffer.h
index f5edca39abd2f5ee8b2b3703fcce99803e4dd126..41cc9abc493566f1b1abcca561433587d8a993ae 100644 (file)
--- a/interface/wx/richtext/richtextbuffer.h
+++ b/interface/wx/richtext/richtextbuffer.h
@@ -216,7 +216,8 @@ enum wxTextBoxAttrPosition
 {
     wxTEXT_BOX_ATTR_POSITION_STATIC         = 0x0000, // Default is static, i.e. as per normal layout
     wxTEXT_BOX_ATTR_POSITION_RELATIVE       = 0x0010, // Relative to the relevant edge
-    wxTEXT_BOX_ATTR_POSITION_ABSOLUTE       = 0x0020,
+    wxTEXT_BOX_ATTR_POSITION_ABSOLUTE       = 0x0020, // Relative to the parent
+    wxTEXT_BOX_ATTR_POSITION_FIXED          = 0x0040, // Relative to the top-level window
 
     wxTEXT_BOX_ATTR_POSITION_MASK           = 0x00F0
 };
@@ -383,7 +384,7 @@ public:
     bool EqPartial(const wxTextAttrDimensions& dims) const;
 
     /**
-        Apply border to 'this', but not if the same as @a compareWith.
+        Apply to 'this', but not if the same as @a compareWith.
 
     */
     bool Apply(const wxTextAttrDimensions& dims, const wxTextAttrDimensions* compareWith = NULL);
@@ -473,7 +474,7 @@ public:
     bool EqPartial(const wxTextAttrSize& dims) const;
 
     /**
-        Apply border to this object, but not if the same as @a compareWith.
+        Apply to this object, but not if the same as @a compareWith.
     */
     bool Apply(const wxTextAttrSize& dims, const wxTextAttrSize* compareWith = NULL);
 
diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd
index e4b1afab917765dcd7eb5ea4d3a469a99cca8727..0323f23475d819c222b5d429237c2da2aa58e65b 100644 (file)
--- a/src/richtext/richtextdialogs.pjd
+++ b/src/richtext/richtextdialogs.pjd
@@ -14569,6 +14569,7 @@
           <string name="app-kind">"Standard"</string>
           <long name="use-xrc">0</long>
           <long name="working-mode">0</long>
+          <string name="variable-0">"m_positionMode|int|PositionMode|0|0|0|"</string>
           <string name="proxy-Id name">"ID_WXRICHTEXTSIZEPAGE"</string>
           <long name="proxy-Id value">10700</long>
           <string name="proxy-Class">"wxRichTextSizePage"</string>
@@ -14671,7 +14672,7 @@
               <bool name="proxy-wxFIXED_MINSIZE">0</bool>
               <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
               <document>
-                <string name="title">"wxBoxSizer V"</string>
+                <string name="title">"wxBoxSizer H"</string>
                 <string name="type">"dialog-control-document"</string>
                 <string name="filename">""</string>
                 <string name="icon-name">"sizer"</string>
@@ -14680,8 +14681,8 @@
                 <long name="title-mode">0</long>
                 <long name="locked">0</long>
                 <string name="proxy-type">"wbBoxSizerProxy"</string>
-                <string name="proxy-Orientation">"Vertical"</string>
-                <string name="proxy-Member variable name">"m_floatingControls"</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>
@@ -14695,157 +14696,7 @@
                 <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                 <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <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>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <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">""</string>
-                    <string name="proxy-Label">"Floating"</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">"wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false"</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</string>
-                    <string name="proxy-Data validator">""</string>
-                    <string name="proxy-Data source">""</string>
-                    <string name="proxy-Data class name">""</string>
-                    <string name="proxy-Data class implementation filename">""</string>
-                    <string name="proxy-Data class header filename">""</string>
-                    <string name="proxy-Data class manager window">""</string>
-                    <bool name="proxy-wxALIGN_LEFT">0</bool>
-                    <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                    <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
-                    <bool name="proxy-wxNO_BORDER">0</bool>
-                    <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                    <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                    <bool name="proxy-wxBORDER_THEME">0</bool>
-                    <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                    <bool name="proxy-wxRAISED_BORDER">0</bool>
-                    <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                    <bool name="proxy-wxWANTS_CHARS">0</bool>
-                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                    <string name="proxy-Custom styles">""</string>
-                    <long name="proxy-X">-1</long>
-                    <long name="proxy-Y">-1</long>
-                    <long name="proxy-Width">-1</long>
-                    <long name="proxy-Height">-1</long>
-                    <string name="proxy-AlignH">"Centre"</string>
-                    <string name="proxy-AlignV">"Centre"</string>
-                    <long name="proxy-Stretch factor">0</long>
-                    <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                    <string name="proxy-Custom arguments">""</string>
-                    <string name="proxy-Custom ctor arguments">""</string>
-                  </document>
-                  <document>
-                    <string name="title">"wxStaticLine: wxID_STATIC"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"staticline"</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">"wbStaticLineProxy"</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">"wxStaticLine"</string>
-                    <string name="proxy-Base class">"wxStaticLine"</string>
-                    <bool name="proxy-External implementation">1</bool>
-                    <bool name="proxy-Separate files">0</bool>
-                    <string name="proxy-Implementation filename">""</string>
-                    <string name="proxy-Header filename">""</string>
-                    <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-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-wxLI_HORIZONTAL">1</bool>
-                    <bool name="proxy-wxLI_VERTICAL">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">1</long>
-                    <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  </document>
-                </document>
-                <document>
-                  <string name="title">"wxBoxSizer H"</string>
+                  <string name="title">"wxBoxSizer V"</string>
                   <string name="type">"dialog-control-document"</string>
                   <string name="filename">""</string>
                   <string name="icon-name">"sizer"</string>
@@ -14854,11 +14705,11 @@
                   <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-Orientation">"Vertical"</string>
+                  <string name="proxy-Member variable name">"m_floatingControls"</string>
                   <string name="proxy-AlignH">"Expand"</string>
                   <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
+                  <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>
@@ -14869,32 +14720,7 @@
                   <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                   <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   <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">5</long>
-                    <long name="proxy-Height">5</long>
-                    <string name="proxy-AlignH">"Centre"</string>
-                    <string name="proxy-AlignV">"Centre"</string>
-                    <long name="proxy-Stretch factor">0</long>
-                    <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  </document>
-                  <document>
-                    <string name="title">"wxFlexGridSizer"</string>
+                    <string name="title">"wxBoxSizer H"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
                     <string name="icon-name">"sizer"</string>
@@ -14902,26 +14728,21 @@
                     <long name="owns-file">1</long>
                     <long name="title-mode">0</long>
                     <long name="locked">0</long>
-                    <string name="proxy-type">"wbFlexGridSizerProxy"</string>
-                    <string name="proxy-GrowableColumns">""</string>
-                    <string name="proxy-GrowableRows">""</string>
-                    <long name="proxy-Columns">2</long>
-                    <long name="proxy-Rows">0</long>
-                    <long name="proxy-ColumnSpacing">0</long>
-                    <long name="proxy-RowSpacing">0</long>
+                    <string name="proxy-type">"wbBoxSizerProxy"</string>
+                    <string name="proxy-Orientation">"Horizontal"</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</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">1</bool>
+                    <bool name="proxy-wxRIGHT">0</bool>
                     <bool name="proxy-wxTOP">0</bool>
                     <bool name="proxy-wxBOTTOM">0</bool>
                     <bool name="proxy-wxSHAPED">0</bool>
                     <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <document>
                       <string name="title">"wxStaticText: wxID_STATIC"</string>
                       <string name="type">"dialog-control-document"</string>
@@ -14942,13 +14763,13 @@
                       <string name="proxy-Implementation filename">""</string>
                       <string name="proxy-Header filename">""</string>
                       <string name="proxy-Member variable name">""</string>
-                      <string name="proxy-Label">"&amp;Floating mode:"</string>
+                      <string name="proxy-Label">"Floating"</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>
+                      <string name="proxy-Font">"wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false"</string>
                       <bool name="proxy-Hidden">0</bool>
                       <bool name="proxy-Enabled">1</bool>
                       <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
@@ -14978,7 +14799,7 @@
                       <long name="proxy-Y">-1</long>
                       <long name="proxy-Width">-1</long>
                       <long name="proxy-Height">-1</long>
-                      <string name="proxy-AlignH">"Right"</string>
+                      <string name="proxy-AlignH">"Centre"</string>
                       <string name="proxy-AlignV">"Centre"</string>
                       <long name="proxy-Stretch factor">0</long>
                       <long name="proxy-Border">5</long>
@@ -14993,58 +14814,51 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                     <document>
-                      <string name="title">"wxComboBox: ID_RICHTEXT_FLOATING_MODE"</string>
+                      <string name="title">"wxStaticLine: wxID_STATIC"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
-                      <string name="icon-name">"combobox"</string>
+                      <string name="icon-name">"staticline"</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-Id name">"ID_RICHTEXT_FLOATING_MODE"</string>
-                      <long name="proxy-Id value">10701</long>
+                      <string name="proxy-type">"wbStaticLineProxy"</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">"wxStaticLine"</string>
+                      <string name="proxy-Base class">"wxStaticLine"</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_float"</string>
-                      <string name="proxy-Strings">"None|Left|Right"</string>
-                      <string name="proxy-Initial value">"None"</string>
-                      <string name="proxy-Help text">"How the object will float relative to the text."</string>
-                      <string name="proxy-Tooltip text">""</string>
+                      <string name="proxy-Member variable name">""</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-wxLI_HORIZONTAL">1</bool>
+                      <bool name="proxy-wxLI_VERTICAL">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">80</long>
+                      <long name="proxy-Width">-1</long>
                       <long name="proxy-Height">-1</long>
-                      <string name="proxy-AlignH">"Left"</string>
+                      <string name="proxy-AlignH">"Centre"</string>
                       <string name="proxy-AlignV">"Centre"</string>
-                      <long name="proxy-Stretch factor">0</long>
+                      <long name="proxy-Stretch factor">1</long>
                       <long name="proxy-Border">5</long>
                       <bool name="proxy-wxLEFT">1</bool>
                       <bool name="proxy-wxRIGHT">1</bool>
@@ -15053,303 +14867,247 @@
                       <bool name="proxy-wxSHAPED">0</bool>
                       <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                       <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                      <string name="proxy-Custom arguments">""</string>
-                      <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                   </document>
-                </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>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <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">""</string>
-                  <string name="proxy-Label">"Size"</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">"wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false"</string>
-                  <bool name="proxy-Hidden">0</bool>
-                  <bool name="proxy-Enabled">1</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <string name="proxy-Data variable">""</string>
-                  <string name="proxy-Data validator">""</string>
-                  <string name="proxy-Data source">""</string>
-                  <string name="proxy-Data class name">""</string>
-                  <string name="proxy-Data class implementation filename">""</string>
-                  <string name="proxy-Data class header filename">""</string>
-                  <string name="proxy-Data class manager window">""</string>
-                  <bool name="proxy-wxALIGN_LEFT">0</bool>
-                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                  <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                  <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
-                  <bool name="proxy-wxNO_BORDER">0</bool>
-                  <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                  <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                  <bool name="proxy-wxBORDER_THEME">0</bool>
-                  <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                  <bool name="proxy-wxRAISED_BORDER">0</bool>
-                  <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                  <bool name="proxy-wxWANTS_CHARS">0</bool>
-                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                  <string name="proxy-Custom styles">""</string>
-                  <long name="proxy-X">-1</long>
-                  <long name="proxy-Y">-1</long>
-                  <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
-                  <string name="proxy-AlignH">"Centre"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Custom arguments">""</string>
-                  <string name="proxy-Custom ctor arguments">""</string>
-                </document>
-                <document>
-                  <string name="title">"wxStaticLine: wxID_STATIC"</string>
-                  <string name="type">"dialog-control-document"</string>
-                  <string name="filename">""</string>
-                  <string name="icon-name">"staticline"</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">"wbStaticLineProxy"</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">"wxStaticLine"</string>
-                  <string name="proxy-Base class">"wxStaticLine"</string>
-                  <bool name="proxy-External implementation">1</bool>
-                  <bool name="proxy-Separate files">0</bool>
-                  <string name="proxy-Implementation filename">""</string>
-                  <string name="proxy-Header filename">""</string>
-                  <string name="proxy-Member variable name">""</string>
-                  <string name="proxy-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-wxLI_HORIZONTAL">1</bool>
-                  <bool name="proxy-wxLI_VERTICAL">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">1</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                </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>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <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">5</long>
-                  <long name="proxy-Height">5</long>
-                  <string name="proxy-AlignH">"Centre"</string>
-                  <string name="proxy-AlignV">"Centre"</string>
-                  <long name="proxy-Stretch factor">0</long>
-                  <long name="proxy-Border">5</long>
-                  <bool name="proxy-wxLEFT">1</bool>
-                  <bool name="proxy-wxRIGHT">1</bool>
-                  <bool name="proxy-wxTOP">1</bool>
-                  <bool name="proxy-wxBOTTOM">1</bool>
-                  <bool name="proxy-wxSHAPED">0</bool>
-                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                </document>
-                <document>
-                  <string name="title">"wxFlexGridSizer"</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">"wbFlexGridSizerProxy"</string>
-                  <string name="proxy-GrowableColumns">""</string>
-                  <string name="proxy-GrowableRows">""</string>
-                  <long name="proxy-Columns">4</long>
-                  <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-Platform">"&lt;Any platform&gt;"</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>
                   <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-AlignH">"Left"</string>
+                    <string name="proxy-type">"wbBoxSizerProxy"</string>
+                    <string name="proxy-Orientation">"Horizontal"</string>
+                    <string name="proxy-Member variable name">""</string>
+                    <string name="proxy-AlignH">"Expand"</string>
                     <string name="proxy-AlignV">"Centre"</string>
                     <long name="proxy-Stretch factor">0</long>
                     <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">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>
-                    <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">"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">5</long>
+                      <long name="proxy-Height">5</long>
+                      <string name="proxy-AlignH">"Centre"</string>
+                      <string name="proxy-AlignV">"Centre"</string>
+                      <long name="proxy-Stretch factor">0</long>
+                      <long name="proxy-Border">5</long>
+                      <bool name="proxy-wxLEFT">1</bool>
+                      <bool name="proxy-wxRIGHT">1</bool>
+                      <bool name="proxy-wxTOP">1</bool>
+                      <bool name="proxy-wxBOTTOM">1</bool>
+                      <bool name="proxy-wxSHAPED">0</bool>
+                      <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                      <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                      <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                    </document>
+                    <document>
+                      <string name="title">"wxFlexGridSizer"</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">"wbFlexGridSizerProxy"</string>
+                      <string name="proxy-GrowableColumns">""</string>
+                      <string name="proxy-GrowableRows">""</string>
+                      <long name="proxy-Columns">2</long>
+                      <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-Platform">"&lt;Any platform&gt;"</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">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>
+                      <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">""</string>
+                        <string name="proxy-Label">"&amp;Floating mode:"</string>
+                        <long name="proxy-Wrapping width">-1</long>
+                        <string name="proxy-Help text">""</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxALIGN_LEFT">0</bool>
+                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                        <bool name="proxy-wxALIGN_CENTRE">0</bool>
+                        <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
+                        <bool name="proxy-wxNO_BORDER">0</bool>
+                        <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                        <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                        <bool name="proxy-wxBORDER_THEME">0</bool>
+                        <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                        <bool name="proxy-wxRAISED_BORDER">0</bool>
+                        <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">-1</long>
+                        <long name="proxy-Height">-1</long>
+                        <string name="proxy-AlignH">"Right"</string>
+                        <string name="proxy-AlignV">"Centre"</string>
+                        <long name="proxy-Stretch factor">0</long>
+                        <long name="proxy-Border">5</long>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>
+                        <bool name="proxy-wxSHAPED">0</bool>
+                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>
+                      </document>
+                      <document>
+                        <string name="title">"wxComboBox: ID_RICHTEXT_FLOATING_MODE"</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="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>
+                        <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_float"</string>
+                        <string name="proxy-Strings">"None|Left|Right"</string>
+                        <string name="proxy-Initial value">"None"</string>
+                        <string name="proxy-Help text">"How the object will float relative to the text."</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-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">80</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">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>
+                        <bool name="proxy-wxSHAPED">0</bool>
+                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>
+                      </document>
+                    </document>
                   </document>
+                </document>
+                <document>
+                  <string name="title">"wxBoxSizer V"</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">"Vertical"</string>
+                  <string name="proxy-Member variable name">"m_alignmentControls"</string>
+                  <string name="proxy-AlignH">"Expand"</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>
+                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   <document>
                     <string name="title">"wxBoxSizer H"</string>
                     <string name="type">"dialog-control-document"</string>
@@ -15362,7 +15120,7 @@
                     <string name="proxy-type">"wbBoxSizerProxy"</string>
                     <string name="proxy-Orientation">"Horizontal"</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-AlignH">"Left"</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>
@@ -15375,33 +15133,32 @@
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <document>
-                      <string name="title">"wxTextCtrl: ID_RICHTEXT_WIDTH"</string>
+                      <string name="title">"wxStaticText: wxID_STATIC"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
-                      <string name="icon-name">"textctrl"</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">"wbTextCtrlProxy"</string>
-                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextWidthUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_WIDTH"</string>
-                      <long name="proxy-Id value">10703</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">"wxTextCtrl"</string>
-                      <string name="proxy-Base class">"wxTextCtrl"</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_width"</string>
-                      <string name="proxy-Initial value">""</string>
-                      <long name="proxy-Max length">0</long>
-                      <string name="proxy-Help text">"The object width."</string>
+                      <string name="proxy-Member variable name">""</string>
+                      <string name="proxy-Label">"Alignment"</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>
+                      <string name="proxy-Font">"wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false"</string>
                       <bool name="proxy-Hidden">0</bool>
                       <bool name="proxy-Enabled">1</bool>
                       <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
@@ -15412,22 +15169,10 @@
                       <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-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>
@@ -15441,14 +15186,14 @@
                       <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">"Left"</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">0</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>
@@ -15458,59 +15203,51 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                     <document>
-                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_W"</string>
+                      <string name="title">"wxStaticLine: wxID_STATIC"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
-                      <string name="icon-name">"combobox"</string>
+                      <string name="icon-name">"staticline"</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|OnRichtextWidthUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_W"</string>
-                      <long name="proxy-Id value">10704</long>
+                      <string name="proxy-type">"wbStaticLineProxy"</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">"wxStaticLine"</string>
+                      <string name="proxy-Base class">"wxStaticLine"</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_unitsW"</string>
-                      <string name="proxy-Strings">"px|cm|percent"</string>
-                      <string name="proxy-Initial value">"px"</string>
-                      <string name="proxy-Help text">"Units for the object width."</string>
-                      <string name="proxy-Tooltip text">""</string>
+                      <string name="proxy-Member variable name">""</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-wxLI_HORIZONTAL">1</bool>
+                      <bool name="proxy-wxLI_VERTICAL">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>
-                      <long name="proxy-Stretch factor">0</long>
+                      <long name="proxy-Stretch factor">1</long>
                       <long name="proxy-Border">5</long>
                       <bool name="proxy-wxLEFT">1</bool>
                       <bool name="proxy-wxRIGHT">1</bool>
@@ -15519,73 +15256,8 @@
                       <bool name="proxy-wxSHAPED">0</bool>
                       <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                       <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                      <string name="proxy-Custom arguments">""</string>
-                      <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                   </document>
-                  <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>
-                    <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>
@@ -15598,7 +15270,7 @@
                     <string name="proxy-type">"wbBoxSizerProxy"</string>
                     <string name="proxy-Orientation">"Horizontal"</string>
                     <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-AlignH">"Left"</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>
@@ -15611,36 +15283,54 @@
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <document>
-                      <string name="title">"wxTextCtrl: ID_RICHTEXT_HEIGHT"</string>
+                      <string name="title">"Spacer"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
-                      <string name="icon-name">"textctrl"</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">"wbTextCtrlProxy"</string>
-                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextHeightUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_HEIGHT"</string>
-                      <long name="proxy-Id value">10706</long>
+                      <string name="proxy-type">"wbSpacerProxy"</string>
+                      <long name="proxy-Width">5</long>
+                      <long name="proxy-Height">5</long>
+                      <string name="proxy-AlignH">"Centre"</string>
+                      <string name="proxy-AlignV">"Centre"</string>
+                      <long name="proxy-Stretch factor">0</long>
+                      <long name="proxy-Border">5</long>
+                      <bool name="proxy-wxLEFT">1</bool>
+                      <bool name="proxy-wxRIGHT">1</bool>
+                      <bool name="proxy-wxTOP">1</bool>
+                      <bool name="proxy-wxBOTTOM">1</bool>
+                      <bool name="proxy-wxSHAPED">0</bool>
+                      <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                      <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                      <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                    </document>
+                    <document>
+                      <string name="title">"wxCheckBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_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_VERTICAL_ALIGNMENT_CHECKBOX"</string>
+                      <long name="proxy-Id value">10708</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_height"</string>
-                      <string name="proxy-Initial value">""</string>
-                      <long name="proxy-Max length">0</long>
-                      <string name="proxy-Help text">"The object height."</string>
+                      <string name="proxy-Member variable name">"m_verticalAlignmentCheckbox"</string>
+                      <string name="proxy-Label">"&amp;Vertical alignment:"</string>
+                      <bool name="proxy-Initial value">0</bool>
+                      <string name="proxy-Help text">"Enable vertical alignment."</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>
@@ -15648,43 +15338,30 @@
                       <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">60</long>
+                      <long name="proxy-Width">-1</long>
                       <long name="proxy-Height">-1</long>
-                      <string name="proxy-AlignH">"Left"</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">0</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>
@@ -15694,7 +15371,7 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                     <document>
-                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_H"</string>
+                      <string name="title">"wxComboBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"combobox"</string>
@@ -15703,9 +15380,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|OnRichtextHeightUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_H"</string>
-                      <long name="proxy-Id value">10707</long>
+                      <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>
@@ -15713,10 +15390,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_unitsH"</string>
-                      <string name="proxy-Strings">"px|cm|percent"</string>
-                      <string name="proxy-Initial value">"px"</string>
-                      <string name="proxy-Help text">"Units for the object height."</string>
+                      <string name="proxy-Member variable name">"m_verticalAlignmentComboBox"</string>
+                      <string name="proxy-Strings">"Top|Centred|Bottom"</string>
+                      <string name="proxy-Initial value">"Top"</string>
+                      <string name="proxy-Help text">"Vertical alignment."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -15742,7 +15419,7 @@
                       <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>
@@ -15759,86 +15436,316 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                   </document>
+                </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>
+                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                <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">""</string>
+                  <string name="proxy-Label">"Size"</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">"wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false"</string>
+                  <bool name="proxy-Hidden">0</bool>
+                  <bool name="proxy-Enabled">1</bool>
+                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                  <string name="proxy-Data variable">""</string>
+                  <string name="proxy-Data validator">""</string>
+                  <string name="proxy-Data source">""</string>
+                  <string name="proxy-Data class name">""</string>
+                  <string name="proxy-Data class implementation filename">""</string>
+                  <string name="proxy-Data class header filename">""</string>
+                  <string name="proxy-Data class manager window">""</string>
+                  <bool name="proxy-wxALIGN_LEFT">0</bool>
+                  <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                  <bool name="proxy-wxALIGN_CENTRE">0</bool>
+                  <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
+                  <bool name="proxy-wxNO_BORDER">0</bool>
+                  <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                  <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                  <bool name="proxy-wxBORDER_THEME">0</bool>
+                  <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                  <bool name="proxy-wxRAISED_BORDER">0</bool>
+                  <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                  <bool name="proxy-wxWANTS_CHARS">0</bool>
+                  <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                  <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                  <string name="proxy-Custom styles">""</string>
+                  <long name="proxy-X">-1</long>
+                  <long name="proxy-Y">-1</long>
+                  <long name="proxy-Width">-1</long>
+                  <long name="proxy-Height">-1</long>
+                  <string name="proxy-AlignH">"Centre"</string>
+                  <string name="proxy-AlignV">"Centre"</string>
+                  <long name="proxy-Stretch factor">0</long>
+                  <long name="proxy-Border">5</long>
+                  <bool name="proxy-wxLEFT">1</bool>
+                  <bool name="proxy-wxRIGHT">1</bool>
+                  <bool name="proxy-wxTOP">1</bool>
+                  <bool name="proxy-wxBOTTOM">1</bool>
+                  <bool name="proxy-wxSHAPED">0</bool>
+                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                  <string name="proxy-Custom arguments">""</string>
+                  <string name="proxy-Custom ctor arguments">""</string>
+                </document>
+                <document>
+                  <string name="title">"wxStaticLine: wxID_STATIC"</string>
+                  <string name="type">"dialog-control-document"</string>
+                  <string name="filename">""</string>
+                  <string name="icon-name">"staticline"</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">"wbStaticLineProxy"</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">"wxStaticLine"</string>
+                  <string name="proxy-Base class">"wxStaticLine"</string>
+                  <bool name="proxy-External implementation">1</bool>
+                  <bool name="proxy-Separate files">0</bool>
+                  <string name="proxy-Implementation filename">""</string>
+                  <string name="proxy-Header filename">""</string>
+                  <string name="proxy-Member variable name">""</string>
+                  <string name="proxy-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-wxLI_HORIZONTAL">1</bool>
+                  <bool name="proxy-wxLI_VERTICAL">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">1</long>
+                  <long name="proxy-Border">5</long>
+                  <bool name="proxy-wxLEFT">1</bool>
+                  <bool name="proxy-wxRIGHT">1</bool>
+                  <bool name="proxy-wxTOP">1</bool>
+                  <bool name="proxy-wxBOTTOM">1</bool>
+                  <bool name="proxy-wxSHAPED">0</bool>
+                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                </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>
+                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                <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">5</long>
+                  <long name="proxy-Height">5</long>
+                  <string name="proxy-AlignH">"Centre"</string>
+                  <string name="proxy-AlignV">"Centre"</string>
+                  <long name="proxy-Stretch factor">0</long>
+                  <long name="proxy-Border">5</long>
+                  <bool name="proxy-wxLEFT">1</bool>
+                  <bool name="proxy-wxRIGHT">1</bool>
+                  <bool name="proxy-wxTOP">1</bool>
+                  <bool name="proxy-wxBOTTOM">1</bool>
+                  <bool name="proxy-wxSHAPED">0</bool>
+                  <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                  <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                </document>
+                <document>
+                  <string name="title">"wxFlexGridSizer"</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">"wbFlexGridSizerProxy"</string>
+                  <string name="proxy-GrowableColumns">""</string>
+                  <string name="proxy-GrowableRows">""</string>
+                  <long name="proxy-Columns">4</long>
+                  <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-Platform">"&lt;Any platform&gt;"</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>
                   <document>
-                    <string name="title">"wxCheckBox: ID_RICHTEXT_MIN_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_MIN_WIDTH_CHECKBOX"</string>
-                    <long name="proxy-Id value">10715</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_minWidthCheckbox"</string>
-                    <string name="proxy-Label">"Min width:"</string>
-                    <bool name="proxy-Initial value">0</bool>
-                    <string name="proxy-Help text">"Enable the minimum 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>
-                    <string name="proxy-Custom arguments">""</string>
-                    <string name="proxy-Custom ctor arguments">""</string>
-                  </document>
-                  <document>
-                    <string name="title">"wxBoxSizer H"</string>
+                    <string name="title">"wxCheckBox: ID_RICHTEXT_WIDTH_CHECKBOX"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
-                    <string name="icon-name">"sizer"</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">"wbBoxSizerProxy"</string>
-                    <string name="proxy-Orientation">"Horizontal"</string>
-                    <string name="proxy-Member variable name">""</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>
+                    <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>
+                    <string name="proxy-Custom arguments">""</string>
+                    <string name="proxy-Custom ctor arguments">""</string>
+                  </document>
+                  <document>
+                    <string name="title">"wxBoxSizer H"</string>
+                    <string name="type">"dialog-control-document"</string>
+                    <string name="filename">""</string>
+                    <string name="icon-name">"sizer"</string>
+                    <long name="is-transient">0</long>
+                    <long name="owns-file">1</long>
+                    <long name="title-mode">0</long>
+                    <long name="locked">0</long>
+                    <string name="proxy-type">"wbBoxSizerProxy"</string>
+                    <string name="proxy-Orientation">"Horizontal"</string>
+                    <string name="proxy-Member variable name">""</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>
@@ -15847,7 +15754,7 @@
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <document>
-                      <string name="title">"wxTextCtrl: ID_RICHTEXT_MIN_WIDTH"</string>
+                      <string name="title">"wxTextCtrl: ID_RICHTEXT_WIDTH"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"textctrl"</string>
@@ -15856,9 +15763,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|OnRichtextMinWidthUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_MIN_WIDTH"</string>
-                      <long name="proxy-Id value">10716</long>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextWidthUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_WIDTH"</string>
+                      <long name="proxy-Id value">10703</long>
                       <string name="proxy-Name">""</string>
                       <string name="proxy-Class">"wxTextCtrl"</string>
                       <string name="proxy-Base class">"wxTextCtrl"</string>
@@ -15866,10 +15773,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_minWidth"</string>
+                      <string name="proxy-Member variable name">"m_width"</string>
                       <string name="proxy-Initial value">""</string>
                       <long name="proxy-Max length">0</long>
-                      <string name="proxy-Help text">"The object minimum width."</string>
+                      <string name="proxy-Help text">"The object width."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -15930,7 +15837,7 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                     <document>
-                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_MIN_W"</string>
+                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_W"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"combobox"</string>
@@ -15939,9 +15846,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|OnRichtextMinWidthUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_MIN_W"</string>
-                      <long name="proxy-Id value">10717</long>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextWidthUpdate|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>
                       <string name="proxy-Class">"wxComboBox"</string>
                       <string name="proxy-Base class">"wxComboBox"</string>
@@ -15949,10 +15856,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_unitsMinW"</string>
+                      <string name="proxy-Member variable name">"m_unitsW"</string>
                       <string name="proxy-Strings">"px|cm|percent"</string>
                       <string name="proxy-Initial value">"px"</string>
-                      <string name="proxy-Help text">"Units for the minimum object width."</string>
+                      <string name="proxy-Help text">"Units for the object width."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -15996,7 +15903,7 @@
                     </document>
                   </document>
                   <document>
-                    <string name="title">"wxCheckBox: ID_RICHTEXT_MIN_HEIGHT_CHECKBOX"</string>
+                    <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>
@@ -16005,8 +15912,8 @@
                     <long name="title-mode">0</long>
                     <long name="locked">0</long>
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_RICHTEXT_MIN_HEIGHT_CHECKBOX"</string>
-                    <long name="proxy-Id value">10718</long>
+                    <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>
@@ -16014,10 +15921,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_minHeightCheckbox"</string>
-                    <string name="proxy-Label">"Min height:"</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 minimum height value."</string>
+                    <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>
@@ -16083,7 +15990,7 @@
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <document>
-                      <string name="title">"wxTextCtrl: ID_RICHTEXT_MIN_HEIGHT"</string>
+                      <string name="title">"wxTextCtrl: ID_RICHTEXT_HEIGHT"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"textctrl"</string>
@@ -16092,9 +15999,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|OnRichtextMinHeightUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_MIN_HEIGHT"</string>
-                      <long name="proxy-Id value">10719</long>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextHeightUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_HEIGHT"</string>
+                      <long name="proxy-Id value">10706</long>
                       <string name="proxy-Name">""</string>
                       <string name="proxy-Class">"wxTextCtrl"</string>
                       <string name="proxy-Base class">"wxTextCtrl"</string>
@@ -16102,10 +16009,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_minHeight"</string>
+                      <string name="proxy-Member variable name">"m_height"</string>
                       <string name="proxy-Initial value">""</string>
                       <long name="proxy-Max length">0</long>
-                      <string name="proxy-Help text">"The object minmum height."</string>
+                      <string name="proxy-Help text">"The object height."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -16166,7 +16073,7 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                     <document>
-                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_MIN_H"</string>
+                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_H"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"combobox"</string>
@@ -16175,9 +16082,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|OnRichtextMinHeightUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_MIN_H"</string>
-                      <long name="proxy-Id value">10720</long>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextHeightUpdate|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>
                       <string name="proxy-Class">"wxComboBox"</string>
                       <string name="proxy-Base class">"wxComboBox"</string>
@@ -16185,10 +16092,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_unitsMinH"</string>
+                      <string name="proxy-Member variable name">"m_unitsH"</string>
                       <string name="proxy-Strings">"px|cm|percent"</string>
                       <string name="proxy-Initial value">"px"</string>
-                      <string name="proxy-Help text">"Units for the minimum object height."</string>
+                      <string name="proxy-Help text">"Units for the object height."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -16232,7 +16139,7 @@
                     </document>
                   </document>
                   <document>
-                    <string name="title">"wxCheckBox: ID_RICHTEXT_MAX_WIDTH_CHECKBOX"</string>
+                    <string name="title">"wxCheckBox: ID_RICHTEXT_MIN_WIDTH_CHECKBOX"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
                     <string name="icon-name">"checkbox"</string>
@@ -16241,8 +16148,8 @@
                     <long name="title-mode">0</long>
                     <long name="locked">0</long>
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_RICHTEXT_MAX_WIDTH_CHECKBOX"</string>
-                    <long name="proxy-Id value">10721</long>
+                    <string name="proxy-Id name">"ID_RICHTEXT_MIN_WIDTH_CHECKBOX"</string>
+                    <long name="proxy-Id value">10715</long>
                     <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxCheckBox"</string>
                     <string name="proxy-Base class">"wxCheckBox"</string>
@@ -16250,10 +16157,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_maxWidthCheckbox"</string>
-                    <string name="proxy-Label">"Max width:"</string>
+                    <string name="proxy-Member variable name">"m_minWidthCheckbox"</string>
+                    <string name="proxy-Label">"Min width:"</string>
                     <bool name="proxy-Initial value">0</bool>
-                    <string name="proxy-Help text">"Enable the maximum width value."</string>
+                    <string name="proxy-Help text">"Enable the minimum width value."</string>
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
@@ -16319,7 +16226,7 @@
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <document>
-                      <string name="title">"wxTextCtrl: ID_RICHTEXT_MAX_WIDTH"</string>
+                      <string name="title">"wxTextCtrl: ID_RICHTEXT_MIN_WIDTH"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"textctrl"</string>
@@ -16328,9 +16235,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|OnRichtextMaxWidthUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_MAX_WIDTH"</string>
-                      <long name="proxy-Id value">10722</long>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextMinWidthUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_MIN_WIDTH"</string>
+                      <long name="proxy-Id value">10716</long>
                       <string name="proxy-Name">""</string>
                       <string name="proxy-Class">"wxTextCtrl"</string>
                       <string name="proxy-Base class">"wxTextCtrl"</string>
@@ -16338,10 +16245,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_maxWidth"</string>
+                      <string name="proxy-Member variable name">"m_minWidth"</string>
                       <string name="proxy-Initial value">""</string>
                       <long name="proxy-Max length">0</long>
-                      <string name="proxy-Help text">"The object maximum width."</string>
+                      <string name="proxy-Help text">"The object minimum width."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -16402,7 +16309,7 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                     <document>
-                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_MAX_W"</string>
+                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_MIN_W"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"combobox"</string>
@@ -16411,9 +16318,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|OnRichtextMaxWidthUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_MAX_W"</string>
-                      <long name="proxy-Id value">10723</long>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextMinWidthUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_MIN_W"</string>
+                      <long name="proxy-Id value">10717</long>
                       <string name="proxy-Name">""</string>
                       <string name="proxy-Class">"wxComboBox"</string>
                       <string name="proxy-Base class">"wxComboBox"</string>
@@ -16421,10 +16328,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_unitsMaxW"</string>
+                      <string name="proxy-Member variable name">"m_unitsMinW"</string>
                       <string name="proxy-Strings">"px|cm|percent"</string>
                       <string name="proxy-Initial value">"px"</string>
-                      <string name="proxy-Help text">"Units for the maximum object width."</string>
+                      <string name="proxy-Help text">"Units for the minimum object width."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -16468,7 +16375,7 @@
                     </document>
                   </document>
                   <document>
-                    <string name="title">"wxCheckBox: ID_RICHTEXT_MAX_HEIGHT_CHECKBOX"</string>
+                    <string name="title">"wxCheckBox: ID_RICHTEXT_MIN_HEIGHT_CHECKBOX"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
                     <string name="icon-name">"checkbox"</string>
@@ -16477,8 +16384,8 @@
                     <long name="title-mode">0</long>
                     <long name="locked">0</long>
                     <string name="proxy-type">"wbCheckBoxProxy"</string>
-                    <string name="proxy-Id name">"ID_RICHTEXT_MAX_HEIGHT_CHECKBOX"</string>
-                    <long name="proxy-Id value">10724</long>
+                    <string name="proxy-Id name">"ID_RICHTEXT_MIN_HEIGHT_CHECKBOX"</string>
+                    <long name="proxy-Id value">10718</long>
                     <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxCheckBox"</string>
                     <string name="proxy-Base class">"wxCheckBox"</string>
@@ -16486,10 +16393,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_maxHeightCheckbox"</string>
-                    <string name="proxy-Label">"Max height:"</string>
+                    <string name="proxy-Member variable name">"m_minHeightCheckbox"</string>
+                    <string name="proxy-Label">"Min height:"</string>
                     <bool name="proxy-Initial value">0</bool>
-                    <string name="proxy-Help text">"Enable the height value."</string>
+                    <string name="proxy-Help text">"Enable the minimum height value."</string>
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
@@ -16555,7 +16462,7 @@
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                     <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                     <document>
-                      <string name="title">"wxTextCtrl: ID_RICHTEXT_MAX_HEIGHT"</string>
+                      <string name="title">"wxTextCtrl: ID_RICHTEXT_MIN_HEIGHT"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"textctrl"</string>
@@ -16564,9 +16471,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|OnRichtextMaxHeightUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_MAX_HEIGHT"</string>
-                      <long name="proxy-Id value">10725</long>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextMinHeightUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_MIN_HEIGHT"</string>
+                      <long name="proxy-Id value">10719</long>
                       <string name="proxy-Name">""</string>
                       <string name="proxy-Class">"wxTextCtrl"</string>
                       <string name="proxy-Base class">"wxTextCtrl"</string>
@@ -16574,10 +16481,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_maxHeight"</string>
+                      <string name="proxy-Member variable name">"m_minHeight"</string>
                       <string name="proxy-Initial value">""</string>
                       <long name="proxy-Max length">0</long>
-                      <string name="proxy-Help text">"The object maximum height."</string>
+                      <string name="proxy-Help text">"The object minmum height."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -16638,7 +16545,7 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                     <document>
-                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_MAX_H"</string>
+                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_MIN_H"</string>
                       <string name="type">"dialog-control-document"</string>
                       <string name="filename">""</string>
                       <string name="icon-name">"combobox"</string>
@@ -16647,9 +16554,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|OnRichtextMaxHeightUpdate|NONE||wxRichTextSizePage"</string>
-                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_MAX_H"</string>
-                      <long name="proxy-Id value">10726</long>
+                      <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextMinHeightUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_MIN_H"</string>
+                      <long name="proxy-Id value">10720</long>
                       <string name="proxy-Name">""</string>
                       <string name="proxy-Class">"wxComboBox"</string>
                       <string name="proxy-Base class">"wxComboBox"</string>
@@ -16657,10 +16564,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_unitsMaxH"</string>
+                      <string name="proxy-Member variable name">"m_unitsMinH"</string>
                       <string name="proxy-Strings">"px|cm|percent"</string>
                       <string name="proxy-Initial value">"px"</string>
-                      <string name="proxy-Help text">"Units for the maximum object height."</string>
+                      <string name="proxy-Help text">"Units for the minimum object height."</string>
                       <string name="proxy-Tooltip text">""</string>
                       <string name="proxy-Background colour">""</string>
                       <string name="proxy-Foreground colour">""</string>
@@ -16703,243 +16610,18 @@
                       <string name="proxy-Custom ctor arguments">""</string>
                     </document>
                   </document>
-                </document>
-              </document>
-              <document>
-                <string name="title">"wxBoxSizer V"</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">"Vertical"</string>
-                <string name="proxy-Member variable name">"m_alignmentControls"</string>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">0</bool>
-                <bool name="proxy-wxRIGHT">0</bool>
-                <bool name="proxy-wxTOP">0</bool>
-                <bool name="proxy-wxBOTTOM">0</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <document>
-                  <string name="title">"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>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   <document>
-                    <string name="title">"wxStaticText: wxID_STATIC"</string>
+                    <string name="title">"wxCheckBox: ID_RICHTEXT_MAX_WIDTH_CHECKBOX"</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">""</string>
-                    <string name="proxy-Label">"Alignment"</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">"wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false"</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</string>
-                    <string name="proxy-Data validator">""</string>
-                    <string name="proxy-Data source">""</string>
-                    <string name="proxy-Data class name">""</string>
-                    <string name="proxy-Data class implementation filename">""</string>
-                    <string name="proxy-Data class header filename">""</string>
-                    <string name="proxy-Data class manager window">""</string>
-                    <bool name="proxy-wxALIGN_LEFT">0</bool>
-                    <bool name="proxy-wxALIGN_RIGHT">0</bool>
-                    <bool name="proxy-wxALIGN_CENTRE">0</bool>
-                    <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
-                    <bool name="proxy-wxNO_BORDER">0</bool>
-                    <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                    <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                    <bool name="proxy-wxBORDER_THEME">0</bool>
-                    <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                    <bool name="proxy-wxRAISED_BORDER">0</bool>
-                    <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                    <bool name="proxy-wxWANTS_CHARS">0</bool>
-                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                    <string name="proxy-Custom styles">""</string>
-                    <long name="proxy-X">-1</long>
-                    <long name="proxy-Y">-1</long>
-                    <long name="proxy-Width">-1</long>
-                    <long name="proxy-Height">-1</long>
-                    <string name="proxy-AlignH">"Centre"</string>
-                    <string name="proxy-AlignV">"Centre"</string>
-                    <long name="proxy-Stretch factor">0</long>
-                    <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                    <string name="proxy-Custom arguments">""</string>
-                    <string name="proxy-Custom ctor arguments">""</string>
-                  </document>
-                  <document>
-                    <string name="title">"wxStaticLine: wxID_STATIC"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"staticline"</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">"wbStaticLineProxy"</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">"wxStaticLine"</string>
-                    <string name="proxy-Base class">"wxStaticLine"</string>
-                    <bool name="proxy-External implementation">1</bool>
-                    <bool name="proxy-Separate files">0</bool>
-                    <string name="proxy-Implementation filename">""</string>
-                    <string name="proxy-Header filename">""</string>
-                    <string name="proxy-Member variable name">""</string>
-                    <string name="proxy-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-wxLI_HORIZONTAL">1</bool>
-                    <bool name="proxy-wxLI_VERTICAL">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">1</long>
-                    <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                  </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>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  <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">5</long>
-                    <long name="proxy-Height">5</long>
-                    <string name="proxy-AlignH">"Centre"</string>
-                    <string name="proxy-AlignV">"Centre"</string>
-                    <long name="proxy-Stretch factor">0</long>
-                    <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
-                    <bool name="proxy-wxSHAPED">0</bool>
-                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  </document>
-                  <document>
-                    <string name="title">"wxCheckBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX"</string>
-                    <string name="type">"dialog-control-document"</string>
-                    <string name="filename">""</string>
-                    <string name="icon-name">"checkbox"</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_VERTICAL_ALIGNMENT_CHECKBOX"</string>
-                    <long name="proxy-Id value">10708</long>
+                    <string name="proxy-Id name">"ID_RICHTEXT_MAX_WIDTH_CHECKBOX"</string>
+                    <long name="proxy-Id value">10721</long>
                     <string name="proxy-Name">""</string>
                     <string name="proxy-Class">"wxCheckBox"</string>
                     <string name="proxy-Base class">"wxCheckBox"</string>
@@ -16947,10 +16629,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_verticalAlignmentCheckbox"</string>
-                    <string name="proxy-Label">"&amp;Vertical alignment:"</string>
+                    <string name="proxy-Member variable name">"m_maxWidthCheckbox"</string>
+                    <string name="proxy-Label">"Max width:"</string>
                     <bool name="proxy-Initial value">0</bool>
-                    <string name="proxy-Help text">"Enable vertical alignment."</string>
+                    <string name="proxy-Help text">"Enable the maximum width value."</string>
                     <string name="proxy-Tooltip text">""</string>
                     <string name="proxy-Data variable">""</string>
                     <string name="proxy-Data validator">""</string>
@@ -16977,12 +16659,12 @@
                     <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-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">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>
@@ -16992,150 +16674,202 @@
                     <string name="proxy-Custom ctor arguments">""</string>
                   </document>
                   <document>
-                    <string name="title">"wxComboBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX"</string>
+                    <string name="title">"wxBoxSizer H"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
-                    <string name="icon-name">"combobox"</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">"wbComboBoxProxy"</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>
-                    <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_verticalAlignmentComboBox"</string>
-                    <string name="proxy-Strings">"Top|Centred|Bottom"</string>
-                    <string name="proxy-Initial value">"Top"</string>
-                    <string name="proxy-Help text">"Vertical alignment."</string>
-                    <string name="proxy-Tooltip text">""</string>
-                    <string name="proxy-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">""</string>
-                    <bool name="proxy-Hidden">0</bool>
-                    <bool name="proxy-Enabled">1</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                    <string name="proxy-Data variable">""</string>
-                    <string name="proxy-Data validator">""</string>
-                    <string name="proxy-Data source">""</string>
-                    <string name="proxy-Data class name">""</string>
-                    <string name="proxy-Data class implementation filename">""</string>
-                    <string name="proxy-Data class header filename">""</string>
-                    <string name="proxy-Data class manager window">""</string>
-                    <bool name="proxy-wxCB_SIMPLE">0</bool>
-                    <bool name="proxy-wxCB_DROPDOWN">0</bool>
-                    <bool name="proxy-wxCB_READONLY">1</bool>
-                    <bool name="proxy-wxCB_SORT">0</bool>
-                    <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                    <bool name="proxy-wxWANTS_CHARS">0</bool>
-                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                    <string name="proxy-Custom styles">""</string>
-                    <long name="proxy-X">-1</long>
-                    <long name="proxy-Y">-1</long>
-                    <long name="proxy-Width">-1</long>
-                    <long name="proxy-Height">-1</long>
-                    <string name="proxy-AlignH">"Centre"</string>
+                    <string name="proxy-type">"wbBoxSizerProxy"</string>
+                    <string name="proxy-Orientation">"Horizontal"</string>
+                    <string name="proxy-Member variable name">""</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-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
+                    <bool name="proxy-wxLEFT">0</bool>
+                    <bool name="proxy-wxRIGHT">0</bool>
+                    <bool name="proxy-wxTOP">0</bool>
+                    <bool name="proxy-wxBOTTOM">0</bool>
                     <bool name="proxy-wxSHAPED">0</bool>
                     <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                    <string name="proxy-Custom arguments">""</string>
-                    <string name="proxy-Custom ctor arguments">""</string>
-                  </document>
-                </document>
-              </document>
-              <document>
-                <string name="title">"wxBoxSizer V"</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">"Vertical"</string>
-                <string name="proxy-Member variable name">"m_positionControls"</string>
-                <string name="proxy-AlignH">"Expand"</string>
-                <string name="proxy-AlignV">"Centre"</string>
-                <long name="proxy-Stretch factor">0</long>
-                <long name="proxy-Border">5</long>
-                <bool name="proxy-wxLEFT">0</bool>
-                <bool name="proxy-wxRIGHT">0</bool>
-                <bool name="proxy-wxTOP">0</bool>
-                <bool name="proxy-wxBOTTOM">0</bool>
-                <bool name="proxy-wxSHAPED">0</bool>
-                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
-                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                <document>
-                  <string name="title">"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>
-                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                    <document>
+                      <string name="title">"wxTextCtrl: ID_RICHTEXT_MAX_WIDTH"</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|OnRichtextMaxWidthUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_MAX_WIDTH"</string>
+                      <long name="proxy-Id value">10722</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_maxWidth"</string>
+                      <string name="proxy-Initial value">""</string>
+                      <long name="proxy-Max length">0</long>
+                      <string name="proxy-Help text">"The object maximum width."</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">60</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>
+                      <string name="proxy-Custom arguments">""</string>
+                      <string name="proxy-Custom ctor arguments">""</string>
+                    </document>
+                    <document>
+                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_MAX_W"</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|OnRichtextMaxWidthUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_MAX_W"</string>
+                      <long name="proxy-Id value">10723</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_unitsMaxW"</string>
+                      <string name="proxy-Strings">"px|cm|percent"</string>
+                      <string name="proxy-Initial value">"px"</string>
+                      <string name="proxy-Help text">"Units for the maximum object width."</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>
+                      <string name="proxy-Custom arguments">""</string>
+                      <string name="proxy-Custom ctor arguments">""</string>
+                    </document>
+                  </document>
                   <document>
-                    <string name="title">"wxStaticText: wxID_STATIC"</string>
+                    <string name="title">"wxCheckBox: ID_RICHTEXT_MAX_HEIGHT_CHECKBOX"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
-                    <string name="icon-name">"statictext"</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">"wbStaticTextProxy"</string>
-                    <string name="proxy-Id name">"wxID_STATIC"</string>
-                    <long name="proxy-Id value">5105</long>
+                    <string name="proxy-type">"wbCheckBoxProxy"</string>
+                    <string name="proxy-Id name">"ID_RICHTEXT_MAX_HEIGHT_CHECKBOX"</string>
+                    <long name="proxy-Id value">10724</long>
                     <string name="proxy-Name">""</string>
-                    <string name="proxy-Class">"wxStaticText"</string>
-                    <string name="proxy-Base class">"wxStaticText"</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">""</string>
-                    <string name="proxy-Label">"Position"</string>
-                    <long name="proxy-Wrapping width">-1</long>
-                    <string name="proxy-Help text">""</string>
+                    <string name="proxy-Member variable name">"m_maxHeightCheckbox"</string>
+                    <string name="proxy-Label">"Max 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-Background colour">""</string>
-                    <string name="proxy-Foreground colour">""</string>
-                    <string name="proxy-Font">"wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false"</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>
@@ -17143,17 +16877,16 @@
                     <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>
+                    <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-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-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>
@@ -17162,12 +16895,12 @@
                     <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-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">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>
@@ -17177,61 +16910,204 @@
                     <string name="proxy-Custom ctor arguments">""</string>
                   </document>
                   <document>
-                    <string name="title">"wxStaticLine: wxID_STATIC"</string>
+                    <string name="title">"wxBoxSizer H"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
-                    <string name="icon-name">"staticline"</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">"wbStaticLineProxy"</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">"wxStaticLine"</string>
-                    <string name="proxy-Base class">"wxStaticLine"</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-type">"wbBoxSizerProxy"</string>
+                    <string name="proxy-Orientation">"Horizontal"</string>
                     <string name="proxy-Member variable name">""</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-wxLI_HORIZONTAL">1</bool>
-                    <bool name="proxy-wxLI_VERTICAL">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-AlignH">"Left"</string>
                     <string name="proxy-AlignV">"Centre"</string>
-                    <long name="proxy-Stretch factor">1</long>
+                    <long name="proxy-Stretch factor">0</long>
                     <long name="proxy-Border">5</long>
-                    <bool name="proxy-wxLEFT">1</bool>
-                    <bool name="proxy-wxRIGHT">1</bool>
-                    <bool name="proxy-wxTOP">1</bool>
-                    <bool name="proxy-wxBOTTOM">1</bool>
+                    <bool name="proxy-wxLEFT">0</bool>
+                    <bool name="proxy-wxRIGHT">0</bool>
+                    <bool name="proxy-wxTOP">0</bool>
+                    <bool name="proxy-wxBOTTOM">0</bool>
                     <bool name="proxy-wxSHAPED">0</bool>
                     <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                    <document>
+                      <string name="title">"wxTextCtrl: ID_RICHTEXT_MAX_HEIGHT"</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|OnRichtextMaxHeightUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_MAX_HEIGHT"</string>
+                      <long name="proxy-Id value">10725</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_maxHeight"</string>
+                      <string name="proxy-Initial value">""</string>
+                      <long name="proxy-Max length">0</long>
+                      <string name="proxy-Help text">"The object maximum height."</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">60</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>
+                      <string name="proxy-Custom arguments">""</string>
+                      <string name="proxy-Custom ctor arguments">""</string>
+                    </document>
+                    <document>
+                      <string name="title">"wxComboBox: ID_RICHTEXT_UNITS_MAX_H"</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|OnRichtextMaxHeightUpdate|NONE||wxRichTextSizePage"</string>
+                      <string name="proxy-Id name">"ID_RICHTEXT_UNITS_MAX_H"</string>
+                      <long name="proxy-Id value">10726</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_unitsMaxH"</string>
+                      <string name="proxy-Strings">"px|cm|percent"</string>
+                      <string name="proxy-Initial value">"px"</string>
+                      <string name="proxy-Help text">"Units for the maximum object height."</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>
+                      <string name="proxy-Custom arguments">""</string>
+                      <string name="proxy-Custom ctor arguments">""</string>
+                    </document>
                   </document>
                 </document>
+              </document>
+              <document>
+                <string name="title">"wxBoxSizer V"</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">"Vertical"</string>
+                <string name="proxy-Member variable name">"m_positionControls"</string>
+                <string name="proxy-AlignH">"Expand"</string>
+                <string name="proxy-AlignV">"Centre"</string>
+                <long name="proxy-Stretch factor">0</long>
+                <long name="proxy-Border">5</long>
+                <bool name="proxy-wxLEFT">0</bool>
+                <bool name="proxy-wxRIGHT">0</bool>
+                <bool name="proxy-wxTOP">0</bool>
+                <bool name="proxy-wxBOTTOM">0</bool>
+                <bool name="proxy-wxSHAPED">0</bool>
+                <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                 <document>
                   <string name="title">"wxBoxSizer H"</string>
                   <string name="type">"dialog-control-document"</string>
@@ -17257,17 +17133,61 @@
                   <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                   <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                   <document>
-                    <string name="title">"Spacer"</string>
+                    <string name="title">"wxStaticText: wxID_STATIC"</string>
                     <string name="type">"dialog-control-document"</string>
                     <string name="filename">""</string>
-                    <string name="icon-name">"spacer"</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">"wbSpacerProxy"</string>
-                    <long name="proxy-Width">5</long>
-                    <long name="proxy-Height">5</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">""</string>
+                    <string name="proxy-Label">"Position"</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">"wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false"</string>
+                    <bool name="proxy-Hidden">0</bool>
+                    <bool name="proxy-Enabled">1</bool>
+                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                    <string name="proxy-Data variable">""</string>
+                    <string name="proxy-Data validator">""</string>
+                    <string name="proxy-Data source">""</string>
+                    <string name="proxy-Data class name">""</string>
+                    <string name="proxy-Data class implementation filename">""</string>
+                    <string name="proxy-Data class header filename">""</string>
+                    <string name="proxy-Data class manager window">""</string>
+                    <bool name="proxy-wxALIGN_LEFT">0</bool>
+                    <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                    <bool name="proxy-wxALIGN_CENTRE">0</bool>
+                    <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
+                    <bool name="proxy-wxNO_BORDER">0</bool>
+                    <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                    <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                    <bool name="proxy-wxBORDER_THEME">0</bool>
+                    <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                    <bool name="proxy-wxRAISED_BORDER">0</bool>
+                    <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                    <bool name="proxy-wxWANTS_CHARS">0</bool>
+                    <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                    <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                    <string name="proxy-Custom styles">""</string>
+                    <long name="proxy-X">-1</long>
+                    <long name="proxy-Y">-1</long>
+                    <long name="proxy-Width">-1</long>
+                    <long name="proxy-Height">-1</long>
                     <string name="proxy-AlignH">"Centre"</string>
                     <string name="proxy-AlignV">"Centre"</string>
                     <long name="proxy-Stretch factor">0</long>
@@ -17279,8 +17199,114 @@
                     <bool name="proxy-wxSHAPED">0</bool>
                     <bool name="proxy-wxADJUST_MINSIZE">0</bool>
                     <bool name="proxy-wxFIXED_MINSIZE">0</bool>
-                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                  </document>
+                    <string name="proxy-Custom arguments">""</string>
+                    <string name="proxy-Custom ctor arguments">""</string>
+                  </document>
+                  <document>
+                    <string name="title">"wxStaticLine: wxID_STATIC"</string>
+                    <string name="type">"dialog-control-document"</string>
+                    <string name="filename">""</string>
+                    <string name="icon-name">"staticline"</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">"wbStaticLineProxy"</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">"wxStaticLine"</string>
+                    <string name="proxy-Base class">"wxStaticLine"</string>
+                    <bool name="proxy-External implementation">1</bool>
+                    <bool name="proxy-Separate files">0</bool>
+                    <string name="proxy-Implementation filename">""</string>
+                    <string name="proxy-Header filename">""</string>
+                    <string name="proxy-Member variable name">""</string>
+                    <string name="proxy-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-wxLI_HORIZONTAL">1</bool>
+                    <bool name="proxy-wxLI_VERTICAL">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">1</long>
+                    <long name="proxy-Border">5</long>
+                    <bool name="proxy-wxLEFT">1</bool>
+                    <bool name="proxy-wxRIGHT">1</bool>
+                    <bool name="proxy-wxTOP">1</bool>
+                    <bool name="proxy-wxBOTTOM">1</bool>
+                    <bool name="proxy-wxSHAPED">0</bool>
+                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                  </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>
+                  <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                  <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">5</long>
+                    <long name="proxy-Height">5</long>
+                    <string name="proxy-AlignH">"Centre"</string>
+                    <string name="proxy-AlignV">"Centre"</string>
+                    <long name="proxy-Stretch factor">0</long>
+                    <long name="proxy-Border">5</long>
+                    <bool name="proxy-wxLEFT">1</bool>
+                    <bool name="proxy-wxRIGHT">1</bool>
+                    <bool name="proxy-wxTOP">1</bool>
+                    <bool name="proxy-wxBOTTOM">1</bool>
+                    <bool name="proxy-wxSHAPED">0</bool>
+                    <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                    <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                    <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                  </document>
                   <document>
                     <string name="title">"wxBoxSizer V"</string>
                     <string name="type">"dialog-control-document"</string>
@@ -17317,7 +17343,7 @@
                       <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-AlignH">"Left"</string>
                       <string name="proxy-AlignV">"Centre"</string>
                       <long name="proxy-Stretch factor">0</long>
                       <long name="proxy-Border">5</long>
@@ -17330,7 +17356,879 @@
                       <bool name="proxy-wxFIXED_MINSIZE">0</bool>
                       <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
                       <document>
-                        <string name="title">"wxCheckBox: ID_RICHTEXT_OFFSET_CHECKBOX"</string>
+                        <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">""</string>
+                        <string name="proxy-Label">"&amp;Position mode:"</string>
+                        <long name="proxy-Wrapping width">-1</long>
+                        <string name="proxy-Help text">""</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">""</string>
+                        <string name="proxy-Data validator">""</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxALIGN_LEFT">0</bool>
+                        <bool name="proxy-wxALIGN_RIGHT">0</bool>
+                        <bool name="proxy-wxALIGN_CENTRE">0</bool>
+                        <bool name="proxy-wxST_NO_AUTORESIZE">0</bool>
+                        <bool name="proxy-wxNO_BORDER">0</bool>
+                        <bool name="proxy-wxSIMPLE_BORDER">0</bool>
+                        <bool name="proxy-wxDOUBLE_BORDER">0</bool>
+                        <bool name="proxy-wxBORDER_THEME">0</bool>
+                        <bool name="proxy-wxSUNKEN_BORDER">0</bool>
+                        <bool name="proxy-wxRAISED_BORDER">0</bool>
+                        <bool name="proxy-wxSTATIC_BORDER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">-1</long>
+                        <long name="proxy-Height">-1</long>
+                        <string name="proxy-AlignH">"Centre"</string>
+                        <string name="proxy-AlignV">"Centre"</string>
+                        <long name="proxy-Stretch factor">0</long>
+                        <long name="proxy-Border">5</long>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>
+                        <bool name="proxy-wxSHAPED">0</bool>
+                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>
+                      </document>
+                      <document>
+                        <string name="title">"wxComboBox: ID_RICHTEXT_POSITION_MODE"</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="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>
+                        <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_positionModeCtrl"</string>
+                        <string name="proxy-Strings">"Static|Relative|Absolute|Fixed"</string>
+                        <string name="proxy-Initial value">"Static"</string>
+                        <string name="proxy-Help text">""</string>
+                        <string name="proxy-Tooltip text">""</string>
+                        <string name="proxy-Background colour">""</string>
+                        <string name="proxy-Foreground colour">""</string>
+                        <string name="proxy-Font">""</string>
+                        <bool name="proxy-Hidden">0</bool>
+                        <bool name="proxy-Enabled">1</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <string name="proxy-Data variable">"m_positionMode"</string>
+                        <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
+                        <string name="proxy-Data source">""</string>
+                        <string name="proxy-Data class name">""</string>
+                        <string name="proxy-Data class implementation filename">""</string>
+                        <string name="proxy-Data class header filename">""</string>
+                        <string name="proxy-Data class manager window">""</string>
+                        <bool name="proxy-wxCB_SIMPLE">0</bool>
+                        <bool name="proxy-wxCB_DROPDOWN">0</bool>
+                        <bool name="proxy-wxCB_READONLY">1</bool>
+                        <bool name="proxy-wxCB_SORT">0</bool>
+                        <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
+                        <bool name="proxy-wxWANTS_CHARS">0</bool>
+                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
+                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
+                        <string name="proxy-Custom styles">""</string>
+                        <long name="proxy-X">-1</long>
+                        <long name="proxy-Y">-1</long>
+                        <long name="proxy-Width">-1</long>
+                        <long name="proxy-Height">-1</long>
+                        <string name="proxy-AlignH">"Centre"</string>
+                        <string name="proxy-AlignV">"Centre"</string>
+                        <long name="proxy-Stretch factor">0</long>
+                        <long name="proxy-Border">5</long>
+                        <bool name="proxy-wxLEFT">1</bool>
+                        <bool name="proxy-wxRIGHT">1</bool>
+                        <bool name="proxy-wxTOP">1</bool>
+                        <bool name="proxy-wxBOTTOM">1</bool>
+                        <bool name="proxy-wxSHAPED">0</bool>
+                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>
+                      </document>
+                    </document>
+                    <document>
+                      <string name="title">"wxFlexGridSizer"</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">"wbFlexGridSizerProxy"</string>
+                      <string name="proxy-GrowableColumns">""</string>
+                      <string name="proxy-GrowableRows">""</string>
+                      <long name="proxy-Columns">4</long>
+                      <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-Platform">"&lt;Any platform&gt;"</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>
+                      <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>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>
+                      </document>
+                      <document>
+                        <string name="title">"wxBoxSizer H"</string>
+                        <string name="type">"dialog-control-document"</string>
+                        <string name="filename">""</string>
+                        <string name="icon-name">"sizer"</string>
+                        <long name="is-transient">0</long>
+                        <long name="owns-file">1</long>
+                        <long name="title-mode">0</long>
+                        <long name="locked">0</long>
+                        <string name="proxy-type">"wbBoxSizerProxy"</string>
+                        <string name="proxy-Orientation">"Horizontal"</string>
+                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-AlignH">"Expand"</string>
+                        <string name="proxy-AlignV">"Centre"</string>
+                        <long name="proxy-Stretch factor">0</long>
+                        <long name="proxy-Border">5</long>
+                        <bool name="proxy-wxLEFT">0</bool>
+                        <bool name="proxy-wxRIGHT">0</bool>
+                        <bool name="proxy-wxTOP">0</bool>
+                        <bool name="proxy-wxBOTTOM">0</bool>
+                        <bool name="proxy-wxSHAPED">0</bool>
+                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <document>
+                          <string name="title">"wxTextCtrl: ID_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>
+                          <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>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
+                        <document>
+                          <string name="title">"wxComboBox: ID_RICHTEXT_LEFT_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|OnRichtextTopUpdate|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>
+                          <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_unitsLeft"</string>
+                          <string name="proxy-Strings">"px|cm|percent"</string>
+                          <string name="proxy-Initial value">"px"</string>
+                          <string name="proxy-Help text">"Units for 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-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>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
+                      </document>
+                      <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>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>
+                      </document>
+                      <document>
+                        <string name="title">"wxBoxSizer H"</string>
+                        <string name="type">"dialog-control-document"</string>
+                        <string name="filename">""</string>
+                        <string name="icon-name">"sizer"</string>
+                        <long name="is-transient">0</long>
+                        <long name="owns-file">1</long>
+                        <long name="title-mode">0</long>
+                        <long name="locked">0</long>
+                        <string name="proxy-type">"wbBoxSizerProxy"</string>
+                        <string name="proxy-Orientation">"Horizontal"</string>
+                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-AlignH">"Expand"</string>
+                        <string name="proxy-AlignV">"Centre"</string>
+                        <long name="proxy-Stretch factor">0</long>
+                        <long name="proxy-Border">5</long>
+                        <bool name="proxy-wxLEFT">0</bool>
+                        <bool name="proxy-wxRIGHT">0</bool>
+                        <bool name="proxy-wxTOP">0</bool>
+                        <bool name="proxy-wxBOTTOM">0</bool>
+                        <bool name="proxy-wxSHAPED">0</bool>
+                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <document>
+                          <string name="title">"wxTextCtrl: ID_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>
+                          <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|OnRichtextTopUpdate|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>
+                          <string name="proxy-Custom arguments">""</string>
+                          <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>
+                        <string name="proxy-Custom arguments">""</string>
+                        <string name="proxy-Custom ctor arguments">""</string>
+                      </document>
+                      <document>
+                        <string name="title">"wxBoxSizer H"</string>
+                        <string name="type">"dialog-control-document"</string>
+                        <string name="filename">""</string>
+                        <string name="icon-name">"sizer"</string>
+                        <long name="is-transient">0</long>
+                        <long name="owns-file">1</long>
+                        <long name="title-mode">0</long>
+                        <long name="locked">0</long>
+                        <string name="proxy-type">"wbBoxSizerProxy"</string>
+                        <string name="proxy-Orientation">"Horizontal"</string>
+                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-AlignH">"Expand"</string>
+                        <string name="proxy-AlignV">"Centre"</string>
+                        <long name="proxy-Stretch factor">0</long>
+                        <long name="proxy-Border">5</long>
+                        <bool name="proxy-wxLEFT">0</bool>
+                        <bool name="proxy-wxRIGHT">0</bool>
+                        <bool name="proxy-wxTOP">0</bool>
+                        <bool name="proxy-wxBOTTOM">0</bool>
+                        <bool name="proxy-wxSHAPED">0</bool>
+                        <bool name="proxy-wxADJUST_MINSIZE">0</bool>
+                        <bool name="proxy-wxFIXED_MINSIZE">0</bool>
+                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
+                        <document>
+                          <string name="title">"wxTextCtrl: ID_RICHTEXT_RIGHT"</string>
+                          <string name="type">"dialog-control-document"</string>
+                          <string name="filename">""</string>
+                          <string name="icon-name">"textctrl"</string>
+                          <long name="is-transient">0</long>
+                          <long name="owns-file">1</long>
+                          <long name="title-mode">0</long>
+                          <long name="locked">0</long>
+                          <string name="proxy-type">"wbTextCtrlProxy"</string>
+                          <string name="event-handler-0">"wxEVT_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>
+                          <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-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>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
+                        <document>
+                          <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>
+                          <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-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_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-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>
+                          <string name="proxy-Custom arguments">""</string>
+                          <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>
@@ -17339,8 +18237,8 @@
                         <long name="title-mode">0</long>
                         <long name="locked">0</long>
                         <string name="proxy-type">"wbCheckBoxProxy"</string>
-                        <string name="proxy-Id name">"ID_RICHTEXT_OFFSET_CHECKBOX"</string>
-                        <long name="proxy-Id value">10710</long>
+                        <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>
@@ -17348,10 +18246,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_offsetYCheckbox"</string>
-                        <string name="proxy-Label">"Vertical &amp;Offset:"</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">"Enable vertical offset."</string>
+                        <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>
@@ -17378,7 +18276,7 @@
                         <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-AlignH">"Left"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
@@ -17393,152 +18291,177 @@
                         <string name="proxy-Custom ctor arguments">""</string>
                       </document>
                       <document>
-                        <string name="title">"wxTextCtrl: ID_RICHTEXT_OFFSET"</string>
+                        <string name="title">"wxBoxSizer H"</string>
                         <string name="type">"dialog-control-document"</string>
                         <string name="filename">""</string>
-                        <string name="icon-name">"textctrl"</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">"wbTextCtrlProxy"</string>
-                        <string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextOffsetUpdate|NONE||wxRichTextSizePage"</string>
-                        <string name="proxy-Id name">"ID_RICHTEXT_OFFSET"</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_offset"</string>
-                        <string name="proxy-Initial value">""</string>
-                        <long name="proxy-Max length">10</long>
-                        <string name="proxy-Help text">"The vertical offset relative to the paragraph."</string>
-                        <string name="proxy-Tooltip text">""</string>
-                        <string name="proxy-Background colour">""</string>
-                        <string name="proxy-Foreground colour">""</string>
-                        <string name="proxy-Font">""</string>
-                        <bool name="proxy-Hidden">0</bool>
-                        <bool name="proxy-Enabled">1</bool>
-                        <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
-                        <string name="proxy-Data variable">""</string>
-                        <string name="proxy-Data validator">""</string>
-                        <string name="proxy-Data source">""</string>
-                        <string name="proxy-Data class name">""</string>
-                        <string name="proxy-Data class implementation filename">""</string>
-                        <string name="proxy-Data class header filename">""</string>
-                        <string name="proxy-Data class manager window">""</string>
-                        <bool name="proxy-wxTE_MULTILINE">0</bool>
-                        <bool name="proxy-wxTE_PROCESS_ENTER">0</bool>
-                        <bool name="proxy-wxTE_PROCESS_TAB">0</bool>
-                        <bool name="proxy-wxTE_PASSWORD">0</bool>
-                        <bool name="proxy-wxTE_READONLY">0</bool>
-                        <bool name="proxy-wxTE_RICH">0</bool>
-                        <bool name="proxy-wxTE_RICH2">0</bool>
-                        <bool name="proxy-wxTE_AUTO_URL">0</bool>
-                        <bool name="proxy-wxTE_NOHIDESEL">0</bool>
-                        <bool name="proxy-wxTE_LEFT">0</bool>
-                        <bool name="proxy-wxTE_CENTRE">0</bool>
-                        <bool name="proxy-wxTE_RIGHT">0</bool>
-                        <bool name="proxy-wxHSCROLL">0</bool>
-                        <bool name="proxy-wxTE_CHARWRAP">0</bool>
-                        <bool name="proxy-wxTE_WORDWRAP">0</bool>
-                        <bool name="proxy-wxTE_CAPITALIZE">0</bool>
-                        <bool name="proxy-wxNO_BORDER">0</bool>
-                        <bool name="proxy-wxSIMPLE_BORDER">0</bool>
-                        <bool name="proxy-wxDOUBLE_BORDER">0</bool>
-                        <bool name="proxy-wxBORDER_THEME">0</bool>
-                        <bool name="proxy-wxSUNKEN_BORDER">0</bool>
-                        <bool name="proxy-wxRAISED_BORDER">0</bool>
-                        <bool name="proxy-wxSTATIC_BORDER">0</bool>
-                        <bool name="proxy-wxWANTS_CHARS">0</bool>
-                        <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
-                        <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
-                        <string name="proxy-Custom styles">""</string>
-                        <long name="proxy-X">-1</long>
-                        <long name="proxy-Y">-1</long>
-                        <long name="proxy-Width">65</long>
-                        <long name="proxy-Height">-1</long>
-                        <string name="proxy-AlignH">"Centre"</string>
+                        <string name="proxy-type">"wbBoxSizerProxy"</string>
+                        <string name="proxy-Orientation">"Horizontal"</string>
+                        <string name="proxy-Member variable name">""</string>
+                        <string name="proxy-AlignH">"Expand"</string>
                         <string name="proxy-AlignV">"Centre"</string>
                         <long name="proxy-Stretch factor">0</long>
                         <long name="proxy-Border">5</long>
-                        <bool name="proxy-wxLEFT">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>
-                        <string name="proxy-Custom arguments">""</string>
-                        <string name="proxy-Custom ctor arguments">""</string>
-                      </document>
-                      <document>
-                        <string name="title">"wxComboBox: ID_RICHTEXT_OFFSET_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|OnRichtextOffsetUpdate|NONE||wxRichTextSizePage"</string>
-                        <string name="proxy-Id name">"ID_RICHTEXT_OFFSET_UNITS"</string>
-                        <long name="proxy-Id value">10712</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_unitsOffset"</string>
-                        <string name="proxy-Strings">"px|cm"</string>
-                        <string name="proxy-Initial value">"px"</string>
-                        <string name="proxy-Help text">"Units for the object offset."</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>
-                        <string name="proxy-Custom arguments">""</string>
-                        <string name="proxy-Custom ctor arguments">""</string>
+                        <document>
+                          <string name="title">"wxTextCtrl: ID_RICHTEXT_BOTTOM"</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|OnRichtextBottomUpdate|NONE||wxRichTextSizePage"</string>
+                          <string name="proxy-Id name">"ID_RICHTEXT_BOTTOM"</string>
+                          <long name="proxy-Id value">10733</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_bottom"</string>
+                          <string name="proxy-Initial value">""</string>
+                          <long name="proxy-Max length">10</long>
+                          <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>
+                          <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>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
+                        <document>
+                          <string name="title">"wxComboBox: ID_RICHTEXT_BOTTOM_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|OnRichtextBottomUpdate|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>
+                          <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_unitsBottom"</string>
+                          <string name="proxy-Strings">"px|cm|percent"</string>
+                          <string name="proxy-Initial value">"px"</string>
+                          <string name="proxy-Help text">"Units for 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>
+                          <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>
+                          <string name="proxy-Custom arguments">""</string>
+                          <string name="proxy-Custom ctor arguments">""</string>
+                        </document>
                       </document>
                     </document>
                     <document>
diff --git a/src/richtext/richtextsizepage.cpp b/src/richtext/richtextsizepage.cpp
index d9c9fff03edb18a6f870d5f80e277be579d2440a..7ecc27533fc8f5db40bb77b520236387bbbdeaa3 100644 (file)
--- a/src/richtext/richtextsizepage.cpp
+++ b/src/richtext/richtextsizepage.cpp
@@ -29,6 +29,8 @@ IMPLEMENT_DYNAMIC_CLASS( wxRichTextSizePage, wxRichTextDialogPage )
 BEGIN_EVENT_TABLE( wxRichTextSizePage, wxRichTextDialogPage )
 
 ////@begin wxRichTextSizePage event table entries
+    EVT_UPDATE_UI( ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX, wxRichTextSizePage::OnRichtextVerticalAlignmentComboboxUpdate )
+
     EVT_UPDATE_UI( ID_RICHTEXT_WIDTH, wxRichTextSizePage::OnRichtextWidthUpdate )
 
     EVT_UPDATE_UI( ID_RICHTEXT_UNITS_W, wxRichTextSizePage::OnRichtextWidthUpdate )
@@ -53,11 +55,21 @@ BEGIN_EVENT_TABLE( wxRichTextSizePage, wxRichTextDialogPage )
 
     EVT_UPDATE_UI( ID_RICHTEXT_UNITS_MAX_H, wxRichTextSizePage::OnRichtextMaxHeightUpdate )
 
-    EVT_UPDATE_UI( ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX, wxRichTextSizePage::OnRichtextVerticalAlignmentComboboxUpdate )
+    EVT_UPDATE_UI( ID_RICHTEXT_LEFT, wxRichTextSizePage::OnRichtextLeftUpdate )
+
+    EVT_UPDATE_UI( ID_RICHTEXT_LEFT_UNITS, wxRichTextSizePage::OnRichtextTopUpdate )
+
+    EVT_UPDATE_UI( ID_RICHTEXT_TOP, wxRichTextSizePage::OnRichtextTopUpdate )
+
+    EVT_UPDATE_UI( ID_RICHTEXT_TOP_UNITS, wxRichTextSizePage::OnRichtextTopUpdate )
+
+    EVT_UPDATE_UI( ID_RICHTEXT_RIGHT, wxRichTextSizePage::OnRichtextRightUpdate )
+
+    EVT_UPDATE_UI( ID_RICHTEXT_RIGHT_UNITS, wxRichTextSizePage::OnRichtextRightUpdate )
 
-    EVT_UPDATE_UI( ID_RICHTEXT_OFFSET, wxRichTextSizePage::OnRichtextOffsetUpdate )
+    EVT_UPDATE_UI( ID_RICHTEXT_BOTTOM, wxRichTextSizePage::OnRichtextBottomUpdate )
 
-    EVT_UPDATE_UI( ID_RICHTEXT_OFFSET_UNITS, wxRichTextSizePage::OnRichtextOffsetUpdate )
+    EVT_UPDATE_UI( ID_RICHTEXT_BOTTOM_UNITS, wxRichTextSizePage::OnRichtextBottomUpdate )
 
     EVT_BUTTON( ID_RICHTEXT_PARA_UP, wxRichTextSizePage::OnRichtextParaUpClick )
 
@@ -123,9 +135,13 @@ wxRichTextSizePage::~wxRichTextSizePage()
 void wxRichTextSizePage::Init()
 {
 ////@begin wxRichTextSizePage member initialisation
+    m_positionMode = 0;
     m_parentSizer = NULL;
     m_floatingControls = NULL;
     m_float = NULL;
+    m_alignmentControls = NULL;
+    m_verticalAlignmentCheckbox = NULL;
+    m_verticalAlignmentComboBox = NULL;
     m_widthCheckbox = NULL;
     m_width = NULL;
     m_unitsW = NULL;
@@ -144,14 +160,21 @@ void wxRichTextSizePage::Init()
     m_maxHeightCheckbox = NULL;
     m_maxHeight = NULL;
     m_unitsMaxH = NULL;
-    m_alignmentControls = NULL;
-    m_verticalAlignmentCheckbox = NULL;
-    m_verticalAlignmentComboBox = NULL;
     m_positionControls = NULL;
     m_moveObjectParentSizer = NULL;
-    m_offsetYCheckbox = NULL;
-    m_offset = NULL;
-    m_unitsOffset = NULL;
+    m_positionModeCtrl = NULL;
+    m_positionLeftCheckbox = NULL;
+    m_left = NULL;
+    m_unitsLeft = NULL;
+    m_positionTopCheckbox = NULL;
+    m_top = NULL;
+    m_unitsTop = NULL;
+    m_positionRightCheckbox = NULL;
+    m_right = NULL;
+    m_unitsRight = NULL;
+    m_positionBottomCheckbox = NULL;
+    m_bottom = NULL;
+    m_unitsBottom = NULL;
     m_moveObjectSizer = NULL;
 ////@end wxRichTextSizePage member initialisation
 }
@@ -172,29 +195,32 @@ void wxRichTextSizePage::CreateControls()
     m_parentSizer = new wxBoxSizer(wxVERTICAL);
     itemBoxSizer2->Add(m_parentSizer, 0, wxGROW|wxALL, 5);
 
+    wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL);
+    m_parentSizer->Add(itemBoxSizer4, 0, wxGROW, 5);
+
     m_floatingControls = new wxBoxSizer(wxVERTICAL);
-    m_parentSizer->Add(m_floatingControls, 0, wxGROW, 5);
+    itemBoxSizer4->Add(m_floatingControls, 1, wxALIGN_CENTER_VERTICAL, 5);
 
-    wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL);
-    m_floatingControls->Add(itemBoxSizer5, 0, wxGROW, 5);
+    wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL);
+    m_floatingControls->Add(itemBoxSizer6, 0, wxGROW, 5);
 
-    wxStaticText* itemStaticText6 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Floating"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText6->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
-    itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText7 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Floating"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemStaticText7->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
+    itemBoxSizer6->Add(itemStaticText7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxStaticLine* itemStaticLine7 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    itemBoxSizer5->Add(itemStaticLine7, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticLine* itemStaticLine8 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    itemBoxSizer6->Add(itemStaticLine8, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxHORIZONTAL);
-    m_floatingControls->Add(itemBoxSizer8, 0, wxGROW, 5);
+    wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL);
+    m_floatingControls->Add(itemBoxSizer9, 0, wxGROW, 5);
 
-    itemBoxSizer8->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer9->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxFlexGridSizer* itemFlexGridSizer10 = new wxFlexGridSizer(0, 2, 0, 0);
-    itemBoxSizer8->Add(itemFlexGridSizer10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
+    wxFlexGridSizer* itemFlexGridSizer11 = new wxFlexGridSizer(0, 2, 0, 0);
+    itemBoxSizer9->Add(itemFlexGridSizer11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5);
 
-    wxStaticText* itemStaticText11 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Floating mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemFlexGridSizer10->Add(itemStaticText11, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText12 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Floating mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemFlexGridSizer11->Add(itemStaticText12, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxArrayString m_floatStrings;
     m_floatStrings.Add(_("None"));
@@ -205,41 +231,77 @@ void wxRichTextSizePage::CreateControls()
     m_float->SetHelpText(_("How the object will float relative to the text."));
     if (wxRichTextSizePage::ShowToolTips())
         m_float->SetToolTip(_("How the object will float relative to the text."));
-    itemFlexGridSizer10->Add(m_float, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemFlexGridSizer11->Add(m_float, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL);
-    m_parentSizer->Add(itemBoxSizer13, 0, wxGROW, 5);
+    m_alignmentControls = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer4->Add(m_alignmentControls, 1, wxALIGN_CENTER_VERTICAL, 5);
 
-    wxStaticText* itemStaticText14 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Size"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText14->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
-    itemBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxHORIZONTAL);
+    m_alignmentControls->Add(itemBoxSizer15, 0, wxGROW, 5);
 
-    wxStaticLine* itemStaticLine15 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    itemBoxSizer13->Add(itemStaticLine15, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText16 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Alignment"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemStaticText16->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
+    itemBoxSizer15->Add(itemStaticText16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxHORIZONTAL);
-    m_parentSizer->Add(itemBoxSizer16, 0, wxGROW, 5);
+    wxStaticLine* itemStaticLine17 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    itemBoxSizer15->Add(itemStaticLine17, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    itemBoxSizer16->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxBoxSizer* itemBoxSizer18 = new wxBoxSizer(wxHORIZONTAL);
+    m_alignmentControls->Add(itemBoxSizer18, 0, wxGROW, 5);
 
-    wxFlexGridSizer* itemFlexGridSizer18 = new wxFlexGridSizer(0, 4, 0, 0);
-    itemBoxSizer16->Add(itemFlexGridSizer18, 0, wxALIGN_CENTER_VERTICAL, 5);
+    itemBoxSizer18->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    m_verticalAlignmentCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX, _("&Vertical alignment:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_verticalAlignmentCheckbox->SetValue(false);
+    m_verticalAlignmentCheckbox->SetHelpText(_("Enable vertical alignment."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_verticalAlignmentCheckbox->SetToolTip(_("Enable vertical alignment."));
+    itemBoxSizer18->Add(m_verticalAlignmentCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxArrayString m_verticalAlignmentComboBoxStrings;
+    m_verticalAlignmentComboBoxStrings.Add(_("Top"));
+    m_verticalAlignmentComboBoxStrings.Add(_("Centred"));
+    m_verticalAlignmentComboBoxStrings.Add(_("Bottom"));
+    m_verticalAlignmentComboBox = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX, _("Top"), wxDefaultPosition, wxDefaultSize, m_verticalAlignmentComboBoxStrings, wxCB_READONLY );
+    m_verticalAlignmentComboBox->SetStringSelection(_("Top"));
+    m_verticalAlignmentComboBox->SetHelpText(_("Vertical alignment."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_verticalAlignmentComboBox->SetToolTip(_("Vertical alignment."));
+    itemBoxSizer18->Add(m_verticalAlignmentComboBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxHORIZONTAL);
+    m_parentSizer->Add(itemBoxSizer22, 0, wxGROW, 5);
+
+    wxStaticText* itemStaticText23 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Size"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemStaticText23->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
+    itemBoxSizer22->Add(itemStaticText23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxStaticLine* itemStaticLine24 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    itemBoxSizer22->Add(itemStaticLine24, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxBoxSizer* itemBoxSizer25 = new wxBoxSizer(wxHORIZONTAL);
+    m_parentSizer->Add(itemBoxSizer25, 0, wxGROW, 5);
+
+    itemBoxSizer25->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+    wxFlexGridSizer* itemFlexGridSizer27 = new wxFlexGridSizer(0, 4, 0, 0);
+    itemBoxSizer25->Add(itemFlexGridSizer27, 0, wxALIGN_CENTER_VERTICAL, 5);
 
     m_widthCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_WIDTH_CHECKBOX, _("&Width:"), wxDefaultPosition, wxDefaultSize, 0 );
     m_widthCheckbox->SetValue(false);
     m_widthCheckbox->SetHelpText(_("Enable the width value."));
     if (wxRichTextSizePage::ShowToolTips())
         m_widthCheckbox->SetToolTip(_("Enable the width value."));
-    itemFlexGridSizer18->Add(m_widthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemFlexGridSizer27->Add(m_widthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer18->Add(itemBoxSizer20, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+    wxBoxSizer* itemBoxSizer29 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer27->Add(itemBoxSizer29, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 
     m_width = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_WIDTH, wxEmptyString, wxDefaultPosition, wxSize(60, -1), 0 );
     m_width->SetHelpText(_("The object width."));
     if (wxRichTextSizePage::ShowToolTips())
         m_width->SetToolTip(_("The object width."));
-    itemBoxSizer20->Add(m_width, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemBoxSizer29->Add(m_width, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
     wxArrayString m_unitsWStrings;
     m_unitsWStrings.Add(_("px"));
@@ -250,23 +312,23 @@ void wxRichTextSizePage::CreateControls()
     m_unitsW->SetHelpText(_("Units for the object width."));
     if (wxRichTextSizePage::ShowToolTips())
         m_unitsW->SetToolTip(_("Units for the object width."));
-    itemBoxSizer20->Add(m_unitsW, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer29->Add(m_unitsW, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_heightCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_HEIGHT_CHECKBOX, _("&Height:"), wxDefaultPosition, wxDefaultSize, 0 );
     m_heightCheckbox->SetValue(false);
     m_heightCheckbox->SetHelpText(_("Enable the height value."));
     if (wxRichTextSizePage::ShowToolTips())
         m_heightCheckbox->SetToolTip(_("Enable the height value."));
-    itemFlexGridSizer18->Add(m_heightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemFlexGridSizer27->Add(m_heightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer18->Add(itemBoxSizer24, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+    wxBoxSizer* itemBoxSizer33 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer27->Add(itemBoxSizer33, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 
     m_height = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_HEIGHT, wxEmptyString, wxDefaultPosition, wxSize(60, -1), 0 );
     m_height->SetHelpText(_("The object height."));
     if (wxRichTextSizePage::ShowToolTips())
         m_height->SetToolTip(_("The object height."));
-    itemBoxSizer24->Add(m_height, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemBoxSizer33->Add(m_height, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
     wxArrayString m_unitsHStrings;
     m_unitsHStrings.Add(_("px"));
@@ -277,23 +339,23 @@ void wxRichTextSizePage::CreateControls()
     m_unitsH->SetHelpText(_("Units for the object height."));
     if (wxRichTextSizePage::ShowToolTips())
         m_unitsH->SetToolTip(_("Units for the object height."));
-    itemBoxSizer24->Add(m_unitsH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer33->Add(m_unitsH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_minWidthCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_MIN_WIDTH_CHECKBOX, _("Min width:"), wxDefaultPosition, wxDefaultSize, 0 );
     m_minWidthCheckbox->SetValue(false);
     m_minWidthCheckbox->SetHelpText(_("Enable the minimum width value."));
     if (wxRichTextSizePage::ShowToolTips())
         m_minWidthCheckbox->SetToolTip(_("Enable the minimum width value."));
-    itemFlexGridSizer18->Add(m_minWidthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemFlexGridSizer27->Add(m_minWidthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer28 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer18->Add(itemBoxSizer28, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+    wxBoxSizer* itemBoxSizer37 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer27->Add(itemBoxSizer37, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 
     m_minWidth = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_MIN_WIDTH, wxEmptyString, wxDefaultPosition, wxSize(60, -1), 0 );
     m_minWidth->SetHelpText(_("The object minimum width."));
     if (wxRichTextSizePage::ShowToolTips())
         m_minWidth->SetToolTip(_("The object minimum width."));
-    itemBoxSizer28->Add(m_minWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemBoxSizer37->Add(m_minWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
     wxArrayString m_unitsMinWStrings;
     m_unitsMinWStrings.Add(_("px"));
@@ -304,23 +366,23 @@ void wxRichTextSizePage::CreateControls()
     m_unitsMinW->SetHelpText(_("Units for the minimum object width."));
     if (wxRichTextSizePage::ShowToolTips())
         m_unitsMinW->SetToolTip(_("Units for the minimum object width."));
-    itemBoxSizer28->Add(m_unitsMinW, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer37->Add(m_unitsMinW, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_minHeightCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_MIN_HEIGHT_CHECKBOX, _("Min height:"), wxDefaultPosition, wxDefaultSize, 0 );
     m_minHeightCheckbox->SetValue(false);
     m_minHeightCheckbox->SetHelpText(_("Enable the minimum height value."));
     if (wxRichTextSizePage::ShowToolTips())
         m_minHeightCheckbox->SetToolTip(_("Enable the minimum height value."));
-    itemFlexGridSizer18->Add(m_minHeightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemFlexGridSizer27->Add(m_minHeightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer32 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer18->Add(itemBoxSizer32, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+    wxBoxSizer* itemBoxSizer41 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer27->Add(itemBoxSizer41, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 
     m_minHeight = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_MIN_HEIGHT, wxEmptyString, wxDefaultPosition, wxSize(60, -1), 0 );
     m_minHeight->SetHelpText(_("The object minmum height."));
     if (wxRichTextSizePage::ShowToolTips())
         m_minHeight->SetToolTip(_("The object minmum height."));
-    itemBoxSizer32->Add(m_minHeight, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemBoxSizer41->Add(m_minHeight, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
     wxArrayString m_unitsMinHStrings;
     m_unitsMinHStrings.Add(_("px"));
@@ -331,23 +393,23 @@ void wxRichTextSizePage::CreateControls()
     m_unitsMinH->SetHelpText(_("Units for the minimum object height."));
     if (wxRichTextSizePage::ShowToolTips())
         m_unitsMinH->SetToolTip(_("Units for the minimum object height."));
-    itemBoxSizer32->Add(m_unitsMinH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer41->Add(m_unitsMinH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_maxWidthCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_MAX_WIDTH_CHECKBOX, _("Max width:"), wxDefaultPosition, wxDefaultSize, 0 );
     m_maxWidthCheckbox->SetValue(false);
     m_maxWidthCheckbox->SetHelpText(_("Enable the maximum width value."));
     if (wxRichTextSizePage::ShowToolTips())
         m_maxWidthCheckbox->SetToolTip(_("Enable the maximum width value."));
-    itemFlexGridSizer18->Add(m_maxWidthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemFlexGridSizer27->Add(m_maxWidthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer36 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer18->Add(itemBoxSizer36, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+    wxBoxSizer* itemBoxSizer45 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer27->Add(itemBoxSizer45, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 
     m_maxWidth = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_MAX_WIDTH, wxEmptyString, wxDefaultPosition, wxSize(60, -1), 0 );
     m_maxWidth->SetHelpText(_("The object maximum width."));
     if (wxRichTextSizePage::ShowToolTips())
         m_maxWidth->SetToolTip(_("The object maximum width."));
-    itemBoxSizer36->Add(m_maxWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemBoxSizer45->Add(m_maxWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
     wxArrayString m_unitsMaxWStrings;
     m_unitsMaxWStrings.Add(_("px"));
@@ -358,23 +420,23 @@ void wxRichTextSizePage::CreateControls()
     m_unitsMaxW->SetHelpText(_("Units for the maximum object width."));
     if (wxRichTextSizePage::ShowToolTips())
         m_unitsMaxW->SetToolTip(_("Units for the maximum object width."));
-    itemBoxSizer36->Add(m_unitsMaxW, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer45->Add(m_unitsMaxW, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_maxHeightCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_MAX_HEIGHT_CHECKBOX, _("Max height:"), wxDefaultPosition, wxDefaultSize, 0 );
     m_maxHeightCheckbox->SetValue(false);
     m_maxHeightCheckbox->SetHelpText(_("Enable the height value."));
     if (wxRichTextSizePage::ShowToolTips())
         m_maxHeightCheckbox->SetToolTip(_("Enable the height value."));
-    itemFlexGridSizer18->Add(m_maxHeightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemFlexGridSizer27->Add(m_maxHeightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer40 = new wxBoxSizer(wxHORIZONTAL);
-    itemFlexGridSizer18->Add(itemBoxSizer40, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+    wxBoxSizer* itemBoxSizer49 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer27->Add(itemBoxSizer49, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
 
     m_maxHeight = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_MAX_HEIGHT, wxEmptyString, wxDefaultPosition, wxSize(60, -1), 0 );
     m_maxHeight->SetHelpText(_("The object maximum height."));
     if (wxRichTextSizePage::ShowToolTips())
         m_maxHeight->SetToolTip(_("The object maximum height."));
-    itemBoxSizer40->Add(m_maxHeight, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+    itemBoxSizer49->Add(m_maxHeight, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
     wxArrayString m_unitsMaxHStrings;
     m_unitsMaxHStrings.Add(_("px"));
@@ -385,110 +447,179 @@ void wxRichTextSizePage::CreateControls()
     m_unitsMaxH->SetHelpText(_("Units for the maximum object height."));
     if (wxRichTextSizePage::ShowToolTips())
         m_unitsMaxH->SetToolTip(_("Units for the maximum object height."));
-    itemBoxSizer40->Add(m_unitsMaxH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer49->Add(m_unitsMaxH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    m_alignmentControls = new wxBoxSizer(wxVERTICAL);
-    m_parentSizer->Add(m_alignmentControls, 0, wxGROW, 5);
+    m_positionControls = new wxBoxSizer(wxVERTICAL);
+    m_parentSizer->Add(m_positionControls, 0, wxGROW, 5);
 
-    wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL);
-    m_alignmentControls->Add(itemBoxSizer44, 0, wxGROW, 5);
+    wxBoxSizer* itemBoxSizer53 = new wxBoxSizer(wxHORIZONTAL);
+    m_positionControls->Add(itemBoxSizer53, 0, wxGROW, 5);
 
-    wxStaticText* itemStaticText45 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Alignment"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText45->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
-    itemBoxSizer44->Add(itemStaticText45, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText54 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Position"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemStaticText54->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
+    itemBoxSizer53->Add(itemStaticText54, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxStaticLine* itemStaticLine46 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    itemBoxSizer44->Add(itemStaticLine46, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticLine* itemStaticLine55 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    itemBoxSizer53->Add(itemStaticLine55, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer47 = new wxBoxSizer(wxHORIZONTAL);
-    m_alignmentControls->Add(itemBoxSizer47, 0, wxGROW, 5);
+    wxBoxSizer* itemBoxSizer56 = new wxBoxSizer(wxHORIZONTAL);
+    m_positionControls->Add(itemBoxSizer56, 0, wxGROW, 5);
 
-    itemBoxSizer47->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    itemBoxSizer56->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    m_verticalAlignmentCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX, _("&Vertical alignment:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_verticalAlignmentCheckbox->SetValue(false);
-    m_verticalAlignmentCheckbox->SetHelpText(_("Enable vertical alignment."));
-    if (wxRichTextSizePage::ShowToolTips())
-        m_verticalAlignmentCheckbox->SetToolTip(_("Enable vertical alignment."));
-    itemBoxSizer47->Add(m_verticalAlignmentCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    m_moveObjectParentSizer = new wxBoxSizer(wxVERTICAL);
+    itemBoxSizer56->Add(m_moveObjectParentSizer, 0, wxALIGN_TOP, 5);
 
-    wxArrayString m_verticalAlignmentComboBoxStrings;
-    m_verticalAlignmentComboBoxStrings.Add(_("Top"));
-    m_verticalAlignmentComboBoxStrings.Add(_("Centred"));
-    m_verticalAlignmentComboBoxStrings.Add(_("Bottom"));
-    m_verticalAlignmentComboBox = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX, _("Top"), wxDefaultPosition, wxDefaultSize, m_verticalAlignmentComboBoxStrings, wxCB_READONLY );
-    m_verticalAlignmentComboBox->SetStringSelection(_("Top"));
-    m_verticalAlignmentComboBox->SetHelpText(_("Vertical alignment."));
-    if (wxRichTextSizePage::ShowToolTips())
-        m_verticalAlignmentComboBox->SetToolTip(_("Vertical alignment."));
-    itemBoxSizer47->Add(m_verticalAlignmentComboBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxBoxSizer* itemBoxSizer59 = new wxBoxSizer(wxHORIZONTAL);
+    m_moveObjectParentSizer->Add(itemBoxSizer59, 0, wxALIGN_LEFT, 5);
 
-    m_positionControls = new wxBoxSizer(wxVERTICAL);
-    m_parentSizer->Add(m_positionControls, 0, wxGROW, 5);
+    wxStaticText* itemStaticText60 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Position mode:"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemBoxSizer59->Add(itemStaticText60, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxBoxSizer* itemBoxSizer52 = new wxBoxSizer(wxHORIZONTAL);
-    m_positionControls->Add(itemBoxSizer52, 0, wxGROW, 5);
+    wxArrayString m_positionModeCtrlStrings;
+    m_positionModeCtrlStrings.Add(_("Static"));
+    m_positionModeCtrlStrings.Add(_("Relative"));
+    m_positionModeCtrlStrings.Add(_("Absolute"));
+    m_positionModeCtrlStrings.Add(_("Fixed"));
+    m_positionModeCtrl = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_POSITION_MODE, _("Static"), wxDefaultPosition, wxDefaultSize, m_positionModeCtrlStrings, wxCB_READONLY );
+    m_positionModeCtrl->SetStringSelection(_("Static"));
+    itemBoxSizer59->Add(m_positionModeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxStaticText* itemStaticText53 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("Position"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemStaticText53->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
-    itemBoxSizer52->Add(itemStaticText53, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxFlexGridSizer* itemFlexGridSizer62 = new wxFlexGridSizer(0, 4, 0, 0);
+    m_moveObjectParentSizer->Add(itemFlexGridSizer62, 0, wxGROW, 5);
 
-    wxStaticLine* itemStaticLine54 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    itemBoxSizer52->Add(itemStaticLine54, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    m_positionLeftCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_LEFT_CHECKBOX, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_positionLeftCheckbox->SetValue(false);
+    m_positionLeftCheckbox->SetHelpText(_("The left position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_positionLeftCheckbox->SetToolTip(_("The left position."));
+    itemFlexGridSizer62->Add(m_positionLeftCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer55 = new wxBoxSizer(wxHORIZONTAL);
-    m_positionControls->Add(itemBoxSizer55, 0, wxGROW, 5);
+    wxBoxSizer* itemBoxSizer64 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer62->Add(itemBoxSizer64, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
 
-    itemBoxSizer55->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    m_left = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_LEFT, wxEmptyString, wxDefaultPosition, wxSize(65, -1), 0 );
+    m_left->SetMaxLength(10);
+    m_left->SetHelpText(_("The left position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_left->SetToolTip(_("The left position."));
+    itemBoxSizer64->Add(m_left, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+
+    wxArrayString m_unitsLeftStrings;
+    m_unitsLeftStrings.Add(_("px"));
+    m_unitsLeftStrings.Add(_("cm"));
+    m_unitsLeftStrings.Add(_("percent"));
+    m_unitsLeft = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_LEFT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsLeftStrings, wxCB_READONLY );
+    m_unitsLeft->SetStringSelection(_("px"));
+    m_unitsLeft->SetHelpText(_("Units for the left position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_unitsLeft->SetToolTip(_("Units for the left position."));
+    itemBoxSizer64->Add(m_unitsLeft, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    m_moveObjectParentSizer = new wxBoxSizer(wxVERTICAL);
-    itemBoxSizer55->Add(m_moveObjectParentSizer, 0, wxALIGN_TOP, 5);
+    m_positionTopCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_TOP_CHECKBOX, _("&Top:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_positionTopCheckbox->SetValue(false);
+    m_positionTopCheckbox->SetHelpText(_("The top position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_positionTopCheckbox->SetToolTip(_("The top position."));
+    itemFlexGridSizer62->Add(m_positionTopCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
 
-    wxBoxSizer* itemBoxSizer58 = new wxBoxSizer(wxHORIZONTAL);
-    m_moveObjectParentSizer->Add(itemBoxSizer58, 0, wxGROW, 5);
+    wxBoxSizer* itemBoxSizer68 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer62->Add(itemBoxSizer68, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
+
+    m_top = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_TOP, wxEmptyString, wxDefaultPosition, wxSize(65, -1), 0 );
+    m_top->SetMaxLength(10);
+    m_top->SetHelpText(_("The top position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_top->SetToolTip(_("The top position."));
+    itemBoxSizer68->Add(m_top, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+
+    wxArrayString m_unitsTopStrings;
+    m_unitsTopStrings.Add(_("px"));
+    m_unitsTopStrings.Add(_("cm"));
+    m_unitsTopStrings.Add(_("percent"));
+    m_unitsTop = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_TOP_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsTopStrings, wxCB_READONLY );
+    m_unitsTop->SetStringSelection(_("px"));
+    m_unitsTop->SetHelpText(_("Units for the top position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_unitsTop->SetToolTip(_("Units for the top position."));
+    itemBoxSizer68->Add(m_unitsTop, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    m_offsetYCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_OFFSET_CHECKBOX, _("Vertical &Offset:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_offsetYCheckbox->SetValue(false);
-    m_offsetYCheckbox->SetHelpText(_("Enable vertical offset."));
+    m_positionRightCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_RIGHT_CHECKBOX, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_positionRightCheckbox->SetValue(false);
+    m_positionRightCheckbox->SetHelpText(_("The right position."));
     if (wxRichTextSizePage::ShowToolTips())
-        m_offsetYCheckbox->SetToolTip(_("Enable vertical offset."));
-    itemBoxSizer58->Add(m_offsetYCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+        m_positionRightCheckbox->SetToolTip(_("The right position."));
+    itemFlexGridSizer62->Add(m_positionRightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+
+    wxBoxSizer* itemBoxSizer72 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer62->Add(itemBoxSizer72, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
 
-    m_offset = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_OFFSET, wxEmptyString, wxDefaultPosition, wxSize(65, -1), 0 );
-    m_offset->SetMaxLength(10);
-    m_offset->SetHelpText(_("The vertical offset relative to the paragraph."));
+    m_right = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(65, -1), 0 );
+    m_right->SetMaxLength(10);
+    m_right->SetHelpText(_("The right position."));
     if (wxRichTextSizePage::ShowToolTips())
-        m_offset->SetToolTip(_("The vertical offset relative to the paragraph."));
-    itemBoxSizer58->Add(m_offset, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+        m_right->SetToolTip(_("The right position."));
+    itemBoxSizer72->Add(m_right, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+
+    wxArrayString m_unitsRightStrings;
+    m_unitsRightStrings.Add(_("px"));
+    m_unitsRightStrings.Add(_("cm"));
+    m_unitsRightStrings.Add(_("percent"));
+    m_unitsRight = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_RIGHT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsRightStrings, wxCB_READONLY );
+    m_unitsRight->SetStringSelection(_("px"));
+    m_unitsRight->SetHelpText(_("Units for the right position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_unitsRight->SetToolTip(_("Units for the right position."));
+    itemBoxSizer72->Add(m_unitsRight, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxArrayString m_unitsOffsetStrings;
-    m_unitsOffsetStrings.Add(_("px"));
-    m_unitsOffsetStrings.Add(_("cm"));
-    m_unitsOffset = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_OFFSET_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsOffsetStrings, wxCB_READONLY );
-    m_unitsOffset->SetStringSelection(_("px"));
-    m_unitsOffset->SetHelpText(_("Units for the object offset."));
+    m_positionBottomCheckbox = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXT_BOTTOM_CHECKBOX, _("&Bottom:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_positionBottomCheckbox->SetValue(false);
+    m_positionBottomCheckbox->SetHelpText(_("The bottom position."));
     if (wxRichTextSizePage::ShowToolTips())
-        m_unitsOffset->SetToolTip(_("Units for the object offset."));
-    itemBoxSizer58->Add(m_unitsOffset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+        m_positionBottomCheckbox->SetToolTip(_("The bottom position."));
+    itemFlexGridSizer62->Add(m_positionBottomCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+
+    wxBoxSizer* itemBoxSizer76 = new wxBoxSizer(wxHORIZONTAL);
+    itemFlexGridSizer62->Add(itemBoxSizer76, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
+
+    m_bottom = new wxTextCtrl( itemRichTextDialogPage1, ID_RICHTEXT_BOTTOM, wxEmptyString, wxDefaultPosition, wxSize(65, -1), 0 );
+    m_bottom->SetMaxLength(10);
+    m_bottom->SetHelpText(_("The bottom position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_bottom->SetToolTip(_("The bottom position."));
+    itemBoxSizer76->Add(m_bottom, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
+
+    wxArrayString m_unitsBottomStrings;
+    m_unitsBottomStrings.Add(_("px"));
+    m_unitsBottomStrings.Add(_("cm"));
+    m_unitsBottomStrings.Add(_("percent"));
+    m_unitsBottom = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_BOTTOM_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsBottomStrings, wxCB_READONLY );
+    m_unitsBottom->SetStringSelection(_("px"));
+    m_unitsBottom->SetHelpText(_("Units for the bottom position."));
+    if (wxRichTextSizePage::ShowToolTips())
+        m_unitsBottom->SetToolTip(_("Units for the bottom position."));
+    itemBoxSizer76->Add(m_unitsBottom, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     m_moveObjectSizer = new wxBoxSizer(wxHORIZONTAL);
     m_moveObjectParentSizer->Add(m_moveObjectSizer, 0, wxGROW, 5);
 
-    wxStaticText* itemStaticText63 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Move the object to:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_moveObjectSizer->Add(itemStaticText63, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+    wxStaticText* itemStaticText80 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Move the object to:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_moveObjectSizer->Add(itemStaticText80, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* itemButton64 = new wxButton( itemRichTextDialogPage1, ID_RICHTEXT_PARA_UP, _("&Previous Paragraph"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton64->SetHelpText(_("Moves the object to the previous paragraph."));
+    wxButton* itemButton81 = new wxButton( itemRichTextDialogPage1, ID_RICHTEXT_PARA_UP, _("&Previous Paragraph"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton81->SetHelpText(_("Moves the object to the previous paragraph."));
     if (wxRichTextSizePage::ShowToolTips())
-        itemButton64->SetToolTip(_("Moves the object to the previous paragraph."));
-    m_moveObjectSizer->Add(itemButton64, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+        itemButton81->SetToolTip(_("Moves the object to the previous paragraph."));
+    m_moveObjectSizer->Add(itemButton81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    wxButton* itemButton65 = new wxButton( itemRichTextDialogPage1, ID_RICHTEXT_PARA_DOWN, _("&Next Paragraph"), wxDefaultPosition, wxDefaultSize, 0 );
-    itemButton65->SetHelpText(_("Moves the object to the next paragraph."));
+    wxButton* itemButton82 = new wxButton( itemRichTextDialogPage1, ID_RICHTEXT_PARA_DOWN, _("&Next Paragraph"), wxDefaultPosition, wxDefaultSize, 0 );
+    itemButton82->SetHelpText(_("Moves the object to the next paragraph."));
     if (wxRichTextSizePage::ShowToolTips())
-        itemButton65->SetToolTip(_("Moves the object to the next paragraph."));
-    m_moveObjectSizer->Add(itemButton65, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
+        itemButton82->SetToolTip(_("Moves the object to the next paragraph."));
+    m_moveObjectSizer->Add(itemButton82, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP|wxBOTTOM, 5);
 
+    // Set validators
+    m_positionModeCtrl->SetValidator( wxGenericValidator(& m_positionMode) );
 ////@end wxRichTextSizePage content construction
 }
 
@@ -558,13 +689,44 @@ bool wxRichTextSizePage::TransferDataToWindow()
     wxRichTextFormattingDialog::SetDimensionValue(GetAttributes()->GetTextBoxAttr().GetMinSize().GetHeight(), m_minHeight, m_unitsMinH, m_minHeightCheckbox);
     wxRichTextFormattingDialog::SetDimensionValue(GetAttributes()->GetTextBoxAttr().GetMaxSize().GetWidth(), m_maxWidth, m_unitsMaxW, m_maxWidthCheckbox);
     wxRichTextFormattingDialog::SetDimensionValue(GetAttributes()->GetTextBoxAttr().GetMaxSize().GetHeight(), m_maxHeight, m_unitsMaxH, m_maxHeightCheckbox);
-    wxRichTextFormattingDialog::SetDimensionValue(GetAttributes()->GetTextBoxAttr().GetTop(), m_offset, m_unitsOffset, m_offsetYCheckbox);
+    wxRichTextFormattingDialog::SetDimensionValue(GetAttributes()->GetTextBoxAttr().GetLeft(), m_left, m_unitsLeft, m_positionLeftCheckbox);
+    wxRichTextFormattingDialog::SetDimensionValue(GetAttributes()->GetTextBoxAttr().GetTop(), m_top, m_unitsTop, m_positionTopCheckbox);
+    wxRichTextFormattingDialog::SetDimensionValue(GetAttributes()->GetTextBoxAttr().GetRight(), m_right, m_unitsRight, m_positionRightCheckbox);
+    wxRichTextFormattingDialog::SetDimensionValue(GetAttributes()->GetTextBoxAttr().GetBottom(), m_bottom, m_unitsBottom, m_positionBottomCheckbox);
+
+    if ((GetAttributes()->GetTextBoxAttr().GetLeft().GetPosition() & wxTEXT_BOX_ATTR_POSITION_FIXED) ||
+        (GetAttributes()->GetTextBoxAttr().GetRight().GetPosition() & wxTEXT_BOX_ATTR_POSITION_FIXED) ||
+        (GetAttributes()->GetTextBoxAttr().GetTop().GetPosition() & wxTEXT_BOX_ATTR_POSITION_FIXED) ||
+        (GetAttributes()->GetTextBoxAttr().GetBottom().GetPosition() & wxTEXT_BOX_ATTR_POSITION_FIXED))
+    {
+        m_positionMode = 3;
+    }
+    else
+    if ((GetAttributes()->GetTextBoxAttr().GetLeft().GetPosition() & wxTEXT_BOX_ATTR_POSITION_ABSOLUTE) ||
+        (GetAttributes()->GetTextBoxAttr().GetRight().GetPosition() & wxTEXT_BOX_ATTR_POSITION_ABSOLUTE) ||
+        (GetAttributes()->GetTextBoxAttr().GetTop().GetPosition() & wxTEXT_BOX_ATTR_POSITION_ABSOLUTE) ||
+        (GetAttributes()->GetTextBoxAttr().GetBottom().GetPosition() & wxTEXT_BOX_ATTR_POSITION_ABSOLUTE))
+    {
+        m_positionMode = 2;
+    }
+    else
+    if ((GetAttributes()->GetTextBoxAttr().GetLeft().GetPosition() & wxTEXT_BOX_ATTR_POSITION_RELATIVE) ||
+        (GetAttributes()->GetTextBoxAttr().GetRight().GetPosition() & wxTEXT_BOX_ATTR_POSITION_RELATIVE) ||
+        (GetAttributes()->GetTextBoxAttr().GetTop().GetPosition() & wxTEXT_BOX_ATTR_POSITION_RELATIVE) ||
+        (GetAttributes()->GetTextBoxAttr().GetBottom().GetPosition() & wxTEXT_BOX_ATTR_POSITION_RELATIVE))
+    {
+        m_positionMode = 1;
+    }
+    else
+        m_positionMode = 0;
 
-    return true;
+    return wxPanel::TransferDataToWindow();
 }
 
 bool wxRichTextSizePage::TransferDataFromWindow()
 {
+    wxPanel::TransferDataFromWindow();
+
     GetAttributes()->GetTextBoxAttr().SetFloatMode((wxTextBoxAttrFloatStyle) m_float->GetSelection());
     if (m_float->GetSelection() == 0)
         GetAttributes()->GetTextBoxAttr().RemoveFlag(wxTEXT_BOX_ATTR_FLOAT);
@@ -583,7 +745,30 @@ bool wxRichTextSizePage::TransferDataFromWindow()
     wxRichTextFormattingDialog::GetDimensionValue(GetAttributes()->GetTextBoxAttr().GetMinSize().GetHeight(), m_minHeight, m_unitsMinH, m_minHeightCheckbox);
     wxRichTextFormattingDialog::GetDimensionValue(GetAttributes()->GetTextBoxAttr().GetMaxSize().GetWidth(), m_maxWidth, m_unitsMaxW, m_maxWidthCheckbox);
     wxRichTextFormattingDialog::GetDimensionValue(GetAttributes()->GetTextBoxAttr().GetMaxSize().GetHeight(), m_maxHeight, m_unitsMaxH, m_maxHeightCheckbox);
-    wxRichTextFormattingDialog::GetDimensionValue(GetAttributes()->GetTextBoxAttr().GetTop(), m_offset, m_unitsOffset, m_offsetYCheckbox);
+
+    wxRichTextFormattingDialog::GetDimensionValue(GetAttributes()->GetTextBoxAttr().GetLeft(), m_left, m_unitsLeft, m_positionLeftCheckbox);
+    wxRichTextFormattingDialog::GetDimensionValue(GetAttributes()->GetTextBoxAttr().GetTop(), m_top, m_unitsTop, m_positionTopCheckbox);
+    wxRichTextFormattingDialog::GetDimensionValue(GetAttributes()->GetTextBoxAttr().GetRight(), m_right, m_unitsRight, m_positionRightCheckbox);
+    wxRichTextFormattingDialog::GetDimensionValue(GetAttributes()->GetTextBoxAttr().GetBottom(), m_bottom, m_unitsBottom, m_positionBottomCheckbox);
+
+    wxTextBoxAttrPosition flags;
+    if (m_positionMode == 3)
+        flags = wxTEXT_BOX_ATTR_POSITION_FIXED;
+    else if (m_positionMode == 2)
+        flags = wxTEXT_BOX_ATTR_POSITION_ABSOLUTE;
+    else if (m_positionMode == 1)
+        flags = wxTEXT_BOX_ATTR_POSITION_RELATIVE;
+    else
+        flags = wxTEXT_BOX_ATTR_POSITION_STATIC;
+
+    if (GetAttributes()->GetTextBoxAttr().GetLeft().IsValid())
+        GetAttributes()->GetTextBoxAttr().GetLeft().SetPosition(flags);
+    if (GetAttributes()->GetTextBoxAttr().GetTop().IsValid())
+        GetAttributes()->GetTextBoxAttr().GetTop().SetPosition(flags);
+    if (GetAttributes()->GetTextBoxAttr().GetRight().IsValid())
+        GetAttributes()->GetTextBoxAttr().GetRight().SetPosition(flags);
+    if (GetAttributes()->GetTextBoxAttr().GetBottom().IsValid())
+        GetAttributes()->GetTextBoxAttr().GetBottom().SetPosition(flags);
 
     return true;
 }
@@ -608,7 +793,6 @@ void wxRichTextSizePage::ShowFloatingControls(bool show)
     }
 }
 
-
 /*!
  * Get bitmap resources
  */
@@ -654,16 +838,6 @@ void wxRichTextSizePage::OnRichtextHeightUpdate( wxUpdateUIEvent& event )
     event.Enable(m_heightCheckbox->GetValue());
 }
 
-/*!
- * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OFFSET
- */
-
-void wxRichTextSizePage::OnRichtextOffsetUpdate( wxUpdateUIEvent& event )
-{
-    event.Enable(m_offsetYCheckbox->GetValue());
-}
-
-
 /*!
  * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXT_PARA_UP
  */
@@ -809,3 +983,42 @@ void wxRichTextSizePage::OnRichtextMaxHeightUpdate( wxUpdateUIEvent& event )
 {
     event.Enable(m_maxHeightCheckbox->GetValue());
 }
+
+
+/*!
+ * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_LEFT
+ */
+
+void wxRichTextSizePage::OnRichtextLeftUpdate( wxUpdateUIEvent& event )
+{
+    event.Enable(m_positionLeftCheckbox->GetValue());
+}
+
+/*!
+ * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_LEFT_UNITS
+ */
+
+void wxRichTextSizePage::OnRichtextTopUpdate( wxUpdateUIEvent& event )
+{
+    event.Enable(m_positionTopCheckbox->GetValue());
+}
+
+/*!
+ * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_RIGHT
+ */
+
+void wxRichTextSizePage::OnRichtextRightUpdate( wxUpdateUIEvent& event )
+{
+    event.Enable(m_positionRightCheckbox->GetValue());
+}
+
+
+/*!
+ * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BOTTOM
+ */
+
+void wxRichTextSizePage::OnRichtextBottomUpdate( wxUpdateUIEvent& event )
+{
+    event.Enable(m_positionBottomCheckbox->GetValue());
+}
+
wxWidgets (Impactor)