Never overflow the output buffer in wxBase64Decode().

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index fb4eb2677da610b2d863848a5829f7c5aa74b1d7..3a97b383fc11aa813a55ff13df6a051b39f29b69 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -290,14 +290,12 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
                                const wxPoint& pos,
                                long styleLbox)
 {
-#ifdef __WXMAC__
-    // FIXME: why??
-    if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg & (~wxCANCEL) ) )
-        return false;
-#else
+    // extract the buttons styles from the dialog one and remove them from it
+    const long styleBtns = styleDlg & (wxOK | wxCANCEL);
+    styleDlg &= ~styleBtns;
+
     if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg) )
         return false;
-#endif
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
@@ -316,7 +314,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 
     // 3) buttons if any
     wxSizer *
-        buttonSizer = CreateSeparatedButtonSizer(styleDlg & ButtonSizerFlags);
+        buttonSizer = CreateSeparatedButtonSizer(styleBtns);
     if ( buttonSizer )
     {
         topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());