Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / generic / richmsgdlgg.cpp

diff --git a/src/generic/richmsgdlgg.cpp b/src/generic/richmsgdlgg.cpp
index 06b226d4f6c0fd1a41599b4efce140ca8d707a8b..97882a2579da1404532afcd6d378daed831a55ce 100644 (file)
--- a/src/generic/richmsgdlgg.cpp
+++ b/src/generic/richmsgdlgg.cpp
@@ -53,15 +53,10 @@ void wxGenericRichMessageDialog::AddMessageDialogCheckBox(wxSizer *sizer)
 {
     if ( !m_checkBoxText.empty() )
     {
 {
     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));

     }
 }
 
     }
 }
 


@@ -89,7 +84,7 @@ bool wxGenericRichMessageDialog::IsCheckBoxChecked() const
 {
     // This function can be called before the dialog is shown and hence before
     // the check box is created.
 {
     // This function can be called before the dialog is shown and hence before
     // the check box is created.

-    return m_checkBox? m_checkBoxValue : m_checkBox->IsChecked();
+    return m_checkBox ? m_checkBox->IsChecked() : m_checkBoxValue;

 }
 
 #endif // wxUSE_RICHMSGDLG
 }
 
 #endif // wxUSE_RICHMSGDLG