X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6fe7685d0cab06a5a7bc3d43e6845b2146db1af0..f46a01651ac91690b47f9606ae53530fbf73829f:/src/generic/choicdgg.cpp diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index d037f6255d..3a97b383fc 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -188,7 +188,7 @@ void *wxGetSingleChoiceData( const wxString& message, return res; } -size_t wxGetMultipleChoices(wxArrayInt& selections, +int wxGetSelectedChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, int n, const wxString *choices, @@ -203,15 +203,19 @@ size_t wxGetMultipleChoices(wxArrayInt& selections, // deselects the first item which is selected by default dialog.SetSelections(selections); - if ( dialog.ShowModal() == wxID_OK ) - selections = dialog.GetSelections(); - else - selections.Empty(); + if ( dialog.ShowModal() != wxID_OK ) + { + // NB: intentionally do not clear the selections array here, the caller + // might want to preserve its original contents if the dialog was + // cancelled + return -1; + } + selections = dialog.GetSelections(); return selections.GetCount(); } -size_t wxGetMultipleChoices(wxArrayInt& selections, +int wxGetSelectedChoices(wxArrayInt& selections, const wxString& message, const wxString& caption, const wxArrayString& aChoices, @@ -222,7 +226,7 @@ size_t wxGetMultipleChoices(wxArrayInt& selections, { wxString *choices; int n = ConvertWXArrayToC(aChoices, &choices); - size_t res = wxGetMultipleChoices(selections, message, caption, + int res = wxGetSelectedChoices(selections, message, caption, n, choices, parent, x, y, centre, width, height); delete [] choices; @@ -230,6 +234,50 @@ size_t wxGetMultipleChoices(wxArrayInt& selections, return res; } +#if WXWIN_COMPATIBILITY_2_8 +size_t wxGetMultipleChoices(wxArrayInt& selections, + const wxString& message, + const wxString& caption, + int n, const wxString *choices, + wxWindow *parent, + int x, int y, + bool centre, + int width, int height) +{ + int rc = wxGetSelectedChoices(selections, message, caption, + n, choices, + parent, x, y, centre, width, height); + if ( rc == -1 ) + { + selections.clear(); + return 0; + } + + return rc; +} + +size_t wxGetMultipleChoices(wxArrayInt& selections, + const wxString& message, + const wxString& caption, + const wxArrayString& aChoices, + wxWindow *parent, + int x, int y, + bool centre, + int width, int height) +{ + int rc = wxGetSelectedChoices(selections, message, caption, + aChoices, + parent, x, y, centre, width, height); + if ( rc == -1 ) + { + selections.clear(); + return 0; + } + + return rc; +} +#endif // WXWIN_COMPATIBILITY_2_8 + // ---------------------------------------------------------------------------- // wxAnyChoiceDialog // ---------------------------------------------------------------------------- @@ -242,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 ); @@ -268,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()); @@ -302,11 +348,8 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent, wxListBoxBase *wxAnyChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox) { - wxSize size = wxDefaultSize; - if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) - size = wxSize(300, 200); return new wxListBox( this, wxID_LISTBOX, - wxDefaultPosition, size, + wxDefaultPosition, wxDefaultSize, n, choices, styleLbox ); } @@ -541,12 +584,8 @@ bool wxMultiChoiceDialog::TransferDataFromWindow() wxListBoxBase *wxMultiChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox) { - wxSize size = wxDefaultSize; - if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA) - size = wxSize(300, 200); - return new wxCheckListBox( this, wxID_LISTBOX, - wxDefaultPosition, size, + wxDefaultPosition, wxDefaultSize, n, choices, styleLbox ); }