X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abe2606b703f615dbe96d2d7a54345c0b27b9843..c1d8296a78d1f630952fc5395e4072c8a654b8ef:/src/generic/choicdgg.cpp diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index 25483ca765..7c6766967f 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -1,17 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choicdgg.cpp +// Name: src/generic/choicdgg.cpp // Purpose: Choice dialogs // Author: Julian Smart -// Modified by: +// Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "choicdgg.h" -#endif +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,166 +24,339 @@ #pragma hdrstop #endif +#if wxUSE_CHOICEDLG + #ifndef WX_PRECOMP #include #include "wx/utils.h" #include "wx/dialog.h" #include "wx/button.h" #include "wx/listbox.h" + #include "wx/checklst.h" #include "wx/stattext.h" #include "wx/intl.h" - #include "wx/dcclient.h" - #include "wx/settings.h" + #include "wx/sizer.h" + #include "wx/arrstr.h" #endif #if wxUSE_STATLINE - #include "wx/statline.h" + #include "wx/statline.h" #endif #include "wx/generic/choicdgg.h" +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + #define wxID_LISTBOX 3000 -wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n, - const wxString *choices, wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), +// --------------------------------------------------------------------------- +// macros +// --------------------------------------------------------------------------- + +/* Macro for avoiding #ifdefs when value have to be different depending on size of + device we display on - take it from something like wxDesktopPolicy in the future + */ + +#if defined(__SMARTPHONE__) + #define wxLARGESMALL(large,small) small +#else + #define wxLARGESMALL(large,small) large +#endif + +// ---------------------------------------------------------------------------- +// private functions +// ---------------------------------------------------------------------------- + +// convert wxArrayString into a wxString[] which must be delete[]d by caller +static int ConvertWXArrayToC(const wxArrayString& aChoices, wxString **choices); + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// helpers +// ---------------------------------------------------------------------------- + +int ConvertWXArrayToC(const wxArrayString& aChoices, wxString **choices) +{ + int n = aChoices.GetCount(); + *choices = new wxString[n]; + + for ( int i = 0; i < n; i++ ) + { + (*choices)[i] = aChoices[i]; + } + + return n; +} + +// ---------------------------------------------------------------------------- +// wrapper functions +// ---------------------------------------------------------------------------- + +wxString wxGetSingleChoice( const wxString& message, + const wxString& caption, + int n, const wxString *choices, + wxWindow *parent, + int WXUNUSED(x), int WXUNUSED(y), + bool WXUNUSED(centre), int WXUNUSED(width), int WXUNUSED(height) ) { wxSingleChoiceDialog dialog(parent, message, caption, n, choices); + wxString choice; if ( dialog.ShowModal() == wxID_OK ) - return dialog.GetStringSelection(); - else - return _T(""); + choice = dialog.GetStringSelection(); + + return choice; } -// Overloaded for backward compatibility -wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n, - char *choices[], wxWindow *parent, - int x, int y, bool centre, - int width, int height ) +wxString wxGetSingleChoice( const wxString& message, + const wxString& caption, + const wxArrayString& aChoices, + wxWindow *parent, + int x, int y, + bool centre, + int width, int height) { - wxString *strings = new wxString[n]; - int i; - for ( i = 0; i < n; i++) - { - strings[i] = choices[i]; - } - wxString ans(wxGetSingleChoice(message, caption, n, (const wxString *)strings, parent, - x, y, centre, width, height)); - delete[] strings; - return ans; + wxString *choices; + int n = ConvertWXArrayToC(aChoices, &choices); + wxString res = wxGetSingleChoice(message, caption, n, choices, parent, + x, y, centre, width, height); + delete [] choices; + + return res; } -int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n, - const wxString *choices, wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height) ) +int wxGetSingleChoiceIndex( const wxString& message, + const wxString& caption, + int n, const wxString *choices, + wxWindow *parent, + int WXUNUSED(x), int WXUNUSED(y), + bool WXUNUSED(centre), + int WXUNUSED(width), int WXUNUSED(height) ) { wxSingleChoiceDialog dialog(parent, message, caption, n, choices); + int choice; if ( dialog.ShowModal() == wxID_OK ) - return dialog.GetSelection(); + choice = dialog.GetSelection(); else - return -1; + choice = -1; + + return choice; } -// Overloaded for backward compatibility -int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n, - wxChar *choices[], wxWindow *parent, - int x, int y, bool centre, - int width, int height ) +int wxGetSingleChoiceIndex( const wxString& message, + const wxString& caption, + const wxArrayString& aChoices, + wxWindow *parent, + int x, int y, + bool centre, + int width, int height) { - wxString *strings = new wxString[n]; - for ( int i = 0; i < n; i++) - strings[i] = choices[i]; - int ans = wxGetSingleChoiceIndex(message, caption, n, (const wxString *)strings, parent, - x, y, centre, width, height); - delete[] strings; - return ans; + wxString *choices; + int n = ConvertWXArrayToC(aChoices, &choices); + int res = wxGetSingleChoiceIndex(message, caption, n, choices, parent, + x, y, centre, width, height); + delete [] choices; + + return res; } -wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, - const wxString *choices, wxChar **client_data, wxWindow *parent, - int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre), - int WXUNUSED(width), int WXUNUSED(height) ) +void *wxGetSingleChoiceData( const wxString& message, + const wxString& caption, + int n, const wxString *choices, + void **client_data, + wxWindow *parent, + int WXUNUSED(x), int WXUNUSED(y), + bool WXUNUSED(centre), + int WXUNUSED(width), int WXUNUSED(height) ) { - wxSingleChoiceDialog dialog(parent, message, caption, n, choices, client_data); + wxSingleChoiceDialog dialog(parent, message, caption, n, choices, + (char **)client_data); + void *data; if ( dialog.ShowModal() == wxID_OK ) - return dialog.GetSelectionClientData(); + data = dialog.GetSelectionClientData(); else - return NULL; + data = NULL; + + return data; } -// Overloaded for backward compatibility -wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, - wxChar *choices[], wxChar **client_data, wxWindow *parent, - int x, int y, bool centre, - int width, int height ) +void *wxGetSingleChoiceData( const wxString& message, + const wxString& caption, + const wxArrayString& aChoices, + void **client_data, + wxWindow *parent, + int x, int y, + bool centre, + int width, int height) { - wxString *strings = new wxString[n]; - int i; - for ( i = 0; i < n; i++) - { - strings[i] = choices[i]; - } - wxChar *data = wxGetSingleChoiceData(message, caption, n, (const wxString *)strings, client_data, parent, - x, y, centre, width, height); - delete[] strings; - return data; + wxString *choices; + int n = ConvertWXArrayToC(aChoices, &choices); + void *res = wxGetSingleChoiceData(message, caption, n, choices, + client_data, parent, + x, y, centre, width, height); + delete [] choices; + + return res; } +size_t wxGetMultipleChoices(wxArrayInt& selections, + const wxString& message, + const wxString& caption, + int n, const wxString *choices, + wxWindow *parent, + int WXUNUSED(x), int WXUNUSED(y), + bool WXUNUSED(centre), + int WXUNUSED(width), int WXUNUSED(height)) +{ + wxMultiChoiceDialog dialog(parent, message, caption, n, choices); + + // call this even if selections array is empty and this then (correctly) + // deselects the first item which is selected by default + dialog.SetSelections(selections); + + if ( dialog.ShowModal() == wxID_OK ) + selections = dialog.GetSelections(); + else + selections.Empty(); -/* Multiple choice dialog contributed by Robert Cowell - * - -The new data passed are in the "int nsel" and "int * selection" - -The idea is to make a multiple selection from list of strings. -The returned value is the total number selected. initialily there -are nsel selected, with indices stored in -selection[0],...,selection[nsel-1] which appear highlighted to -begin with. On exit with value i -selection[0..i-1] contains the indices of the selected items. -(Some prior selectecions might be deselected.) -Thus selection must be as big as choices, in case all items are -selected. - -*/ -/* -int wxGetMultipleChoice(const wxString& message, const wxString& caption, - int n, const wxString *choices, - int nsel, int * selection, - wxWindow *parent , int x , int y, bool centre, - int width, int height) + return selections.GetCount(); +} + +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) { - return -1; + wxString *choices; + int n = ConvertWXArrayToC(aChoices, &choices); + size_t res = wxGetMultipleChoices(selections, message, caption, + n, choices, parent, + x, y, centre, width, height); + delete [] choices; + + return res; } -*/ +// ---------------------------------------------------------------------------- +// wxAnyChoiceDialog +// ---------------------------------------------------------------------------- + +bool wxAnyChoiceDialog::Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + int n, const wxString *choices, + long styleDlg, + const wxPoint& pos, + long styleLbox) +{ +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + styleDlg &= ~wxBORDER_MASK; + styleDlg &= ~wxRESIZE_BORDER; + styleDlg &= ~wxCAPTION; +#endif + + if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg) ) + return false; + + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); + + // 1) text message + topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) ); + + // 2) list box + m_listbox = CreateList(n,choices,styleLbox); + + if ( n > 0 ) + m_listbox->SetSelection(0); + + topsizer->Add( m_listbox, 1, wxEXPAND|wxLEFT|wxRIGHT, wxLARGESMALL(15,0) ); + + // smart phones does not support or do not waste space for wxButtons +#ifdef __SMARTPHONE__ + + SetRightMenu(wxID_CANCEL, _("Cancel")); + +#else // __SMARTPHONE__/!__SMARTPHONE__ + +#if wxUSE_STATLINE + // 3) static line + topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); +#endif + + // 4) buttons + topsizer->Add( CreateButtonSizer( styleDlg & (wxOK|wxCANCEL) ), 0, wxEXPAND | wxALL, 10 ); + +#endif // !__SMARTPHONE__ + + SetSizer( topsizer ); + +#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) + topsizer->SetSizeHints( this ); + topsizer->Fit( this ); + + if ( styleDlg & wxCENTRE ) + Centre(wxBOTH); +#endif + + m_listbox->SetFocus(); + + return true; +} + +bool wxAnyChoiceDialog::Create(wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + long styleDlg, + const wxPoint& pos, + long styleLbox) +{ + wxCArrayString chs(choices); + return Create(parent, message, caption, chs.GetCount(), chs.GetStrings(), + styleDlg, pos, styleLbox); +} + +wxListBoxBase *wxAnyChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox) +{ + return new wxListBox( this, wxID_LISTBOX, + wxDefaultPosition, wxDefaultSize, + n, choices, + styleLbox ); +} + +// ---------------------------------------------------------------------------- // wxSingleChoiceDialog +// ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog) EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK) +#ifndef __SMARTPHONE__ EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick) -END_EVENT_TABLE() - -IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog) #endif +#ifdef __WXWINCE__ + EVT_JOY_BUTTON_DOWN(wxSingleChoiceDialog::OnJoystickButtonDown) +#endif +END_EVENT_TABLE() -#define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \ - wxDIALOG_MODAL | \ - wxTAB_TRAVERSAL) +IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog) wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, - int n, + int n, const wxString *choices, char **clientData, long style, - const wxPoint& pos) - : wxDialog(parent, -1, caption, pos, wxDefaultSize, - wxCHOICEDLG_DIALOG_STYLE) + const wxPoint& WXUNUSED(pos)) { Create(parent, message, caption, n, choices, clientData, style); } @@ -187,260 +364,165 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, - const wxStringList& choices, - wxChar **clientData, - long style, - const wxPoint& pos) - : wxDialog(parent, -1, caption, pos, wxDefaultSize, - wxCHOICEDLG_DIALOG_STYLE) + const wxArrayString& choices, + char **clientData, + long style, + const wxPoint& WXUNUSED(pos)) { Create(parent, message, caption, choices, clientData, style); } -bool wxSingleChoiceDialog::Create(wxWindow *parent, - const wxString& message, - const wxString& caption, - const wxStringList& choices, - char **clientData, - long style, - const wxPoint& pos) -{ - wxString *strings = new wxString[choices.Number()]; - int i; - for ( i = 0; i < choices.Number(); i++) - { - strings[i] = (char *)choices.Nth(i)->Data(); - } - bool ans = Create(parent, message, caption, choices.Number(), strings, clientData, style, pos); - delete[] strings; - return ans; -} - -bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), - const wxString& message, - const wxString& WXUNUSED(caption), - int n, +bool wxSingleChoiceDialog::Create( wxWindow *parent, + const wxString& message, + const wxString& caption, + int n, const wxString *choices, char **clientData, long style, - const wxPoint& WXUNUSED(pos) ) + const wxPoint& pos ) { - m_dialogStyle = style; - m_selection = 0; - m_clientData = NULL; - - // dialog layout constants - static const int LAYOUT_X_MARGIN = 5; - static const int LAYOUT_Y_MARGIN = 5; - static const int MARGIN_BETWEEN_BUTTONS = 3*LAYOUT_X_MARGIN; - - // calc the message size - // --------------------- - - // TODO this should be factored out to a common function (also used in - // msgdlgg.cpp) - wxClientDC dc(this); - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); - - wxArrayString lines; - wxString curLine; - long height, width, heightTextMax = 0, widthTextMax = 0; - for ( const char *pc = message; ; pc++ ) { - if ( *pc == '\n' || *pc == '\0' ) { - dc.GetTextExtent(curLine, &width, &height); - if ( width > widthTextMax ) - widthTextMax = width; - if ( height > heightTextMax ) - heightTextMax = height; - - lines.Add(curLine); - - if ( *pc == '\n' ) { - curLine.Empty(); - } - else { - // the end of string - break; - } - } - else { - curLine += *pc; - } - } - - size_t nLineCount = lines.Count(); - long hTotalMsg = heightTextMax*nLineCount; - - // calc the button size - // -------------------- + if ( !wxAnyChoiceDialog::Create(parent, message, caption, + n, choices, + style, pos) ) + return false; - bool hasCancel = FALSE; + m_selection = n > 0 ? 0 : -1; - // always create the OK button - the code below supposes we do have buttons - // and besides the user should have some way to close this dialog - wxASSERT_MSG( style & wxOK, _T("this dialog should have OK button") ); - - wxString labelOk(_("OK")); - long wButton = 0; - dc.GetTextExtent(labelOk, &width, NULL); - if ( width > wButton ) - wButton = width; - - wxString labelCancel; - if ( style & wxCANCEL ) + if (clientData) { - labelCancel = _("Cancel"); - dc.GetTextExtent(labelCancel, &width, NULL); - if ( width > wButton ) - wButton = width; - - hasCancel = TRUE; + for (int i = 0; i < n; i++) + m_listbox->SetClientData(i, clientData[i]); } - if ( wButton < 75 ) - wButton = 75; - else - wButton += 10; + return true; +} - long hButton = wButton*23/75; - long wTotalButtons = wButton; - if ( hasCancel ) - { - wTotalButtons *= 2; // second button - wTotalButtons += MARGIN_BETWEEN_BUTTONS; // margin between the 2 - } +bool wxSingleChoiceDialog::Create( wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + char **clientData, + long style, + const wxPoint& pos ) +{ + wxCArrayString chs(choices); + return Create( parent, message, caption, chs.GetCount(), chs.GetStrings(), + clientData, style, pos ); +} - // listbox and stat line - // --------------------- +// Set the selection +void wxSingleChoiceDialog::SetSelection(int sel) +{ + m_listbox->SetSelection(sel); + m_selection = sel; +} - // make the listbox at least as tall as the message - otherwise it looks - // ugly (the lower limit of 300 for the width is arbitrary OTOH) - // - // NB: we write "n + 2" because the horiz. scrollbar also takes some place - long hListbox = wxMax((n + 2) * heightTextMax, hTotalMsg), - wListbox = wxMax(300, wxMax(wTotalButtons, widthTextMax)); +void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event)) +{ + DoChoice(); +} -#if wxUSE_STATLINE - // arbitrary... - long hStatLine = 5; +#ifndef __SMARTPHONE__ +void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event)) +{ + DoChoice(); +} #endif - // now the complete dialog size - // ---------------------------- - - long hDialog = 2*LAYOUT_Y_MARGIN + // top margin - hTotalMsg + // message - 2*LAYOUT_Y_MARGIN + // margin between text and listbox - hListbox + // listbox -#if wxUSE_STATLINE - LAYOUT_Y_MARGIN + // margin - hStatLine + // separator line +#ifdef __WXWINCE__ +void wxSingleChoiceDialog::OnJoystickButtonDown(wxJoystickEvent& WXUNUSED(event)) +{ + DoChoice(); +} #endif - 2*LAYOUT_Y_MARGIN + // margin between listbox and buttons - hButton + // button(s) - LAYOUT_Y_MARGIN; // bottom margin - - long wDialog = wxMax(wListbox, wxMax(wTotalButtons, widthTextMax)) + - 4*LAYOUT_X_MARGIN; // 2 from each side - // create the controls - // ------------------- - - // message - wxStaticText *text; - int y = 2*LAYOUT_Y_MARGIN; - for ( size_t nLine = 0; nLine < nLineCount; nLine++ ) - { - text = new wxStaticText(this, -1, lines[nLine], - wxPoint(2*LAYOUT_X_MARGIN, y), - wxSize(widthTextMax, heightTextMax)); - y += heightTextMax; - } - - y += 2*LAYOUT_X_MARGIN; - - // listbox - m_listbox = new wxListBox( this, wxID_LISTBOX, - wxPoint(2*LAYOUT_X_MARGIN, y), - wxSize(wListbox, hListbox), - n, choices, - wxLB_HSCROLL); - y += hListbox; +void wxSingleChoiceDialog::DoChoice() +{ + m_selection = m_listbox->GetSelection(); + m_stringSelection = m_listbox->GetStringSelection(); - if ( clientData ) - { - for (int i = 0; i < n; i++) - m_listbox->SetClientData(i, clientData[i]); - } + if ( m_listbox->HasClientUntypedData() ) + SetClientData(m_listbox->GetClientData(m_selection)); - // separator line -#if wxUSE_STATLINE - (void) new wxStaticLine( this, -1, - wxPoint(0, y + LAYOUT_Y_MARGIN), - wxSize(wDialog, hStatLine) ); + EndModal(wxID_OK); +} - y += LAYOUT_Y_MARGIN + hStatLine; -#endif - - // buttons +// ---------------------------------------------------------------------------- +// wxMultiChoiceDialog +// ---------------------------------------------------------------------------- - y += 2*LAYOUT_X_MARGIN; +IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog) - // NB: create [Ok] first to get the right tab order +bool wxMultiChoiceDialog::Create( wxWindow *parent, + const wxString& message, + const wxString& caption, + int n, + const wxString *choices, + long style, + const wxPoint& pos ) +{ + if ( !wxAnyChoiceDialog::Create(parent, message, caption, + n, choices, + style, pos, + wxLB_ALWAYS_SB | wxLB_EXTENDED) ) + return false; - wxButton *ok = (wxButton *) NULL; - wxButton *cancel = (wxButton *) NULL; - - long x = wDialog / 2; - if ( hasCancel ) - x -= MARGIN_BETWEEN_BUTTONS / 2 + wButton; - else - x -= wButton / 2; + return true; +} - ok = new wxButton( this, wxID_OK, labelOk, - wxPoint(x, y), - wxSize(wButton, hButton) ); +bool wxMultiChoiceDialog::Create( wxWindow *parent, + const wxString& message, + const wxString& caption, + const wxArrayString& choices, + long style, + const wxPoint& pos ) +{ + wxCArrayString chs(choices); + return Create( parent, message, caption, chs.GetCount(), + chs.GetStrings(), style, pos ); +} - if ( hasCancel ) +void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections) +{ + // first clear all currently selected items + size_t n, + count = m_listbox->GetCount(); + for ( n = 0; n < count; ++n ) { - x += MARGIN_BETWEEN_BUTTONS + wButton; - cancel = new wxButton( this, wxID_CANCEL, labelCancel, - wxPoint(x, y), - wxSize(wButton, hButton) ); + m_listbox->Deselect(n); } - ok->SetDefault(); - ok->SetFocus(); - - SetClientSize( wDialog, hDialog ); - - Centre( wxBOTH ); - - return TRUE; -} - -// Set the selection -void wxSingleChoiceDialog::SetSelection(int sel) -{ - m_listbox->SetSelection(sel); - m_selection = sel; + // now select the ones which should be selected + count = selections.GetCount(); + for ( n = 0; n < count; n++ ) + { + m_listbox->Select(selections[n]); + } } -void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event)) +bool wxMultiChoiceDialog::TransferDataFromWindow() { - m_selection = m_listbox->GetSelection(); - m_stringSelection = m_listbox->GetStringSelection(); - m_clientData = m_listbox->GetClientData(m_selection); + m_selections.Empty(); + size_t count = m_listbox->GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + if ( m_listbox->IsSelected(n) ) + m_selections.Add(n); + } - EndModal(wxID_OK); + return true; } -void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event)) -{ - m_selection = m_listbox->GetSelection(); - m_stringSelection = m_listbox->GetStringSelection(); - m_clientData = m_listbox->GetClientData(m_selection); +#if wxUSE_CHECKLISTBOX - EndModal(wxID_OK); +wxListBoxBase *wxMultiChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox) +{ + return new wxCheckListBox( this, wxID_LISTBOX, + wxDefaultPosition, wxDefaultSize, + n, choices, + styleLbox ); } +#endif // wxUSE_CHECKLISTBOX + +#endif // wxUSE_CHOICEDLG