diff --git a/include/wx/richtext/richtextbuffer.h b/include/wx/richtext/richtextbuffer.h index 24656faa51..b9c7dfdc8a 100644 --- 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 a840f63a39..72b9ccfecc 100644 --- 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 f5edca39ab..41cc9abc49 100644 --- 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 e4b1afab91..0323f23475 100644 --- a/src/richtext/richtextdialogs.pjd +++ b/src/richtext/richtextdialogs.pjd @@ -14569,6 +14569,7 @@ "Standard" 0 0 + "m_positionMode|int|PositionMode|0|0|0|" "ID_WXRICHTEXTSIZEPAGE" 10700 "wxRichTextSizePage" @@ -14671,7 +14672,7 @@ 0 "<Any platform>" - "wxBoxSizer V" + "wxBoxSizer H" "dialog-control-document" "" "sizer" @@ -14680,8 +14681,8 @@ 0 0 "wbBoxSizerProxy" - "Vertical" - "m_floatingControls" + "Horizontal" + "" "Expand" "Centre" 0 @@ -14695,7 +14696,7 @@ 0 "<Any platform>" - "wxBoxSizer H" + "wxBoxSizer V" "dialog-control-document" "" "sizer" @@ -14704,11 +14705,11 @@ 0 0 "wbBoxSizerProxy" - "Horizontal" - "" + "Vertical" + "m_floatingControls" "Expand" "Centre" - 0 + 1 5 0 0 @@ -14719,182 +14720,7 @@ 0 "<Any platform>" - "wxStaticText: wxID_STATIC" - "dialog-control-document" - "" - "statictext" - 0 - 1 - 0 - 0 - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "" - "Floating" - -1 - "" - "" - "" - "" - "wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - - - "wxStaticLine: wxID_STATIC" - "dialog-control-document" - "" - "staticline" - 0 - 1 - 0 - 0 - "wbStaticLineProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticLine" - "wxStaticLine" - 1 - 0 - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - "wxBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "wbBoxSizerProxy" - "Horizontal" - "" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "<Any platform>" - - "Spacer" - "dialog-control-document" - "" - "spacer" - 0 - 1 - 0 - 0 - "wbSpacerProxy" - 5 - 5 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - - "wxFlexGridSizer" + "wxBoxSizer H" "dialog-control-document" "" "sizer" @@ -14902,26 +14728,21 @@ 1 0 0 - "wbFlexGridSizerProxy" - "" - "" - 2 - 0 - 0 - 0 + "wbBoxSizerProxy" + "Horizontal" "" - "<Any platform>" "Expand" "Centre" 0 5 0 - 1 + 0 0 0 0 0 0 + "<Any platform>" "wxStaticText: wxID_STATIC" "dialog-control-document" @@ -14942,13 +14763,13 @@ "" "" "" - "&Floating mode:" + "Floating" -1 "" "" "" "" - "" + "wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false" 0 1 "<Any platform>" @@ -14978,7 +14799,7 @@ -1 -1 -1 - "Right" + "Centre" "Centre" 0 5 @@ -14993,7 +14814,564 @@ "" - "wxComboBox: ID_RICHTEXT_FLOATING_MODE" + "wxStaticLine: wxID_STATIC" + "dialog-control-document" + "" + "staticline" + 0 + 1 + 0 + 0 + "wbStaticLineProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 1 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + + + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbBoxSizerProxy" + "Horizontal" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "Spacer" + "dialog-control-document" + "" + "spacer" + 0 + 1 + 0 + 0 + "wbSpacerProxy" + 5 + 5 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + + "wxFlexGridSizer" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbFlexGridSizerProxy" + "" + "" + 2 + 0 + 0 + 0 + "" + "<Any platform>" + "Expand" + "Centre" + 0 + 5 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + + "wxStaticText: wxID_STATIC" + "dialog-control-document" + "" + "statictext" + 0 + 1 + 0 + 0 + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" + "" + "&Floating mode:" + -1 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Right" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxComboBox: ID_RICHTEXT_FLOATING_MODE" + "dialog-control-document" + "" + "combobox" + 0 + 1 + 0 + 0 + "wbComboBoxProxy" + "ID_RICHTEXT_FLOATING_MODE" + 10701 + "" + "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" + "m_float" + "None|Left|Right" + "None" + "How the object will float relative to the text." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 80 + -1 + "Left" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + + + "wxBoxSizer V" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbBoxSizerProxy" + "Vertical" + "m_alignmentControls" + "Expand" + "Centre" + 1 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbBoxSizerProxy" + "Horizontal" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxStaticText: wxID_STATIC" + "dialog-control-document" + "" + "statictext" + 0 + 1 + 0 + 0 + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" + "" + "Alignment" + -1 + "" + "" + "" + "" + "wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxStaticLine: wxID_STATIC" + "dialog-control-document" + "" + "staticline" + 0 + 1 + 0 + 0 + "wbStaticLineProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 1 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + + + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbBoxSizerProxy" + "Horizontal" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "Spacer" + "dialog-control-document" + "" + "spacer" + 0 + 1 + 0 + 0 + "wbSpacerProxy" + 5 + 5 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "<Any platform>" + + + "wxCheckBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "wbCheckBoxProxy" + "ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX" + 10708 + "" + "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" + "m_verticalAlignmentCheckbox" + "&Vertical alignment:" + 0 + "Enable vertical alignment." + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxComboBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX" "dialog-control-document" "" "combobox" @@ -15002,8 +15380,9 @@ 0 0 "wbComboBoxProxy" - "ID_RICHTEXT_FLOATING_MODE" - 10701 + "wxEVT_UPDATE_UI|OnRichtextVerticalAlignmentComboboxUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX" + 10709 "" "wxComboBox" "wxComboBox" @@ -15011,10 +15390,10 @@ 0 "" "" - "m_float" - "None|Left|Right" - "None" - "How the object will float relative to the text." + "m_verticalAlignmentComboBox" + "Top|Centred|Bottom" + "Top" + "Vertical alignment." "" "" "" @@ -15040,9 +15419,9 @@ "" -1 -1 - 80 + -1 -1 - "Left" + "Centre" "Centre" 0 5 @@ -16705,359 +17084,6 @@ - - "wxBoxSizer V" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "wbBoxSizerProxy" - "Vertical" - "m_alignmentControls" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "<Any platform>" - - "wxBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "wbBoxSizerProxy" - "Horizontal" - "" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "<Any platform>" - - "wxStaticText: wxID_STATIC" - "dialog-control-document" - "" - "statictext" - 0 - 1 - 0 - 0 - "wbStaticTextProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticText" - "wxStaticText" - 1 - 0 - "" - "" - "" - "Alignment" - -1 - "" - "" - "" - "" - "wxSYS_DEFAULT_GUI_FONT:default,default,default, wxBOLD, false" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - - - "wxStaticLine: wxID_STATIC" - "dialog-control-document" - "" - "staticline" - 0 - 1 - 0 - 0 - "wbStaticLineProxy" - "wxID_STATIC" - 5105 - "" - "wxStaticLine" - "wxStaticLine" - 1 - 0 - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 1 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - - - "wxBoxSizer H" - "dialog-control-document" - "" - "sizer" - 0 - 1 - 0 - 0 - "wbBoxSizerProxy" - "Horizontal" - "" - "Expand" - "Centre" - 0 - 5 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "<Any platform>" - - "Spacer" - "dialog-control-document" - "" - "spacer" - 0 - 1 - 0 - 0 - "wbSpacerProxy" - 5 - 5 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "<Any platform>" - - - "wxCheckBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX" - "dialog-control-document" - "" - "checkbox" - 0 - 1 - 0 - 0 - "wbCheckBoxProxy" - "ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX" - 10708 - "" - "wxCheckBox" - "wxCheckBox" - 1 - 0 - "" - "" - "m_verticalAlignmentCheckbox" - "&Vertical alignment:" - 0 - "Enable vertical alignment." - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - - - "wxComboBox: ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX" - "dialog-control-document" - "" - "combobox" - 0 - 1 - 0 - 0 - "wbComboBoxProxy" - "wxEVT_UPDATE_UI|OnRichtextVerticalAlignmentComboboxUpdate|NONE||wxRichTextSizePage" - "ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX" - 10709 - "" - "wxComboBox" - "wxComboBox" - 1 - 0 - "" - "" - "m_verticalAlignmentComboBox" - "Top|Centred|Bottom" - "Top" - "Vertical alignment." - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - "" - "" - - - "wxBoxSizer V" "dialog-control-document" @@ -17317,7 +17343,7 @@ "wbBoxSizerProxy" "Horizontal" "" - "Expand" + "Left" "Centre" 0 5 @@ -17330,7 +17356,171 @@ 0 "<Any platform>" - "wxCheckBox: ID_RICHTEXT_OFFSET_CHECKBOX" + "wxStaticText: wxID_STATIC" + "dialog-control-document" + "" + "statictext" + 0 + 1 + 0 + 0 + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" + "" + "&Position mode:" + -1 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxComboBox: ID_RICHTEXT_POSITION_MODE" + "dialog-control-document" + "" + "combobox" + 0 + 1 + 0 + 0 + "wbComboBoxProxy" + "ID_RICHTEXT_POSITION_MODE" + 10735 + "" + "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" + "m_positionModeCtrl" + "Static|Relative|Absolute|Fixed" + "Static" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "m_positionMode" + "wxGenericValidator(& %VARIABLE%)" + "" + "" + "" + "" + "" + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + "wxFlexGridSizer" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbFlexGridSizerProxy" + "" + "" + 4 + 0 + 0 + 0 + "" + "<Any platform>" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + "wxCheckBox: ID_RICHTEXT_LEFT_CHECKBOX" "dialog-control-document" "" "checkbox" @@ -17339,7 +17529,7 @@ 0 0 "wbCheckBoxProxy" - "ID_RICHTEXT_OFFSET_CHECKBOX" + "ID_RICHTEXT_LEFT_CHECKBOX" 10710 "" "wxCheckBox" @@ -17348,10 +17538,10 @@ 0 "" "" - "m_offsetYCheckbox" - "Vertical &Offset:" + "m_positionLeftCheckbox" + "&Left:" 0 - "Enable vertical offset." + "The left position." "" "" "" @@ -17378,7 +17568,7 @@ -1 -1 -1 - "Centre" + "Left" "Centre" 0 5 @@ -17393,36 +17583,202 @@ "" - "wxTextCtrl: ID_RICHTEXT_OFFSET" + "wxBoxSizer H" "dialog-control-document" "" - "textctrl" + "sizer" 0 1 0 0 - "wbTextCtrlProxy" - "wxEVT_UPDATE_UI|OnRichtextOffsetUpdate|NONE||wxRichTextSizePage" - "ID_RICHTEXT_OFFSET" - 10711 + "wbBoxSizerProxy" + "Horizontal" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxTextCtrl: ID_RICHTEXT_LEFT" + "dialog-control-document" + "" + "textctrl" + 0 + 1 + 0 + 0 + "wbTextCtrlProxy" + "wxEVT_UPDATE_UI|OnRichtextLeftUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_LEFT" + 10711 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_left" + "" + 10 + "The left position." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 65 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxComboBox: ID_RICHTEXT_LEFT_UNITS" + "dialog-control-document" + "" + "combobox" + 0 + 1 + 0 + 0 + "wbComboBoxProxy" + "wxEVT_UPDATE_UI|OnRichtextTopUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_LEFT_UNITS" + 10712 + "" + "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" + "m_unitsLeft" + "px|cm|percent" + "px" + "Units for the left position." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 60 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + "wxCheckBox: ID_RICHTEXT_TOP_CHECKBOX" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "wbCheckBoxProxy" + "ID_RICHTEXT_TOP_CHECKBOX" + 10710 "" - "wxTextCtrl" - "wxTextCtrl" + "wxCheckBox" + "wxCheckBox" 1 0 "" "" - "m_offset" - "" - 10 - "The vertical offset relative to the paragraph." + "m_positionTopCheckbox" + "&Top:" + 0 + "The top position." "" - "" - "" - "" - 0 - 1 - "<Any platform>" "" "" "" @@ -17430,38 +17786,25 @@ "" "" "" - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 0 0 0 "" -1 -1 - 65 + -1 -1 - "Centre" + "Left" "Centre" 0 5 @@ -17476,36 +17819,202 @@ "" - "wxComboBox: ID_RICHTEXT_OFFSET_UNITS" + "wxBoxSizer H" "dialog-control-document" "" - "combobox" + "sizer" 0 1 0 0 - "wbComboBoxProxy" - "wxEVT_UPDATE_UI|OnRichtextOffsetUpdate|NONE||wxRichTextSizePage" - "ID_RICHTEXT_OFFSET_UNITS" - 10712 + "wbBoxSizerProxy" + "Horizontal" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxTextCtrl: ID_RICHTEXT_TOP" + "dialog-control-document" + "" + "textctrl" + 0 + 1 + 0 + 0 + "wbTextCtrlProxy" + "wxEVT_UPDATE_UI|OnRichtextTopUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_TOP" + 10728 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_top" + "" + 10 + "The top position." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 65 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxComboBox: ID_RICHTEXT_TOP_UNITS" + "dialog-control-document" + "" + "combobox" + 0 + 1 + 0 + 0 + "wbComboBoxProxy" + "wxEVT_UPDATE_UI|OnRichtextTopUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_TOP_UNITS" + 10729 + "" + "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" + "m_unitsTop" + "px|cm|percent" + "px" + "Units for the top position." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 60 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + "wxCheckBox: ID_RICHTEXT_RIGHT_CHECKBOX" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "wbCheckBoxProxy" + "ID_RICHTEXT_RIGHT_CHECKBOX" + 10727 "" - "wxComboBox" - "wxComboBox" + "wxCheckBox" + "wxCheckBox" 1 0 "" "" - "m_unitsOffset" - "px|cm" - "px" - "Units for the object offset." + "m_positionRightCheckbox" + "&Right:" + 0 + "The right position." "" - "" - "" - "" - 0 - 1 - "<Any platform>" "" "" "" @@ -17513,25 +18022,30 @@ "" "" "" - 0 - 0 - 1 - 0 - 0 + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 0 0 0 "" -1 -1 - 60 + -1 -1 - "Centre" + "Left" "Centre" 0 5 1 - 1 + 0 1 1 0 @@ -17540,6 +18054,415 @@ "" "" + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbBoxSizerProxy" + "Horizontal" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxTextCtrl: ID_RICHTEXT_RIGHT" + "dialog-control-document" + "" + "textctrl" + 0 + 1 + 0 + 0 + "wbTextCtrlProxy" + "wxEVT_UPDATE_UI|OnRichtextRightUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_RIGHT" + 10730 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_right" + "" + 10 + "The right position." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 65 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxComboBox: ID_RICHTEXT_RIGHT_UNITS" + "dialog-control-document" + "" + "combobox" + 0 + 1 + 0 + 0 + "wbComboBoxProxy" + "wxEVT_UPDATE_UI|OnRichtextRightUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_RIGHT_UNITS" + 10731 + "" + "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" + "m_unitsRight" + "px|cm|percent" + "px" + "Units for the right position." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 60 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + "wxCheckBox: ID_RICHTEXT_BOTTOM_CHECKBOX" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "wbCheckBoxProxy" + "ID_RICHTEXT_BOTTOM_CHECKBOX" + 10732 + "" + "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" + "m_positionBottomCheckbox" + "&Bottom:" + 0 + "The bottom position." + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Left" + "Centre" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxBoxSizer H" + "dialog-control-document" + "" + "sizer" + 0 + 1 + 0 + 0 + "wbBoxSizerProxy" + "Horizontal" + "" + "Expand" + "Centre" + 0 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxTextCtrl: ID_RICHTEXT_BOTTOM" + "dialog-control-document" + "" + "textctrl" + 0 + 1 + 0 + 0 + "wbTextCtrlProxy" + "wxEVT_UPDATE_UI|OnRichtextBottomUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_BOTTOM" + 10733 + "" + "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" + "m_bottom" + "" + 10 + "The bottom position." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 65 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 0 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxComboBox: ID_RICHTEXT_BOTTOM_UNITS" + "dialog-control-document" + "" + "combobox" + 0 + 1 + 0 + 0 + "wbComboBoxProxy" + "wxEVT_UPDATE_UI|OnRichtextBottomUpdate|NONE||wxRichTextSizePage" + "ID_RICHTEXT_BOTTOM_UNITS" + 10734 + "" + "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" + "m_unitsBottom" + "px|cm|percent" + "px" + "Units for the bottom position." + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + 60 + -1 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + "wxBoxSizer H" diff --git a/src/richtext/richtextsizepage.cpp b/src/richtext/richtextsizepage.cpp index d9c9fff03e..7ecc27533f 100644 --- 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_OFFSET, wxRichTextSizePage::OnRichtextOffsetUpdate ) + EVT_UPDATE_UI( ID_RICHTEXT_LEFT_UNITS, wxRichTextSizePage::OnRichtextTopUpdate ) - EVT_UPDATE_UI( ID_RICHTEXT_OFFSET_UNITS, wxRichTextSizePage::OnRichtextOffsetUpdate ) + 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_BOTTOM, wxRichTextSizePage::OnRichtextBottomUpdate ) + + 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,212 +231,32 @@ 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); - - wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxHORIZONTAL); - m_parentSizer->Add(itemBoxSizer13, 0, wxGROW, 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); - - wxStaticLine* itemStaticLine15 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - itemBoxSizer13->Add(itemStaticLine15, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxHORIZONTAL); - m_parentSizer->Add(itemBoxSizer16, 0, wxGROW, 5); - - itemBoxSizer16->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxFlexGridSizer* itemFlexGridSizer18 = new wxFlexGridSizer(0, 4, 0, 0); - itemBoxSizer16->Add(itemFlexGridSizer18, 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); - - wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer18->Add(itemBoxSizer20, 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); - - wxArrayString m_unitsWStrings; - m_unitsWStrings.Add(_("px")); - m_unitsWStrings.Add(_("cm")); - m_unitsWStrings.Add(_("percent")); - m_unitsW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsWStrings, wxCB_READONLY ); - m_unitsW->SetStringSelection(_("px")); - 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); - - 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); - - wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer18->Add(itemBoxSizer24, 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); - - wxArrayString m_unitsHStrings; - m_unitsHStrings.Add(_("px")); - m_unitsHStrings.Add(_("cm")); - m_unitsHStrings.Add(_("percent")); - m_unitsH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsHStrings, wxCB_READONLY ); - m_unitsH->SetStringSelection(_("px")); - 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); - - 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); - - wxBoxSizer* itemBoxSizer28 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer18->Add(itemBoxSizer28, 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); - - wxArrayString m_unitsMinWStrings; - m_unitsMinWStrings.Add(_("px")); - m_unitsMinWStrings.Add(_("cm")); - m_unitsMinWStrings.Add(_("percent")); - m_unitsMinW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MIN_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMinWStrings, wxCB_READONLY ); - m_unitsMinW->SetStringSelection(_("px")); - 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); - - 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); - - wxBoxSizer* itemBoxSizer32 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer18->Add(itemBoxSizer32, 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); - - wxArrayString m_unitsMinHStrings; - m_unitsMinHStrings.Add(_("px")); - m_unitsMinHStrings.Add(_("cm")); - m_unitsMinHStrings.Add(_("percent")); - m_unitsMinH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MIN_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMinHStrings, wxCB_READONLY ); - m_unitsMinH->SetStringSelection(_("px")); - 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); - - 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); - - wxBoxSizer* itemBoxSizer36 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer18->Add(itemBoxSizer36, 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); - - wxArrayString m_unitsMaxWStrings; - m_unitsMaxWStrings.Add(_("px")); - m_unitsMaxWStrings.Add(_("cm")); - m_unitsMaxWStrings.Add(_("percent")); - m_unitsMaxW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MAX_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMaxWStrings, wxCB_READONLY ); - m_unitsMaxW->SetStringSelection(_("px")); - 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); - - 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); - - wxBoxSizer* itemBoxSizer40 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer18->Add(itemBoxSizer40, 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); - - wxArrayString m_unitsMaxHStrings; - m_unitsMaxHStrings.Add(_("px")); - m_unitsMaxHStrings.Add(_("cm")); - m_unitsMaxHStrings.Add(_("percent")); - m_unitsMaxH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MAX_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMaxHStrings, wxCB_READONLY ); - m_unitsMaxH->SetStringSelection(_("px")); - 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); + itemFlexGridSizer11->Add(m_float, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_alignmentControls = new wxBoxSizer(wxVERTICAL); - m_parentSizer->Add(m_alignmentControls, 0, wxGROW, 5); + itemBoxSizer4->Add(m_alignmentControls, 1, wxALIGN_CENTER_VERTICAL, 5); - wxBoxSizer* itemBoxSizer44 = new wxBoxSizer(wxHORIZONTAL); - m_alignmentControls->Add(itemBoxSizer44, 0, wxGROW, 5); + wxBoxSizer* itemBoxSizer15 = new wxBoxSizer(wxHORIZONTAL); + m_alignmentControls->Add(itemBoxSizer15, 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* 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); - wxStaticLine* itemStaticLine46 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - itemBoxSizer44->Add(itemStaticLine46, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticLine* itemStaticLine17 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + itemBoxSizer15->Add(itemStaticLine17, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer47 = new wxBoxSizer(wxHORIZONTAL); - m_alignmentControls->Add(itemBoxSizer47, 0, wxGROW, 5); + wxBoxSizer* itemBoxSizer18 = new wxBoxSizer(wxHORIZONTAL); + m_alignmentControls->Add(itemBoxSizer18, 0, wxGROW, 5); - itemBoxSizer47->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 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.")); - itemBoxSizer47->Add(m_verticalAlignmentCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer18->Add(m_verticalAlignmentCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxArrayString m_verticalAlignmentComboBoxStrings; m_verticalAlignmentComboBoxStrings.Add(_("Top")); @@ -421,74 +267,359 @@ void wxRichTextSizePage::CreateControls() m_verticalAlignmentComboBox->SetHelpText(_("Vertical alignment.")); if (wxRichTextSizePage::ShowToolTips()) m_verticalAlignmentComboBox->SetToolTip(_("Vertical alignment.")); - itemBoxSizer47->Add(m_verticalAlignmentComboBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + 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.")); + itemFlexGridSizer27->Add(m_widthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 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.")); + itemBoxSizer29->Add(m_width, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + + wxArrayString m_unitsWStrings; + m_unitsWStrings.Add(_("px")); + m_unitsWStrings.Add(_("cm")); + m_unitsWStrings.Add(_("percent")); + m_unitsW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsWStrings, wxCB_READONLY ); + m_unitsW->SetStringSelection(_("px")); + m_unitsW->SetHelpText(_("Units for the object width.")); + if (wxRichTextSizePage::ShowToolTips()) + m_unitsW->SetToolTip(_("Units for the object width.")); + 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.")); + itemFlexGridSizer27->Add(m_heightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 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.")); + itemBoxSizer33->Add(m_height, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + + wxArrayString m_unitsHStrings; + m_unitsHStrings.Add(_("px")); + m_unitsHStrings.Add(_("cm")); + m_unitsHStrings.Add(_("percent")); + m_unitsH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsHStrings, wxCB_READONLY ); + m_unitsH->SetStringSelection(_("px")); + m_unitsH->SetHelpText(_("Units for the object height.")); + if (wxRichTextSizePage::ShowToolTips()) + m_unitsH->SetToolTip(_("Units for the object height.")); + 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.")); + itemFlexGridSizer27->Add(m_minWidthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 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.")); + itemBoxSizer37->Add(m_minWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + + wxArrayString m_unitsMinWStrings; + m_unitsMinWStrings.Add(_("px")); + m_unitsMinWStrings.Add(_("cm")); + m_unitsMinWStrings.Add(_("percent")); + m_unitsMinW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MIN_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMinWStrings, wxCB_READONLY ); + m_unitsMinW->SetStringSelection(_("px")); + m_unitsMinW->SetHelpText(_("Units for the minimum object width.")); + if (wxRichTextSizePage::ShowToolTips()) + m_unitsMinW->SetToolTip(_("Units for the minimum object width.")); + 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.")); + itemFlexGridSizer27->Add(m_minHeightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 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.")); + itemBoxSizer41->Add(m_minHeight, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + + wxArrayString m_unitsMinHStrings; + m_unitsMinHStrings.Add(_("px")); + m_unitsMinHStrings.Add(_("cm")); + m_unitsMinHStrings.Add(_("percent")); + m_unitsMinH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MIN_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMinHStrings, wxCB_READONLY ); + m_unitsMinH->SetStringSelection(_("px")); + m_unitsMinH->SetHelpText(_("Units for the minimum object height.")); + if (wxRichTextSizePage::ShowToolTips()) + m_unitsMinH->SetToolTip(_("Units for the minimum object height.")); + 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.")); + itemFlexGridSizer27->Add(m_maxWidthCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 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.")); + itemBoxSizer45->Add(m_maxWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + + wxArrayString m_unitsMaxWStrings; + m_unitsMaxWStrings.Add(_("px")); + m_unitsMaxWStrings.Add(_("cm")); + m_unitsMaxWStrings.Add(_("percent")); + m_unitsMaxW = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MAX_W, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMaxWStrings, wxCB_READONLY ); + m_unitsMaxW->SetStringSelection(_("px")); + m_unitsMaxW->SetHelpText(_("Units for the maximum object width.")); + if (wxRichTextSizePage::ShowToolTips()) + m_unitsMaxW->SetToolTip(_("Units for the maximum object width.")); + 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.")); + itemFlexGridSizer27->Add(m_maxHeightCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 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.")); + itemBoxSizer49->Add(m_maxHeight, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + + wxArrayString m_unitsMaxHStrings; + m_unitsMaxHStrings.Add(_("px")); + m_unitsMaxHStrings.Add(_("cm")); + m_unitsMaxHStrings.Add(_("percent")); + m_unitsMaxH = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXT_UNITS_MAX_H, _("px"), wxDefaultPosition, wxSize(60, -1), m_unitsMaxHStrings, wxCB_READONLY ); + m_unitsMaxH->SetStringSelection(_("px")); + m_unitsMaxH->SetHelpText(_("Units for the maximum object height.")); + if (wxRichTextSizePage::ShowToolTips()) + m_unitsMaxH->SetToolTip(_("Units for the maximum object height.")); + itemBoxSizer49->Add(m_unitsMaxH, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_positionControls = new wxBoxSizer(wxVERTICAL); m_parentSizer->Add(m_positionControls, 0, wxGROW, 5); - wxBoxSizer* itemBoxSizer52 = new wxBoxSizer(wxHORIZONTAL); - m_positionControls->Add(itemBoxSizer52, 0, wxGROW, 5); + wxBoxSizer* itemBoxSizer53 = new wxBoxSizer(wxHORIZONTAL); + m_positionControls->Add(itemBoxSizer53, 0, wxGROW, 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); + 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* itemStaticLine54 = new wxStaticLine( itemRichTextDialogPage1, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - itemBoxSizer52->Add(itemStaticLine54, 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* itemBoxSizer55 = new wxBoxSizer(wxHORIZONTAL); - m_positionControls->Add(itemBoxSizer55, 0, wxGROW, 5); + wxBoxSizer* itemBoxSizer56 = new wxBoxSizer(wxHORIZONTAL); + m_positionControls->Add(itemBoxSizer56, 0, wxGROW, 5); - itemBoxSizer55->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer56->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_moveObjectParentSizer = new wxBoxSizer(wxVERTICAL); - itemBoxSizer55->Add(m_moveObjectParentSizer, 0, wxALIGN_TOP, 5); + itemBoxSizer56->Add(m_moveObjectParentSizer, 0, wxALIGN_TOP, 5); - wxBoxSizer* itemBoxSizer58 = new wxBoxSizer(wxHORIZONTAL); - m_moveObjectParentSizer->Add(itemBoxSizer58, 0, wxGROW, 5); + wxBoxSizer* itemBoxSizer59 = new wxBoxSizer(wxHORIZONTAL); + m_moveObjectParentSizer->Add(itemBoxSizer59, 0, wxALIGN_LEFT, 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.")); + wxStaticText* itemStaticText60 = new wxStaticText( itemRichTextDialogPage1, wxID_STATIC, _("&Position mode:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer59->Add(itemStaticText60, 0, wxALIGN_CENTER_VERTICAL|wxALL, 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); + + wxFlexGridSizer* itemFlexGridSizer62 = new wxFlexGridSizer(0, 4, 0, 0); + m_moveObjectParentSizer->Add(itemFlexGridSizer62, 0, wxGROW, 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_offsetYCheckbox->SetToolTip(_("Enable vertical offset.")); - itemBoxSizer58->Add(m_offsetYCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + m_positionLeftCheckbox->SetToolTip(_("The left position.")); + itemFlexGridSizer62->Add(m_positionLeftCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 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.")); - 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); + wxBoxSizer* itemBoxSizer64 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer62->Add(itemBoxSizer64, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 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_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_unitsOffset->SetToolTip(_("Units for the object offset.")); - itemBoxSizer58->Add(m_unitsOffset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + 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_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* 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_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_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_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_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); + + 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_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); - return true; + 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 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()); +} +