/////////////////////////////////////////////////////////////////////////////
-// 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"
#pragma hdrstop
#endif
+#if wxUSE_CHOICEDLG
+
#ifndef WX_PRECOMP
#include <stdio.h>
#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/sizer.h"
+ #include "wx/arrstr.h"
#endif
-#if wxUSE_STATLINE
- #include "wx/statline.h"
-#endif
-
+#include "wx/statline.h"
+#include "wx/settings.h"
#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),
+// ----------------------------------------------------------------------------
+// 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 )
+ data = dialog.GetSelectionClientData();
+ else
+ data = NULL;
+
+ return data;
+}
+
+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 *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 )
- return dialog.GetSelectionClientData();
+ selections = dialog.GetSelections();
else
- return NULL;
+ selections.Empty();
+
+ return selections.GetCount();
}
-// 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 )
+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)
{
- wxString *strings = new wxString[n];
- int i;
- for ( i = 0; i < n; i++)
+ 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)
+{
+#ifdef __WXMAC__
+ // FIXME: why??
+ if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg & (~wxCANCEL) ) )
+ return false;
+#else
+ if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg) )
+ return false;
+#endif
+
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
+ // 1) text message
+ topsizer->
+ Add(CreateTextSizer(message), wxSizerFlags().Expand().TripleBorder());
+
+ // 2) list box
+ m_listbox = CreateList(n, choices, styleLbox);
+
+ if ( n > 0 )
+ m_listbox->SetSelection(0);
+
+ topsizer->
+ Add(m_listbox, wxSizerFlags().Expand().Proportion(1).TripleBorder(wxLEFT | wxRIGHT));
+
+ // 3) buttons if any
+ wxSizer *
+ buttonSizer = CreateSeparatedButtonSizer(styleDlg & ButtonSizerFlags);
+ if ( buttonSizer )
{
- strings[i] = choices[i];
+ topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
}
- wxChar *data = wxGetSingleChoiceData(message, caption, n, (const wxString *)strings, client_data, parent,
- x, y, centre, width, height);
- delete[] strings;
- return data;
+
+ SetSizer( topsizer );
+
+ topsizer->SetSizeHints( this );
+ topsizer->Fit( this );
+
+ if ( styleDlg & wxCENTRE )
+ Centre(wxBOTH);
+
+ 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);
+}
-/* 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)
+wxListBoxBase *wxAnyChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox)
{
- return -1;
+ 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 *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);
}
wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
const wxString& message,
const wxString& caption,
- const wxStringList& choices,
- wxChar **clientData,
+ const wxArrayString& 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, choices, clientData, style);
}
-bool wxSingleChoiceDialog::Create(wxWindow *parent,
- const wxString& message,
- const wxString& caption,
- const wxStringList& choices,
- char **clientData,
- long style,
- const wxPoint& pos)
+bool wxSingleChoiceDialog::Create( wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ int n,
+ const wxString *choices,
+ char **clientData,
+ long style,
+ const wxPoint& pos )
{
- wxString *strings = new wxString[choices.Number()];
- int i;
- for ( i = 0; i < choices.Number(); i++)
+ if ( !wxAnyChoiceDialog::Create(parent, message, caption,
+ n, choices,
+ style, pos) )
+ return false;
+
+ m_selection = n > 0 ? 0 : -1;
+
+ if (clientData)
{
- strings[i] = (char *)choices.Nth(i)->Data();
+ for (int i = 0; i < n; i++)
+ m_listbox->SetClientData(i, clientData[i]);
}
- bool ans = Create(parent, message, caption, choices.Number(), strings, clientData, style, pos);
- delete[] strings;
- return ans;
+
+ return true;
}
-bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
+bool wxSingleChoiceDialog::Create( wxWindow *parent,
const wxString& message,
- const wxString& WXUNUSED(caption),
- int n,
- const wxString *choices,
+ const wxString& caption,
+ const wxArrayString& choices,
char **clientData,
long style,
- const wxPoint& WXUNUSED(pos) )
+ const wxPoint& pos )
{
- m_selection = 0;
- m_clientData = NULL;
-
- // calc the message size
- // ---------------------
+ wxCArrayString chs(choices);
+ return Create( parent, message, caption, chs.GetCount(), chs.GetStrings(),
+ clientData, style, pos );
+}
- wxArrayString lines;
- wxSize sizeText = SplitTextMessage(message, &lines);
- long heightTextMax = sizeText.GetHeight(),
- widthTextMax = sizeText.GetWidth();
- size_t nLineCount = lines.Count();
- long hTotalMsg = heightTextMax*nLineCount;
+// Set the selection
+void wxSingleChoiceDialog::SetSelection(int sel)
+{
+ m_listbox->SetSelection(sel);
+ m_selection = sel;
+}
- // calc the button size
- // --------------------
+void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+{
+ DoChoice();
+}
- // 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") );
+#ifndef __SMARTPHONE__
+void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
+{
+ DoChoice();
+}
+#endif
- bool hasCancel = (style & wxCANCEL) != 0;
+#ifdef __WXWINCE__
+void wxSingleChoiceDialog::OnJoystickButtonDown(wxJoystickEvent& WXUNUSED(event))
+{
+ DoChoice();
+}
+#endif
- wxSize sizeButtons = GetStandardButtonSize(hasCancel);
+void wxSingleChoiceDialog::DoChoice()
+{
+ m_selection = m_listbox->GetSelection();
+ m_stringSelection = m_listbox->GetStringSelection();
- long wButton = sizeButtons.GetWidth(),
- hButton = sizeButtons.GetHeight();
+ if ( m_listbox->HasClientUntypedData() )
+ SetClientData(m_listbox->GetClientData(m_selection));
- long wTotalButtons = wButton;
- if ( hasCancel )
- {
- wTotalButtons *= 2; // second button
- wTotalButtons += MARGIN_BETWEEN_BUTTONS; // margin between the 2
- }
+ EndModal(wxID_OK);
+}
- // listbox and stat line
- // ---------------------
+// ----------------------------------------------------------------------------
+// wxMultiChoiceDialog
+// ----------------------------------------------------------------------------
- // 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));
+IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog)
-#if wxUSE_STATLINE
- long hStatLine = wxStaticLine::GetDefaultSize();
+bool wxMultiChoiceDialog::Create( wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ int n,
+ const wxString *choices,
+ long style,
+ const wxPoint& pos )
+{
+ long styleLbox;
+#if wxUSE_CHECKLISTBOX
+ styleLbox = wxLB_ALWAYS_SB;
+#else
+ styleLbox = wxLB_ALWAYS_SB | wxLB_EXTENDED;
#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
-#endif
- 2*LAYOUT_Y_MARGIN + // margin between listbox and buttons
- hButton + // button(s)
- LAYOUT_Y_MARGIN; // bottom margin
+ if ( !wxAnyChoiceDialog::Create(parent, message, caption,
+ n, choices,
+ style, pos,
+ styleLbox) )
+ return false;
- long wDialog = wxMax(wListbox, wxMax(wTotalButtons, widthTextMax)) +
- 4*LAYOUT_X_MARGIN; // 2 from each side
+ return true;
+}
- // create the controls
- // -------------------
+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 );
+}
- // message
- wxStaticText *text;
- int y = 2*LAYOUT_Y_MARGIN;
- for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
+void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
+{
+#if wxUSE_CHECKLISTBOX
+ wxCheckListBox* checkListBox = wxDynamicCast(m_listbox, wxCheckListBox);
+ if (checkListBox)
{
- text = new wxStaticText(this, -1, lines[nLine],
- wxPoint(2*LAYOUT_X_MARGIN, y),
- wxSize(widthTextMax, heightTextMax));
- y += heightTextMax;
+ // first clear all currently selected items
+ size_t n,
+ count = checkListBox->GetCount();
+ for ( n = 0; n < count; ++n )
+ {
+ if (checkListBox->IsChecked(n))
+ checkListBox->Check(n, false);
+ }
+
+ // now select the ones which should be selected
+ count = selections.GetCount();
+ for ( n = 0; n < count; n++ )
+ {
+ checkListBox->Check(selections[n]);
+ }
+
+ return;
}
+#endif
- 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;
+ // first clear all currently selected items
+ size_t n,
+ count = m_listbox->GetCount();
+ for ( n = 0; n < count; ++n )
+ {
+ m_listbox->Deselect(n);
+ }
- if ( clientData )
+ // now select the ones which should be selected
+ count = selections.GetCount();
+ for ( n = 0; n < count; n++ )
{
- for (int i = 0; i < n; i++)
- m_listbox->SetClientData(i, clientData[i]);
+ m_listbox->Select(selections[n]);
}
+}
- // separator line
-#if wxUSE_STATLINE
- (void) new wxStaticLine( this, -1,
- wxPoint(2*LAYOUT_X_MARGIN, y + LAYOUT_Y_MARGIN),
- wxSize(wDialog - 4*LAYOUT_X_MARGIN, hStatLine) );
+bool wxMultiChoiceDialog::TransferDataFromWindow()
+{
+ m_selections.Empty();
- y += LAYOUT_Y_MARGIN + hStatLine;
+#if wxUSE_CHECKLISTBOX
+ wxCheckListBox* checkListBox = wxDynamicCast(m_listbox, wxCheckListBox);
+ if (checkListBox)
+ {
+ size_t count = checkListBox->GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ if ( checkListBox->IsChecked(n) )
+ m_selections.Add(n);
+ }
+ return true;
+ }
#endif
- // buttons
-
- y += 2*LAYOUT_X_MARGIN;
-
- CreateStandardButtons(wDialog, y, wButton, hButton, hasCancel);
-
- SetClientSize( wDialog, hDialog );
-
- Centre( wxBOTH );
+ size_t count = m_listbox->GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ if ( m_listbox->IsSelected(n) )
+ m_selections.Add(n);
+ }
- return TRUE;
+ return true;
}
-// Set the selection
-void wxSingleChoiceDialog::SetSelection(int sel)
-{
- m_listbox->SetSelection(sel);
- m_selection = sel;
-}
+#if wxUSE_CHECKLISTBOX
-void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+wxListBoxBase *wxMultiChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox)
{
- m_selection = m_listbox->GetSelection();
- m_stringSelection = m_listbox->GetStringSelection();
- m_clientData = m_listbox->GetClientData(m_selection);
-
- EndModal(wxID_OK);
+ return new wxCheckListBox( this, wxID_LISTBOX,
+ wxDefaultPosition, wxDefaultSize,
+ n, choices,
+ styleLbox );
}
-void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
-{
- m_selection = m_listbox->GetSelection();
- m_stringSelection = m_listbox->GetStringSelection();
- m_clientData = m_listbox->GetClientData(m_selection);
-
- EndModal(wxID_OK);
-}
+#endif // wxUSE_CHECKLISTBOX
+#endif // wxUSE_CHOICEDLG
projects / wxWidgets.git / blobdiff