don't use wxVector<wxDataFormat> from wx/clipbrd.h as wxDataFormat definition is...

[wxWidgets.git] / src / generic / choicdgg.cpp

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index d037f6255d2f41bcd442625a141d51967fcc2303..fa3c19415bd479884041a577aa1afad3f2e54114 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -302,11 +302,8 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 
 wxListBoxBase *wxAnyChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox)
 {
 
 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,
     return new wxListBox( this, wxID_LISTBOX,

-                          wxDefaultPosition, size,
+                          wxDefaultPosition, wxDefaultSize,

                           n, choices,
                           styleLbox );
 }
                           n, choices,
                           styleLbox );
 }


@@ -541,12 +538,8 @@ bool wxMultiChoiceDialog::TransferDataFromWindow()
 
 wxListBoxBase *wxMultiChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox)
 {
 
 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,
     return new wxCheckListBox( this, wxID_LISTBOX,

-                               wxDefaultPosition, size,
+                               wxDefaultPosition, wxDefaultSize,

                                n, choices,
                                styleLbox );
 }
                                n, choices,
                                styleLbox );
 }