diff --git a/include/wx/richtext/richtextborderspage.h b/include/wx/richtext/richtextborderspage.h index 03810b69ae..347f154fd2 100644 --- a/include/wx/richtext/richtextborderspage.h +++ b/include/wx/richtext/richtextborderspage.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/richtext/richtextborderspage.h -// Purpose: +// Purpose: A border editing page for the wxRTC formatting dialog. // Author: Julian Smart // Modified by: // Created: 21/10/2010 11:34:24 @@ -12,7 +12,6 @@ #ifndef _RICHTEXTBORDERSPAGE_H_ #define _RICHTEXTBORDERSPAGE_H_ - /*! * Includes */ @@ -78,6 +77,9 @@ public: virtual bool TransferDataToWindow(); virtual bool TransferDataFromWindow(); + /// Updates the synchronization checkboxes to reflect the state of the attributes + void UpdateSyncControls(); + /// Updates the preview void OnCommand(wxCommandEvent& event); @@ -97,9 +99,21 @@ public: /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_LEFT_CHECKBOX void OnRichtextBorderCheckboxClick( wxCommandEvent& event ); + /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_BORDER_LEFT + void OnRichtextBorderLeftValueTextUpdated( wxCommandEvent& event ); + /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_LEFT void OnRichtextBorderLeftUpdate( wxUpdateUIEvent& event ); + /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_UNITS + void OnRichtextBorderLeftUnitsSelected( wxCommandEvent& event ); + + /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_STYLE + void OnRichtextBorderLeftStyleSelected( wxCommandEvent& event ); + + /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT_CHECKBOX + void OnRichtextBorderOtherCheckboxUpdate( wxUpdateUIEvent& event ); + /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT void OnRichtextBorderRightUpdate( wxUpdateUIEvent& event ); @@ -109,9 +123,27 @@ public: /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_BOTTOM void OnRichtextBorderBottomUpdate( wxUpdateUIEvent& event ); + /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE + void OnRichtextBorderSynchronizeClick( wxCommandEvent& event ); + + /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE + void OnRichtextBorderSynchronizeUpdate( wxUpdateUIEvent& event ); + + /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_OUTLINE_LEFT + void OnRichtextOutlineLeftTextUpdated( wxCommandEvent& event ); + /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_LEFT void OnRichtextOutlineLeftUpdate( wxUpdateUIEvent& event ); + /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_UNITS + void OnRichtextOutlineLeftUnitsSelected( wxCommandEvent& event ); + + /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_STYLE + void OnRichtextOutlineLeftStyleSelected( wxCommandEvent& event ); + + /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX + void OnRichtextOutlineOtherCheckboxUpdate( wxUpdateUIEvent& event ); + /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT void OnRichtextOutlineRightUpdate( wxUpdateUIEvent& event ); @@ -121,6 +153,12 @@ public: /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_BOTTOM void OnRichtextOutlineBottomUpdate( wxUpdateUIEvent& event ); + /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE + void OnRichtextOutlineSynchronizeClick( wxCommandEvent& event ); + + /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE + void OnRichtextOutlineSynchronizeUpdate( wxUpdateUIEvent& event ); + ////@end wxRichTextBordersPage event handler declarations ////@begin wxRichTextBordersPage member function declarations @@ -156,6 +194,7 @@ public: wxComboBox* m_bottomBorderWidthUnits; wxComboBox* m_bottomBorderStyle; wxRichTextColourSwatchCtrl* m_bottomBorderColour; + wxCheckBox* m_borderSyncCtrl; wxCheckBox* m_leftOutlineCheckbox; wxTextCtrl* m_leftOutlineWidth; wxComboBox* m_leftOutlineWidthUnits; @@ -176,6 +215,7 @@ public: wxComboBox* m_bottomOutlineWidthUnits; wxComboBox* m_bottomOutlineStyle; wxRichTextColourSwatchCtrl* m_bottomOutlineColour; + wxCheckBox* m_outlineSyncCtrl; wxRichTextBorderPreviewCtrl* m_borderPreviewCtrl; /// Control identifiers enum { @@ -202,6 +242,7 @@ public: ID_RICHTEXT_BORDER_BOTTOM_UNITS = 10820, ID_RICHTEXT_BORDER_BOTTOM_STYLE = 10821, ID_RICHTEXT_BORDER_BOTTOM_COLOUR = 10822, + ID_RICHTEXT_BORDER_SYNCHRONIZE = 10845, ID_RICHTEXTBORDERSPAGE_OUTLINE = 10823, ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX = 10824, ID_RICHTEXT_OUTLINE_LEFT = 10825, @@ -223,6 +264,7 @@ public: ID_RICHTEXT_OUTLINE_BOTTOM_UNITS = 10841, ID_RICHTEXT_OUTLINE_BOTTOM_STYLE = 10842, ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR = 10843, + ID_RICHTEXT_OUTLINE_SYNCHRONIZE = 10846, ID_RICHTEXT_BORDER_PREVIEW = 10844 }; ////@end wxRichTextBordersPage member variables diff --git a/src/richtext/richtextborderspage.cpp b/src/richtext/richtextborderspage.cpp index 660effe34e..2925b78262 100644 --- a/src/richtext/richtextborderspage.cpp +++ b/src/richtext/richtextborderspage.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/richtext/richtextborderspage.cpp -// Purpose: +// Purpose: A border editing page for the wxRTC formatting dialog. // Author: Julian Smart // Modified by: // Created: 21/10/2010 11:34:24 // RCS-ID: // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// ////@begin includes @@ -18,14 +18,12 @@ ////@begin XPM images ////@end XPM images - /*! * wxRichTextBordersPage type definition */ IMPLEMENT_DYNAMIC_CLASS( wxRichTextBordersPage, wxRichTextDialogPage ) - /*! * wxRichTextBordersPage event table definition */ @@ -40,45 +38,61 @@ BEGIN_EVENT_TABLE( wxRichTextBordersPage, wxRichTextDialogPage ) ////@begin wxRichTextBordersPage event table entries EVT_CHECKBOX( ID_RICHTEXT_BORDER_LEFT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) + EVT_TEXT( ID_RICHTEXT_BORDER_LEFT, wxRichTextBordersPage::OnRichtextBorderLeftValueTextUpdated ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT, wxRichTextBordersPage::OnRichtextBorderLeftUpdate ) + EVT_COMBOBOX( ID_RICHTEXT_BORDER_LEFT_UNITS, wxRichTextBordersPage::OnRichtextBorderLeftUnitsSelected ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_UNITS, wxRichTextBordersPage::OnRichtextBorderLeftUpdate ) + EVT_COMBOBOX( ID_RICHTEXT_BORDER_LEFT_STYLE, wxRichTextBordersPage::OnRichtextBorderLeftStyleSelected ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_STYLE, wxRichTextBordersPage::OnRichtextBorderLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_COLOUR, wxRichTextBordersPage::OnRichtextBorderLeftUpdate ) EVT_CHECKBOX( ID_RICHTEXT_BORDER_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) + EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderOtherCheckboxUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT, wxRichTextBordersPage::OnRichtextBorderRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_UNITS, wxRichTextBordersPage::OnRichtextBorderRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_STYLE, wxRichTextBordersPage::OnRichtextBorderRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_COLOUR, wxRichTextBordersPage::OnRichtextBorderRightUpdate ) EVT_CHECKBOX( ID_RICHTEXT_BORDER_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) + EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderOtherCheckboxUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP, wxRichTextBordersPage::OnRichtextBorderTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_UNITS, wxRichTextBordersPage::OnRichtextBorderTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_STYLE, wxRichTextBordersPage::OnRichtextBorderTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_COLOUR, wxRichTextBordersPage::OnRichtextBorderTopUpdate ) EVT_CHECKBOX( ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) + EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderOtherCheckboxUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM, wxRichTextBordersPage::OnRichtextBorderBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_UNITS, wxRichTextBordersPage::OnRichtextBorderBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_STYLE, wxRichTextBordersPage::OnRichtextBorderBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_COLOUR, wxRichTextBordersPage::OnRichtextBorderBottomUpdate ) + EVT_CHECKBOX( ID_RICHTEXT_BORDER_SYNCHRONIZE, wxRichTextBordersPage::OnRichtextBorderSynchronizeClick ) + EVT_UPDATE_UI( ID_RICHTEXT_BORDER_SYNCHRONIZE, wxRichTextBordersPage::OnRichtextBorderSynchronizeUpdate ) EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) + EVT_TEXT( ID_RICHTEXT_OUTLINE_LEFT, wxRichTextBordersPage::OnRichtextOutlineLeftTextUpdated ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate ) + EVT_COMBOBOX( ID_RICHTEXT_OUTLINE_LEFT_UNITS, wxRichTextBordersPage::OnRichtextOutlineLeftUnitsSelected ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_UNITS, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate ) + EVT_COMBOBOX( ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxRichTextBordersPage::OnRichtextOutlineLeftStyleSelected ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_COLOUR, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate ) EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) + EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextOutlineOtherCheckboxUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT, wxRichTextBordersPage::OnRichtextOutlineRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_UNITS, wxRichTextBordersPage::OnRichtextOutlineRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_STYLE, wxRichTextBordersPage::OnRichtextOutlineRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_COLOUR, wxRichTextBordersPage::OnRichtextOutlineRightUpdate ) EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) + EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextOutlineOtherCheckboxUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP, wxRichTextBordersPage::OnRichtextOutlineTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_UNITS, wxRichTextBordersPage::OnRichtextOutlineTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_STYLE, wxRichTextBordersPage::OnRichtextOutlineTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_COLOUR, wxRichTextBordersPage::OnRichtextOutlineTopUpdate ) EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) + EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextOutlineOtherCheckboxUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_UNITS, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_STYLE, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate ) + EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_SYNCHRONIZE, wxRichTextBordersPage::OnRichtextOutlineSynchronizeClick ) + EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_SYNCHRONIZE, wxRichTextBordersPage::OnRichtextOutlineSynchronizeUpdate ) ////@end wxRichTextBordersPage event table entries END_EVENT_TABLE() @@ -100,7 +114,6 @@ wxRichTextBordersPage::wxRichTextBordersPage( wxWindow* parent, wxWindowID id, c Create(parent, id, pos, size, style); } - /*! * wxRichTextBordersPage creator */ @@ -121,7 +134,6 @@ bool wxRichTextBordersPage::Create( wxWindow* parent, wxWindowID id, const wxPoi return true; } - /*! * wxRichTextBordersPage destructor */ @@ -132,7 +144,6 @@ wxRichTextBordersPage::~wxRichTextBordersPage() ////@end wxRichTextBordersPage destruction } - /*! * Member initialisation */ @@ -162,6 +173,7 @@ void wxRichTextBordersPage::Init() m_bottomBorderWidthUnits = NULL; m_bottomBorderStyle = NULL; m_bottomBorderColour = NULL; + m_borderSyncCtrl = NULL; m_leftOutlineCheckbox = NULL; m_leftOutlineWidth = NULL; m_leftOutlineWidthUnits = NULL; @@ -182,11 +194,11 @@ void wxRichTextBordersPage::Init() m_bottomOutlineWidthUnits = NULL; m_bottomOutlineStyle = NULL; m_bottomOutlineColour = NULL; + m_outlineSyncCtrl = NULL; m_borderPreviewCtrl = NULL; ////@end wxRichTextBordersPage member initialisation } - /*! * Control creation for wxRichTextBordersPage */ @@ -250,6 +262,9 @@ void wxRichTextBordersPage::CreateControls() wxArrayString m_leftBorderStyleStrings; m_leftBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_LEFT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_leftBorderStyleStrings, wxCB_READONLY ); + m_leftBorderStyle->SetHelpText(_("The border line style.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_leftBorderStyle->SetToolTip(_("The border line style.")); itemBoxSizer15->Add(m_leftBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer15->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); @@ -281,6 +296,9 @@ void wxRichTextBordersPage::CreateControls() wxArrayString m_rightBorderStyleStrings; m_rightBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_RIGHT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rightBorderStyleStrings, wxCB_READONLY ); + m_rightBorderStyle->SetHelpText(_("The border line style.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_rightBorderStyle->SetToolTip(_("The border line style.")); itemBoxSizer23->Add(m_rightBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer23->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); @@ -312,6 +330,9 @@ void wxRichTextBordersPage::CreateControls() wxArrayString m_topBorderStyleStrings; m_topBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_TOP_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_topBorderStyleStrings, wxCB_READONLY ); + m_topBorderStyle->SetHelpText(_("The border line style.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_topBorderStyle->SetToolTip(_("The border line style.")); itemBoxSizer31->Add(m_topBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer31->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); @@ -343,6 +364,9 @@ void wxRichTextBordersPage::CreateControls() wxArrayString m_bottomBorderStyleStrings; m_bottomBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_BOTTOM_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_bottomBorderStyleStrings, wxCB_READONLY ); + m_bottomBorderStyle->SetHelpText(_("The border line style.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_bottomBorderStyle->SetToolTip(_("The border line style.")); itemBoxSizer39->Add(m_bottomBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer39->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); @@ -350,155 +374,185 @@ void wxRichTextBordersPage::CreateControls() m_bottomBorderColour = new wxRichTextColourSwatchCtrl( itemPanel5, ID_RICHTEXT_BORDER_BOTTOM_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); itemBoxSizer39->Add(m_bottomBorderColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer13->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + + m_borderSyncCtrl = new wxCheckBox( itemPanel5, ID_RICHTEXT_BORDER_SYNCHRONIZE, _("&Synchronize values"), wxDefaultPosition, wxDefaultSize, 0 ); + m_borderSyncCtrl->SetValue(false); + m_borderSyncCtrl->SetHelpText(_("Check to edit all borders simultaneously.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_borderSyncCtrl->SetToolTip(_("Check to edit all borders simultaneously.")); + itemFlexGridSizer13->Add(m_borderSyncCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemNotebook4->AddPage(itemPanel5, _("Border")); - wxPanel* itemPanel46 = new wxPanel( itemNotebook4, ID_RICHTEXTBORDERSPAGE_OUTLINE, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); - itemPanel46->SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY); - wxBoxSizer* itemBoxSizer47 = new wxBoxSizer(wxVERTICAL); - itemPanel46->SetSizer(itemBoxSizer47); + wxPanel* itemPanel48 = new wxPanel( itemNotebook4, ID_RICHTEXTBORDERSPAGE_OUTLINE, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); + itemPanel48->SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY); + wxBoxSizer* itemBoxSizer49 = new wxBoxSizer(wxVERTICAL); + itemPanel48->SetSizer(itemBoxSizer49); - wxBoxSizer* itemBoxSizer48 = new wxBoxSizer(wxVERTICAL); - itemBoxSizer47->Add(itemBoxSizer48, 0, wxGROW|wxALL, 5); - wxBoxSizer* itemBoxSizer49 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer48->Add(itemBoxSizer49, 0, wxGROW, 5); - wxStaticText* itemStaticText50 = new wxStaticText( itemPanel46, wxID_STATIC, _("Outline"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText50->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(""))); - itemBoxSizer49->Add(itemStaticText50, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxBoxSizer* itemBoxSizer50 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer49->Add(itemBoxSizer50, 0, wxGROW|wxALL, 5); + wxBoxSizer* itemBoxSizer51 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer50->Add(itemBoxSizer51, 0, wxGROW, 5); + wxStaticText* itemStaticText52 = new wxStaticText( itemPanel48, wxID_STATIC, _("Outline"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText52->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(""))); + itemBoxSizer51->Add(itemStaticText52, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticLine* itemStaticLine51 = new wxStaticLine( itemPanel46, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - itemBoxSizer49->Add(itemStaticLine51, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticLine* itemStaticLine53 = new wxStaticLine( itemPanel48, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + itemBoxSizer51->Add(itemStaticLine53, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer52 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer48->Add(itemBoxSizer52, 0, wxGROW, 5); - itemBoxSizer52->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxBoxSizer* itemBoxSizer54 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer50->Add(itemBoxSizer54, 0, wxGROW, 5); + itemBoxSizer54->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxFlexGridSizer* itemFlexGridSizer54 = new wxFlexGridSizer(0, 2, 0, 0); - itemBoxSizer52->Add(itemFlexGridSizer54, 0, wxGROW, 5); - m_leftOutlineCheckbox = new wxCheckBox( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX, _("&Left:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); + wxFlexGridSizer* itemFlexGridSizer56 = new wxFlexGridSizer(0, 2, 0, 0); + itemBoxSizer54->Add(itemFlexGridSizer56, 0, wxGROW, 5); + m_leftOutlineCheckbox = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX, _("&Left:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_leftOutlineCheckbox->SetValue(false); - itemFlexGridSizer54->Add(m_leftOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer56->Add(m_leftOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer56 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer54->Add(itemBoxSizer56, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); - m_leftOutlineWidth = new wxTextCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); - itemBoxSizer56->Add(m_leftOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + wxBoxSizer* itemBoxSizer58 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer56->Add(itemBoxSizer58, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + m_leftOutlineWidth = new wxTextCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); + itemBoxSizer58->Add(m_leftOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); wxArrayString m_leftOutlineWidthUnitsStrings; m_leftOutlineWidthUnitsStrings.Add(_("px")); m_leftOutlineWidthUnitsStrings.Add(_("cm")); m_leftOutlineWidthUnitsStrings.Add(_("pt")); - m_leftOutlineWidthUnits = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_leftOutlineWidthUnitsStrings, wxCB_READONLY ); + m_leftOutlineWidthUnits = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_leftOutlineWidthUnitsStrings, wxCB_READONLY ); m_leftOutlineWidthUnits->SetStringSelection(_("px")); m_leftOutlineWidthUnits->SetHelpText(_("Units for the left outline width.")); if (wxRichTextBordersPage::ShowToolTips()) m_leftOutlineWidthUnits->SetToolTip(_("Units for the left outline width.")); - itemBoxSizer56->Add(m_leftOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer58->Add(m_leftOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer56->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemBoxSizer58->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); wxArrayString m_leftOutlineStyleStrings; - m_leftOutlineStyle = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_leftOutlineStyleStrings, wxCB_READONLY ); - itemBoxSizer56->Add(m_leftOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_leftOutlineStyle = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_leftOutlineStyleStrings, wxCB_READONLY ); + m_leftOutlineStyle->SetHelpText(_("The border line style.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_leftOutlineStyle->SetToolTip(_("The border line style.")); + itemBoxSizer58->Add(m_leftOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer56->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemBoxSizer58->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); - m_leftOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); - itemBoxSizer56->Add(m_leftOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_leftOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); + itemBoxSizer58->Add(m_leftOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - m_rightOutlineCheckbox = new wxCheckBox( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, _("&Right:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); + m_rightOutlineCheckbox = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, _("&Right:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_rightOutlineCheckbox->SetValue(false); - itemFlexGridSizer54->Add(m_rightOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer56->Add(m_rightOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer64 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer54->Add(itemBoxSizer64, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); - m_rightOutlineWidth = new wxTextCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); - itemBoxSizer64->Add(m_rightOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + wxBoxSizer* itemBoxSizer66 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer56->Add(itemBoxSizer66, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + m_rightOutlineWidth = new wxTextCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); + itemBoxSizer66->Add(m_rightOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); wxArrayString m_rightOutlineWidthUnitsStrings; m_rightOutlineWidthUnitsStrings.Add(_("px")); m_rightOutlineWidthUnitsStrings.Add(_("cm")); m_rightOutlineWidthUnitsStrings.Add(_("pt")); - m_rightOutlineWidthUnits = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_rightOutlineWidthUnitsStrings, wxCB_READONLY ); + m_rightOutlineWidthUnits = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_rightOutlineWidthUnitsStrings, wxCB_READONLY ); m_rightOutlineWidthUnits->SetStringSelection(_("px")); m_rightOutlineWidthUnits->SetHelpText(_("Units for the right outline width.")); if (wxRichTextBordersPage::ShowToolTips()) m_rightOutlineWidthUnits->SetToolTip(_("Units for the right outline width.")); - itemBoxSizer64->Add(m_rightOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer66->Add(m_rightOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer64->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemBoxSizer66->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); wxArrayString m_rightOutlineStyleStrings; - m_rightOutlineStyle = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rightOutlineStyleStrings, wxCB_READONLY ); - itemBoxSizer64->Add(m_rightOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_rightOutlineStyle = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rightOutlineStyleStrings, wxCB_READONLY ); + m_rightOutlineStyle->SetHelpText(_("The border line style.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_rightOutlineStyle->SetToolTip(_("The border line style.")); + itemBoxSizer66->Add(m_rightOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer64->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemBoxSizer66->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); - m_rightOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); - itemBoxSizer64->Add(m_rightOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_rightOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); + itemBoxSizer66->Add(m_rightOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - m_topOutlineCheckbox = new wxCheckBox( itemPanel46, ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, _("&Top:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); + m_topOutlineCheckbox = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, _("&Top:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_topOutlineCheckbox->SetValue(false); - itemFlexGridSizer54->Add(m_topOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer56->Add(m_topOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer72 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer54->Add(itemBoxSizer72, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); - m_topOutlineWidth = new wxTextCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_TOP, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); - itemBoxSizer72->Add(m_topOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + wxBoxSizer* itemBoxSizer74 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer56->Add(itemBoxSizer74, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + m_topOutlineWidth = new wxTextCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_TOP, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); + itemBoxSizer74->Add(m_topOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); wxArrayString m_topOutlineWidthUnitsStrings; m_topOutlineWidthUnitsStrings.Add(_("px")); m_topOutlineWidthUnitsStrings.Add(_("cm")); m_topOutlineWidthUnitsStrings.Add(_("pt")); - m_topOutlineWidthUnits = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_TOP_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_topOutlineWidthUnitsStrings, wxCB_READONLY ); + m_topOutlineWidthUnits = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_TOP_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_topOutlineWidthUnitsStrings, wxCB_READONLY ); m_topOutlineWidthUnits->SetStringSelection(_("px")); m_topOutlineWidthUnits->SetHelpText(_("Units for the top outline width.")); if (wxRichTextBordersPage::ShowToolTips()) m_topOutlineWidthUnits->SetToolTip(_("Units for the top outline width.")); - itemBoxSizer72->Add(m_topOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer74->Add(m_topOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer72->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemBoxSizer74->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); wxArrayString m_topOutlineStyleStrings; - m_topOutlineStyle = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_TOP_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_topOutlineStyleStrings, wxCB_READONLY ); - itemBoxSizer72->Add(m_topOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_topOutlineStyle = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_TOP_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_topOutlineStyleStrings, wxCB_READONLY ); + m_topOutlineStyle->SetHelpText(_("The border line style.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_topOutlineStyle->SetToolTip(_("The border line style.")); + itemBoxSizer74->Add(m_topOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer72->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemBoxSizer74->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); - m_topOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_TOP_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); - itemBoxSizer72->Add(m_topOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_topOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_TOP_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); + itemBoxSizer74->Add(m_topOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - m_bottomOutlineCheckbox = new wxCheckBox( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, _("&Bottom:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); + m_bottomOutlineCheckbox = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, _("&Bottom:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_bottomOutlineCheckbox->SetValue(false); - itemFlexGridSizer54->Add(m_bottomOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexGridSizer56->Add(m_bottomOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxBoxSizer* itemBoxSizer80 = new wxBoxSizer(wxHORIZONTAL); - itemFlexGridSizer54->Add(itemBoxSizer80, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); - m_bottomOutlineWidth = new wxTextCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); - itemBoxSizer80->Add(m_bottomOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); + wxBoxSizer* itemBoxSizer82 = new wxBoxSizer(wxHORIZONTAL); + itemFlexGridSizer56->Add(itemBoxSizer82, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); + m_bottomOutlineWidth = new wxTextCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); + itemBoxSizer82->Add(m_bottomOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); wxArrayString m_bottomOutlineWidthUnitsStrings; m_bottomOutlineWidthUnitsStrings.Add(_("px")); m_bottomOutlineWidthUnitsStrings.Add(_("cm")); m_bottomOutlineWidthUnitsStrings.Add(_("pt")); - m_bottomOutlineWidthUnits = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_bottomOutlineWidthUnitsStrings, wxCB_READONLY ); + m_bottomOutlineWidthUnits = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_bottomOutlineWidthUnitsStrings, wxCB_READONLY ); m_bottomOutlineWidthUnits->SetStringSelection(_("px")); m_bottomOutlineWidthUnits->SetHelpText(_("Units for the bottom outline width.")); if (wxRichTextBordersPage::ShowToolTips()) m_bottomOutlineWidthUnits->SetToolTip(_("Units for the bottom outline width.")); - itemBoxSizer80->Add(m_bottomOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer82->Add(m_bottomOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer80->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemBoxSizer82->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); wxArrayString m_bottomOutlineStyleStrings; - m_bottomOutlineStyle = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_bottomOutlineStyleStrings, wxCB_READONLY ); - itemBoxSizer80->Add(m_bottomOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_bottomOutlineStyle = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_bottomOutlineStyleStrings, wxCB_READONLY ); + m_bottomOutlineStyle->SetHelpText(_("The border line style.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_bottomOutlineStyle->SetToolTip(_("The border line style.")); + itemBoxSizer82->Add(m_bottomOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemBoxSizer80->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); + itemBoxSizer82->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); - m_bottomOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); - itemBoxSizer80->Add(m_bottomOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + m_bottomOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); + itemBoxSizer82->Add(m_bottomOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemNotebook4->AddPage(itemPanel46, _("Outline")); + itemFlexGridSizer56->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); + + m_outlineSyncCtrl = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_SYNCHRONIZE, _("&Synchronize values"), wxDefaultPosition, wxDefaultSize, 0 ); + m_outlineSyncCtrl->SetValue(false); + m_outlineSyncCtrl->SetHelpText(_("Check to edit all borders simultaneously.")); + if (wxRichTextBordersPage::ShowToolTips()) + m_outlineSyncCtrl->SetToolTip(_("Check to edit all borders simultaneously.")); + itemFlexGridSizer56->Add(m_outlineSyncCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + + itemNotebook4->AddPage(itemPanel48, _("Outline")); itemBoxSizer3->Add(itemNotebook4, 0, wxGROW|wxALL, 5); @@ -534,14 +588,13 @@ void wxRichTextBordersPage::CreateControls() m_ignoreUpdates = false; } - /*! * Should we show tooltips? */ bool wxRichTextBordersPage::ShowToolTips() { - return true; + return wxRichTextFormattingDialog::ShowToolTips(); } // Updates the preview @@ -551,6 +604,30 @@ void wxRichTextBordersPage::OnCommand(wxCommandEvent& event) if (m_ignoreUpdates) return; + if (event.GetId() == ID_RICHTEXT_BORDER_LEFT_COLOUR && m_borderSyncCtrl->GetValue()) + { + m_rightBorderColour->SetColour(m_leftBorderColour->GetColour()); + m_rightBorderColour->Refresh(); + + m_topBorderColour->SetColour(m_leftBorderColour->GetColour()); + m_topBorderColour->Refresh(); + + m_bottomBorderColour->SetColour(m_leftBorderColour->GetColour()); + m_bottomBorderColour->Refresh(); + } + + if (event.GetId() == ID_RICHTEXT_OUTLINE_LEFT_COLOUR && m_outlineSyncCtrl->GetValue()) + { + m_rightOutlineColour->SetColour(m_leftOutlineColour->GetColour()); + m_rightOutlineColour->Refresh(); + + m_topOutlineColour->SetColour(m_leftOutlineColour->GetColour()); + m_topOutlineColour->Refresh(); + + m_bottomOutlineColour->SetColour(m_leftOutlineColour->GetColour()); + m_bottomOutlineColour->Refresh(); + } + if (m_borderPreviewCtrl) { TransferDataFromWindow(); @@ -571,6 +648,38 @@ void wxRichTextBordersPage::FillStyleComboBox(wxComboBox* styleComboBox) styleComboBox->Thaw(); } +// Updates the synchronization checkboxes to reflect the state of the attributes +void wxRichTextBordersPage::UpdateSyncControls() +{ + bool ignoreUpdates = m_ignoreUpdates; + + m_ignoreUpdates = true; + + if (GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft() == GetAttributes()->GetTextBoxAttr().GetBorder().GetRight() && + GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft() == GetAttributes()->GetTextBoxAttr().GetBorder().GetTop() && + GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft() == GetAttributes()->GetTextBoxAttr().GetBorder().GetBottom()) + { + m_borderSyncCtrl->SetValue(true); + } + else + { + m_borderSyncCtrl->SetValue(false); + } + + if (GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft() == GetAttributes()->GetTextBoxAttr().GetOutline().GetRight() && + GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft() == GetAttributes()->GetTextBoxAttr().GetOutline().GetTop() && + GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft() == GetAttributes()->GetTextBoxAttr().GetOutline().GetBottom()) + { + m_outlineSyncCtrl->SetValue(true); + } + else + { + m_outlineSyncCtrl->SetValue(false); + } + + m_ignoreUpdates = ignoreUpdates; +} + bool wxRichTextBordersPage::TransferDataToWindow() { m_ignoreUpdates = true; @@ -589,6 +698,8 @@ bool wxRichTextBordersPage::TransferDataToWindow() m_ignoreUpdates = false; + UpdateSyncControls(); + return true; } @@ -702,7 +813,6 @@ wxIcon wxRichTextBordersPage::GetIconResource( const wxString& name ) ////@end wxRichTextBordersPage icon retrieval } - /*! * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_LEFT */ @@ -712,24 +822,22 @@ void wxRichTextBordersPage::OnRichtextBorderLeftUpdate( wxUpdateUIEvent& event ) event.Enable(m_leftBorderCheckbox->Get3StateValue() == wxCHK_CHECKED); } - /*! * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT */ void wxRichTextBordersPage::OnRichtextBorderRightUpdate( wxUpdateUIEvent& event ) { - event.Enable(m_rightBorderCheckbox->Get3StateValue() == wxCHK_CHECKED); + event.Enable(m_rightBorderCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_borderSyncCtrl->GetValue()); } - /*! * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_TOP */ void wxRichTextBordersPage::OnRichtextBorderTopUpdate( wxUpdateUIEvent& event ) { - event.Enable(m_topBorderCheckbox->Get3StateValue() == wxCHK_CHECKED); + event.Enable(m_topBorderCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_borderSyncCtrl->GetValue()); } /*! @@ -738,10 +846,9 @@ void wxRichTextBordersPage::OnRichtextBorderTopUpdate( wxUpdateUIEvent& event ) void wxRichTextBordersPage::OnRichtextBorderBottomUpdate( wxUpdateUIEvent& event ) { - event.Enable(m_bottomBorderCheckbox->Get3StateValue() == wxCHK_CHECKED); + event.Enable(m_bottomBorderCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_borderSyncCtrl->GetValue()); } - /*! * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_LEFT */ @@ -751,34 +858,31 @@ void wxRichTextBordersPage::OnRichtextOutlineLeftUpdate( wxUpdateUIEvent& event event.Enable(m_leftOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED); } - /*! * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT */ void wxRichTextBordersPage::OnRichtextOutlineRightUpdate( wxUpdateUIEvent& event ) { - event.Enable(m_rightOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED); + event.Enable(m_rightOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_outlineSyncCtrl->GetValue()); } - /*! * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_TOP */ void wxRichTextBordersPage::OnRichtextOutlineTopUpdate( wxUpdateUIEvent& event ) { - event.Enable(m_topOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED); + event.Enable(m_topOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_outlineSyncCtrl->GetValue()); } - /*! * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_BOTTOM */ void wxRichTextBordersPage::OnRichtextOutlineBottomUpdate( wxUpdateUIEvent& event ) { - event.Enable(m_bottomOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED); + event.Enable(m_bottomOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_outlineSyncCtrl->GetValue()); } /*! @@ -841,6 +945,30 @@ void wxRichTextBordersPage::OnRichtextBorderCheckboxClick( wxCommandEvent& event else comboBox->SetSelection(1); + if (event.GetId() == ID_RICHTEXT_BORDER_LEFT_CHECKBOX && m_borderSyncCtrl->GetValue()) + { + m_topBorderCheckbox->Set3StateValue(checkBox->Get3StateValue()); + m_topBorderStyle->SetSelection(comboBox->GetSelection()); + + m_rightBorderCheckbox->Set3StateValue(checkBox->Get3StateValue()); + m_rightBorderStyle->SetSelection(comboBox->GetSelection()); + + m_bottomBorderCheckbox->Set3StateValue(checkBox->Get3StateValue()); + m_bottomBorderStyle->SetSelection(comboBox->GetSelection()); + } + + if (event.GetId() == ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX && m_outlineSyncCtrl->GetValue()) + { + m_topOutlineCheckbox->Set3StateValue(checkBox->Get3StateValue()); + m_topOutlineStyle->SetSelection(comboBox->GetSelection()); + + m_rightOutlineCheckbox->Set3StateValue(checkBox->Get3StateValue()); + m_rightOutlineStyle->SetSelection(comboBox->GetSelection()); + + m_bottomOutlineCheckbox->Set3StateValue(checkBox->Get3StateValue()); + m_bottomOutlineStyle->SetSelection(comboBox->GetSelection()); + } + TransferDataFromWindow(); m_borderPreviewCtrl->Refresh(); } @@ -848,6 +976,246 @@ void wxRichTextBordersPage::OnRichtextBorderCheckboxClick( wxCommandEvent& event m_ignoreUpdates = false; } +/*! + * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE + */ + +void wxRichTextBordersPage::OnRichtextBorderSynchronizeClick( wxCommandEvent& event ) +{ + if (m_ignoreUpdates) + return; + + if (event.IsChecked()) + { + TransferDataFromWindow(); + GetAttributes()->GetTextBoxAttr().GetBorder().GetTop() = GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft(); + GetAttributes()->GetTextBoxAttr().GetBorder().GetRight() = GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft(); + GetAttributes()->GetTextBoxAttr().GetBorder().GetBottom() = GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft(); + m_ignoreUpdates = true; + TransferDataToWindow(); + m_ignoreUpdates = false; + + if (m_borderPreviewCtrl) + { + TransferDataFromWindow(); + m_borderPreviewCtrl->Refresh(); + } + } +} + +/*! + * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE + */ + +void wxRichTextBordersPage::OnRichtextBorderSynchronizeUpdate( wxUpdateUIEvent& WXUNUSED(event) ) +{ +} + +/*! + * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT_CHECKBOX + */ + +void wxRichTextBordersPage::OnRichtextBorderOtherCheckboxUpdate( wxUpdateUIEvent& event ) +{ + event.Enable(!m_borderSyncCtrl->GetValue()); +} + +/*! + * wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_BORDER_LEFT + */ + +void wxRichTextBordersPage::OnRichtextBorderLeftValueTextUpdated( wxCommandEvent& event ) +{ + if (m_ignoreUpdates) + return; + + if (m_borderSyncCtrl->GetValue()) + { + wxString value = event.GetString(); + m_ignoreUpdates = true; + m_rightBorderWidth->SetValue(value); + m_topBorderWidth->SetValue(value); + m_bottomBorderWidth->SetValue(value); + m_ignoreUpdates = false; + } + + if (m_borderPreviewCtrl) + { + TransferDataFromWindow(); + m_borderPreviewCtrl->Refresh(); + } +} + +/*! + * wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_UNITS + */ + +void wxRichTextBordersPage::OnRichtextBorderLeftUnitsSelected( wxCommandEvent& WXUNUSED(event) ) +{ + if (m_ignoreUpdates) + return; + + if (m_borderSyncCtrl->GetValue()) + { + m_ignoreUpdates = true; + m_rightBorderWidthUnits->SetSelection(m_leftBorderWidthUnits->GetSelection()); + m_topBorderWidthUnits->SetSelection(m_leftBorderWidthUnits->GetSelection()); + m_bottomBorderWidthUnits->SetSelection(m_leftBorderWidthUnits->GetSelection()); + m_ignoreUpdates = false; + } + + if (m_borderPreviewCtrl) + { + TransferDataFromWindow(); + m_borderPreviewCtrl->Refresh(); + } +} + +/*! + * wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_STYLE + */ + +void wxRichTextBordersPage::OnRichtextBorderLeftStyleSelected( wxCommandEvent& WXUNUSED(event) ) +{ + if (m_ignoreUpdates) + return; + + if (m_borderSyncCtrl->GetValue()) + { + m_ignoreUpdates = true; + m_rightBorderStyle->SetSelection(m_leftBorderStyle->GetSelection()); + m_topBorderStyle->SetSelection(m_leftBorderStyle->GetSelection()); + m_bottomBorderStyle->SetSelection(m_leftBorderStyle->GetSelection()); + m_ignoreUpdates = false; + } + + if (m_borderPreviewCtrl) + { + TransferDataFromWindow(); + m_borderPreviewCtrl->Refresh(); + } +} + +/*! + * wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE + */ + +void wxRichTextBordersPage::OnRichtextOutlineSynchronizeClick( wxCommandEvent& event ) +{ + if (m_ignoreUpdates) + return; + + if (event.IsChecked()) + { + TransferDataFromWindow(); + GetAttributes()->GetTextBoxAttr().GetOutline().GetTop() = GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft(); + GetAttributes()->GetTextBoxAttr().GetOutline().GetRight() = GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft(); + GetAttributes()->GetTextBoxAttr().GetOutline().GetBottom() = GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft(); + m_ignoreUpdates = true; + TransferDataToWindow(); + m_ignoreUpdates = false; + + if (m_borderPreviewCtrl) + { + TransferDataFromWindow(); + m_borderPreviewCtrl->Refresh(); + } + } +} + +/*! + * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE + */ + +void wxRichTextBordersPage::OnRichtextOutlineSynchronizeUpdate( wxUpdateUIEvent& WXUNUSED(event) ) +{ +} + +/*! + * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX + */ + +void wxRichTextBordersPage::OnRichtextOutlineOtherCheckboxUpdate( wxUpdateUIEvent& event ) +{ + event.Enable(!m_outlineSyncCtrl->GetValue()); +} + +/*! + * wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_OUTLINE_LEFT + */ + +void wxRichTextBordersPage::OnRichtextOutlineLeftTextUpdated( wxCommandEvent& event ) +{ + if (m_ignoreUpdates) + return; + + if (m_outlineSyncCtrl->GetValue()) + { + wxString value = event.GetString(); + m_ignoreUpdates = true; + m_rightOutlineWidth->SetValue(value); + m_topOutlineWidth->SetValue(value); + m_bottomOutlineWidth->SetValue(value); + m_ignoreUpdates = false; + } + + if (m_borderPreviewCtrl) + { + TransferDataFromWindow(); + m_borderPreviewCtrl->Refresh(); + } +} + +/*! + * wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_UNITS + */ + +void wxRichTextBordersPage::OnRichtextOutlineLeftUnitsSelected( wxCommandEvent& WXUNUSED(event) ) +{ + if (m_ignoreUpdates) + return; + + if (m_outlineSyncCtrl->GetValue()) + { + m_ignoreUpdates = true; + m_rightOutlineWidthUnits->SetSelection(m_leftOutlineWidthUnits->GetSelection()); + m_topOutlineWidthUnits->SetSelection(m_leftOutlineWidthUnits->GetSelection()); + m_bottomOutlineWidthUnits->SetSelection(m_leftOutlineWidthUnits->GetSelection()); + m_ignoreUpdates = false; + } + + if (m_borderPreviewCtrl) + { + TransferDataFromWindow(); + m_borderPreviewCtrl->Refresh(); + } +} + +/*! + * wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_STYLE + */ + +void wxRichTextBordersPage::OnRichtextOutlineLeftStyleSelected( wxCommandEvent& WXUNUSED(event) ) +{ + if (m_ignoreUpdates) + return; + + if (m_outlineSyncCtrl->GetValue()) + { + m_ignoreUpdates = true; + m_rightOutlineStyle->SetSelection(m_leftOutlineStyle->GetSelection()); + m_topOutlineStyle->SetSelection(m_leftOutlineStyle->GetSelection()); + m_bottomOutlineStyle->SetSelection(m_leftOutlineStyle->GetSelection()); + m_ignoreUpdates = false; + } + + if (m_borderPreviewCtrl) + { + TransferDataFromWindow(); + m_borderPreviewCtrl->Refresh(); + } +} + BEGIN_EVENT_TABLE(wxRichTextBorderPreviewCtrl, wxWindow) EVT_PAINT(wxRichTextBorderPreviewCtrl::OnPaint) END_EVENT_TABLE() diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd index df1cf7d8fb..1645a9f0b1 100644 --- a/src/richtext/richtextdialogs.pjd +++ b/src/richtext/richtextdialogs.pjd @@ -20014,14 +20014,6 @@ "wbBoxSizerProxy" "Vertical" "" - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 0 0 0 @@ -23208,7 +23200,8 @@ 0 0 "wbTextCtrlProxy" - "wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage" + "wxEVT_COMMAND_TEXT_UPDATED|OnRichtextBorderLeftValueTextUpdated|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_BORDER_LEFT" 10804 "" @@ -23292,7 +23285,8 @@ 0 0 "wbComboBoxProxy" - "wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage" + "wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextBorderLeftUnitsSelected|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_BORDER_LEFT_UNITS" 10805 "" @@ -23384,7 +23378,8 @@ 0 0 "wbComboBoxProxy" - "wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage" + "wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextBorderLeftStyleSelected|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_BORDER_LEFT_STYLE" 10806 "" @@ -23397,7 +23392,7 @@ "m_leftBorderStyle" "" "" - "" + "The border line style." "" "" "" @@ -23550,6 +23545,7 @@ 0 "wbCheckBoxProxy" "wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextBorderOtherCheckboxUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_BORDER_RIGHT_CHECKBOX" 10808 "" @@ -23828,7 +23824,7 @@ "m_rightBorderStyle" "" "" - "" + "The border line style." "" "" "" @@ -23981,6 +23977,7 @@ 0 "wbCheckBoxProxy" "wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextBorderOtherCheckboxUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_BORDER_TOP_CHECKBOX" 10813 "" @@ -24259,7 +24256,7 @@ "m_topBorderStyle" "" "" - "" + "The border line style." "" "" "" @@ -24412,6 +24409,7 @@ 0 "wbCheckBoxProxy" "wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextBorderOtherCheckboxUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX" 10818 "" @@ -24690,7 +24688,7 @@ "m_bottomBorderStyle" "" "" - "" + "The border line style." "" "" "" @@ -24832,6 +24830,98 @@ "" + + "Spacer" + "dialog-control-document" + "" + "spacer" + 0 + 1 + 0 + 0 + "wbSpacerProxy" + 5 + 5 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + "<Any platform>" + + + "wxCheckBox: ID_RICHTEXT_BORDER_SYNCHRONIZE" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "wbCheckBoxProxy" + "wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderSynchronizeClick|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextBorderSynchronizeUpdate|NONE||wxRichTextBordersPage" + "ID_RICHTEXT_BORDER_SYNCHRONIZE" + 10845 + "" + "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" + "m_borderSyncCtrl" + "&Synchronize values" + 0 + "Check to edit all borders simultaneously." + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Right" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + "" + "" + @@ -25297,7 +25387,8 @@ 0 0 "wbTextCtrlProxy" - "wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage" + "wxEVT_COMMAND_TEXT_UPDATED|OnRichtextOutlineLeftTextUpdated|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_OUTLINE_LEFT" 10825 "" @@ -25381,7 +25472,8 @@ 0 0 "wbComboBoxProxy" - "wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage" + "wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlineLeftUnitsSelected|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_OUTLINE_LEFT_UNITS" 10826 "" @@ -25473,7 +25565,8 @@ 0 0 "wbComboBoxProxy" - "wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage" + "wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlineLeftStyleSelected|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_OUTLINE_LEFT_STYLE" 10827 "" @@ -25486,7 +25579,7 @@ "m_leftOutlineStyle" "" "" - "" + "The border line style." "" "" "" @@ -25639,6 +25732,7 @@ 0 "wbCheckBoxProxy" "wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextOutlineOtherCheckboxUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX" 10829 "" @@ -25917,7 +26011,7 @@ "m_rightOutlineStyle" "" "" - "" + "The border line style." "" "" "" @@ -26070,6 +26164,7 @@ 0 "wbCheckBoxProxy" "wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextOutlineOtherCheckboxUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_OUTLINE_TOP_CHECKBOX" 10834 "" @@ -26348,7 +26443,7 @@ "m_topOutlineStyle" "" "" - "" + "The border line style." "" "" "" @@ -26501,6 +26596,7 @@ 0 "wbCheckBoxProxy" "wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextOutlineOtherCheckboxUpdate|NONE||wxRichTextBordersPage" "ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX" 10839 "" @@ -26779,7 +26875,7 @@ "m_bottomOutlineStyle" "" "" - "" + "The border line style." "" "" "" @@ -26921,6 +27017,98 @@ "" + + "Spacer" + "dialog-control-document" + "" + "spacer" + 0 + 1 + 0 + 0 + "wbSpacerProxy" + 5 + 5 + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + "<Any platform>" + + + "wxCheckBox: ID_RICHTEXT_OUTLINE_SYNCHRONIZE" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "wbCheckBoxProxy" + "wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextOutlineSynchronizeClick|NONE||wxRichTextBordersPage" + "wxEVT_UPDATE_UI|OnRichtextOutlineSynchronizeUpdate|NONE||wxRichTextBordersPage" + "ID_RICHTEXT_OUTLINE_SYNCHRONIZE" + 10846 + "" + "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" + "m_outlineSyncCtrl" + "&Synchronize values" + 0 + "Check to edit all borders simultaneously." + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Right" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + "" + "" +