#endif
#include "wx/statline.h"
+#include "wx/settings.h"
#include "wx/generic/choicdgg.h"
// ----------------------------------------------------------------------------
#define wxID_LISTBOX 3000
-// ---------------------------------------------------------------------------
-// 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
// ----------------------------------------------------------------------------
return res;
}
-size_t wxGetMultipleChoices(wxArrayInt& selections,
+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)
{
-#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
- styleDlg &= ~wxBORDER_MASK;
- styleDlg &= ~wxRESIZE_BORDER;
- styleDlg &= ~wxCAPTION;
-#endif
-#ifdef __WXMAC__
- 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 );
// 1) text message
-#ifdef __WXMAC__
- // align text and list at least on mac
- topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(15,0) );
-#else
- topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );
-#endif
+ topsizer->
+ Add(CreateTextSizer(message), wxSizerFlags().Expand().TripleBorder());
+
// 2) list box
- m_listbox = CreateList(n,choices,styleLbox);
+ m_listbox = CreateList(n, choices, styleLbox);
if ( n > 0 )
m_listbox->SetSelection(0);
- topsizer->Add( m_listbox, 1, wxEXPAND|wxLEFT|wxRIGHT, wxLARGESMALL(15,0) );
+ topsizer->
+ Add(m_listbox, wxSizerFlags().Expand().Proportion(1).TripleBorder(wxLEFT | wxRIGHT));
// 3) buttons if any
- wxSizer *buttonSizer = CreateButtonSizer( styleDlg & ButtonSizerFlags , true, wxLARGESMALL(10,0) );
- if(buttonSizer->GetChildren().GetCount() > 0 )
- {
- topsizer->Add( buttonSizer, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
- }
- else
+ wxSizer *
+ buttonSizer = CreateSeparatedButtonSizer(styleBtns);
+ if ( buttonSizer )
{
- topsizer->AddSpacer( wxLARGESMALL(15,0) );
- delete buttonSizer;
+ topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
}
SetSizer( topsizer );
-#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
topsizer->SetSizeHints( this );
topsizer->Fit( this );
if ( styleDlg & wxCENTRE )
Centre(wxBOTH);
-#endif
m_listbox->SetFocus();
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