From: Vadim Zeitlin Date: Thu, 19 Aug 2010 15:41:24 +0000 (+0000) Subject: Slightly improve wx[Generic]RichMessageDialog layout. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8d5016b18bfaee2f1694e386a7dff89868a03b6d?ds=inline Slightly improve wx[Generic]RichMessageDialog layout. Keep the icon at the top instead of centering it, this is more consistent with the native behaviour under both MSW and GTK. Get rid of an unnecessary sizer in wxGenericRichMessageDialog and give the checkbox the right border to align with the rest of the dialog contents. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 9cbdca770e..ec6e7e924f 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -116,7 +116,7 @@ void wxGenericMessageDialog::DoCreateMsgdialog() if (is_pda) topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); else - icon_text->Add( icon, 0, wxCENTER ); + icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20)); } #endif // wxUSE_STATBMP diff --git a/src/generic/richmsgdlgg.cpp b/src/generic/richmsgdlgg.cpp index 06b226d4f6..c656332a68 100644 --- a/src/generic/richmsgdlgg.cpp +++ b/src/generic/richmsgdlgg.cpp @@ -53,15 +53,10 @@ void wxGenericRichMessageDialog::AddMessageDialogCheckBox(wxSizer *sizer) { if ( !m_checkBoxText.empty() ) { - wxSizer *sizerCheckBox = new wxBoxSizer( wxHORIZONTAL ); + m_checkBox = new wxCheckBox(this, wxID_ANY, m_checkBoxText); + m_checkBox->SetValue(m_checkBoxValue); - m_checkBox = new wxCheckBox( this, - wxID_ANY, - m_checkBoxText ); - m_checkBox->SetValue( m_checkBoxValue ); - sizerCheckBox->Add( m_checkBox, 0, wxBOTTOM | wxALIGN_LEFT ); - - sizer->Add( sizerCheckBox, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); + sizer->Add(m_checkBox, wxSizerFlags().Left().Border(wxLEFT|wxTOP, 10)); } }