#endif
#include "wx/statline.h"
+#include "wx/settings.h"
#include "wx/generic/choicdgg.h"
// ----------------------------------------------------------------------------
wxWindow *parent,
int WXUNUSED(x), int WXUNUSED(y),
bool WXUNUSED(centre),
- int WXUNUSED(width), int WXUNUSED(height) )
+ int WXUNUSED(width), int WXUNUSED(height),
+ int initialSelection)
{
wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
+
+ dialog.SetSelection(initialSelection);
+
wxString choice;
if ( dialog.ShowModal() == wxID_OK )
choice = dialog.GetStringSelection();
wxWindow *parent,
int x, int y,
bool centre,
- int width, int height)
+ int width, int height,
+ int initialSelection)
{
wxString *choices;
int n = ConvertWXArrayToC(aChoices, &choices);
wxString res = wxGetSingleChoice(message, caption, n, choices, parent,
- x, y, centre, width, height);
+ x, y, centre, width, height,
+ initialSelection);
delete [] choices;
return res;
}
+wxString wxGetSingleChoice( const wxString& message,
+ const wxString& caption,
+ const wxArrayString& choices,
+ int initialSelection,
+ wxWindow *parent)
+{
+ return wxGetSingleChoice(message, caption, choices, parent,
+ wxDefaultCoord, wxDefaultCoord,
+ true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
+ initialSelection);
+}
+
+wxString wxGetSingleChoice( const wxString& message,
+ const wxString& caption,
+ int n, const wxString *choices,
+ int initialSelection,
+ wxWindow *parent)
+{
+ return wxGetSingleChoice(message, caption, n, choices, parent,
+ wxDefaultCoord, wxDefaultCoord,
+ true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
+ initialSelection);
+}
+
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 WXUNUSED(width), int WXUNUSED(height),
+ int initialSelection)
{
wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
+
+ dialog.SetSelection(initialSelection);
+
int choice;
if ( dialog.ShowModal() == wxID_OK )
choice = dialog.GetSelection();
wxWindow *parent,
int x, int y,
bool centre,
- int width, int height)
+ int width, int height,
+ int initialSelection)
{
wxString *choices;
int n = ConvertWXArrayToC(aChoices, &choices);
int res = wxGetSingleChoiceIndex(message, caption, n, choices, parent,
- x, y, centre, width, height);
+ x, y, centre, width, height,
+ initialSelection);
delete [] choices;
return res;
}
+int wxGetSingleChoiceIndex( const wxString& message,
+ const wxString& caption,
+ const wxArrayString& choices,
+ int initialSelection,
+ wxWindow *parent)
+{
+ return wxGetSingleChoiceIndex(message, caption, choices, parent,
+ wxDefaultCoord, wxDefaultCoord,
+ true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
+ initialSelection);
+}
+
+
+int wxGetSingleChoiceIndex( const wxString& message,
+ const wxString& caption,
+ int n, const wxString *choices,
+ int initialSelection,
+ wxWindow *parent)
+{
+ return wxGetSingleChoiceIndex(message, caption, n, choices, parent,
+ wxDefaultCoord, wxDefaultCoord,
+ true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
+ initialSelection);
+}
+
+
void *wxGetSingleChoiceData( 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 WXUNUSED(width), int WXUNUSED(height),
+ int initialSelection)
{
wxSingleChoiceDialog dialog(parent, message, caption, n, choices,
(char **)client_data);
+
+ dialog.SetSelection(initialSelection);
+
void *data;
if ( dialog.ShowModal() == wxID_OK )
data = dialog.GetSelectionClientData();
wxWindow *parent,
int x, int y,
bool centre,
- int width, int height)
+ int width, int height,
+ int initialSelection)
{
wxString *choices;
int n = ConvertWXArrayToC(aChoices, &choices);
void *res = wxGetSingleChoiceData(message, caption, n, choices,
client_data, parent,
- x, y, centre, width, height);
+ x, y, centre, width, height,
+ initialSelection);
delete [] choices;
return res;
}
-size_t wxGetMultipleChoices(wxArrayInt& selections,
+void* wxGetSingleChoiceData( const wxString& message,
+ const wxString& caption,
+ const wxArrayString& choices,
+ void **client_data,
+ int initialSelection,
+ wxWindow *parent)
+{
+ return wxGetSingleChoiceData(message, caption, choices,
+ client_data, parent,
+ wxDefaultCoord, wxDefaultCoord,
+ true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
+ initialSelection);
+}
+
+void* wxGetSingleChoiceData( const wxString& message,
+ const wxString& caption,
+ int n, const wxString *choices,
+ void **client_data,
+ int initialSelection,
+ wxWindow *parent)
+{
+ return wxGetSingleChoiceData(message, caption, n, choices,
+ client_data, parent,
+ wxDefaultCoord, wxDefaultCoord,
+ true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
+ initialSelection);
+}
+
+
+int wxGetSelectedChoices(wxArrayInt& selections,
const wxString& message,
const wxString& caption,
int n, const wxString *choices,
// 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,
{
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;
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
// ----------------------------------------------------------------------------
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 );
m_listbox->SetSelection(0);
topsizer->
- Add(m_listbox, wxSizerFlags().Expand().TripleBorder(wxLEFT | wxRIGHT));
+ Add(m_listbox, wxSizerFlags().Expand().Proportion(1).TripleBorder(wxLEFT | wxRIGHT));
// 3) buttons if any
wxSizer *
- buttonSizer = CreateSeparatedButtonSizer(styleDlg & ButtonSizerFlags);
+ buttonSizer = CreateSeparatedButtonSizer(styleBtns);
if ( buttonSizer )
{
topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
// Set the selection
void wxSingleChoiceDialog::SetSelection(int sel)
{
+ wxCHECK_RET( sel >= 0 && (unsigned)sel < m_listbox->GetCount(),
+ "Invalid initial selection" );
+
m_listbox->SetSelection(sel);
m_selection = sel;
}
long style,
const wxPoint& pos )
{
+ long styleLbox;
+#if wxUSE_CHECKLISTBOX
+ styleLbox = wxLB_ALWAYS_SB;
+#else
+ styleLbox = wxLB_ALWAYS_SB | wxLB_EXTENDED;
+#endif
+
if ( !wxAnyChoiceDialog::Create(parent, message, caption,
n, choices,
style, pos,
- wxLB_ALWAYS_SB | wxLB_EXTENDED) )
+ styleLbox) )
return false;
return true;
void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
{
+#if wxUSE_CHECKLISTBOX
+ wxCheckListBox* checkListBox = wxDynamicCast(m_listbox, wxCheckListBox);
+ if (checkListBox)
+ {
+ // 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
+
// first clear all currently selected items
size_t n,
count = m_listbox->GetCount();
bool wxMultiChoiceDialog::TransferDataFromWindow()
{
m_selections.Empty();
+
+#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
+
size_t count = m_listbox->GetCount();
for ( size_t n = 0; n < count; n++ )
{
projects / wxWidgets.git / blobdiff