From: Robin Dunn Date: Thu, 8 Nov 2001 18:47:53 +0000 (+0000) Subject: Fixed wxSingleChoiceDialog to match the docs wrt the style flag X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ea6601756ac57e6f0ac541738b4f25686a5c253f Fixed wxSingleChoiceDialog to match the docs wrt the style flag git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index a23450cfe4..50e29af910 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -86,7 +86,7 @@ int ConvertWXArrayToC(const wxArrayString& aChoices, wxString **choices) for ( int i = 0; i < n; i++ ) { - (*choices)[i] = aChoices[i]; + (*choices)[i] = aChoices[i]; } return n; @@ -317,7 +317,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent, const wxString& message, const wxString& caption, int n, const wxString *choices, - long WXUNUSED(styleDlg), // FIXME: why unused? + long styleDlg, const wxPoint& pos, long styleLbox) { @@ -346,7 +346,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent, #endif // 4) buttons - topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 ); + topsizer->Add( CreateButtonSizer( styleDlg & (wxOK|wxCANCEL) ), 0, wxCENTRE | wxALL, 10 ); SetAutoLayout( TRUE ); SetSizer( topsizer );