Fix wchar_t with int comparisons for Apple gcc.

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

diff --git a/src/generic/richmsgdlgg.cpp b/src/generic/richmsgdlgg.cpp
index 9f2efd9e51c24e2a69dbb6ce0b4abe18a652702a..c656332a6817057d410e725b24757d9ee091fa43 100644 (file)
--- a/src/generic/richmsgdlgg.cpp
+++ b/src/generic/richmsgdlgg.cpp
@@ -18,6 +18,7 @@
 #if wxUSE_RICHMSGDLG
 
 #ifndef WX_PRECOMP
+    #include "wx/checkbox.h"
     #include "wx/stattext.h"
     #include "wx/sizer.h"
 #endif
@@ -52,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));
     }
 }
 
@@ -84,4 +80,11 @@ void wxGenericRichMessageDialog::AddMessageDialogDetails(wxSizer *sizer)
     }
 }
 
+bool wxGenericRichMessageDialog::IsCheckBoxChecked() const
+{
+    // 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();
+}
+
 #endif // wxUSE_RICHMSGDLG