Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 4f47ab48eaa4ae41eaf9898a232cac3f215ca4f3..612b285ba4659b2bbee88875ee5c0b7db82838b7 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -1,22 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choicdgg.cpp
+// Name:        src/generic/choicdgg.cpp

 // Purpose:     Choice dialogs
 // Author:      Julian Smart
 // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     Choice dialogs
 // Author:      Julian Smart
 // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // declarations
 // ============================================================================
 
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "choicdgg.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -28,21 +24,23 @@
     #pragma hdrstop
 #endif
 
     #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"
 #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/stattext.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"

+    #include "wx/arrstr.h"

 #endif
 
 #endif
 

-#if wxUSE_STATLINE
-    #include "wx/statline.h"
-#endif
-
+#include "wx/statline.h"
+#include "wx/settings.h"

 #include "wx/generic/choicdgg.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/generic/choicdgg.h"
 
 // ----------------------------------------------------------------------------


@@ -51,17 +49,6 @@
 
 #define wxID_LISTBOX 3000
 
 
 #define wxID_LISTBOX 3000
 

-#if defined(__WXMSW__) || defined(__WXMAC__)
-#define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \
-                                  wxDIALOG_MODAL |         \
-                                  wxTAB_TRAVERSAL)
-#else
-#define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \
-                                  wxDIALOG_MODAL |         \
-                                  wxRESIZE_BORDER |        \
-                                  wxTAB_TRAVERSAL)
-#endif
-

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -84,7 +71,7 @@ int ConvertWXArrayToC(const wxArrayString& aChoices, wxString **choices)
 
     for ( int i = 0; i < n; i++ )
     {
 
     for ( int i = 0; i < n; i++ )
     {

-        (*choices)[i] = aChoices[i];   
+        (*choices)[i] = aChoices[i];

     }
 
     return n;
     }
 
     return n;


@@ -100,9 +87,13 @@ wxString wxGetSingleChoice( const wxString& message,
                             wxWindow *parent,
                             int WXUNUSED(x), int WXUNUSED(y),
                             bool WXUNUSED(centre),
                             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);
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);

+
+    dialog.SetSelection(initialSelection);
+

     wxString choice;
     if ( dialog.ShowModal() == wxID_OK )
         choice = dialog.GetStringSelection();
     wxString choice;
     if ( dialog.ShowModal() == wxID_OK )
         choice = dialog.GetStringSelection();


@@ -116,38 +107,42 @@ wxString wxGetSingleChoice( const wxString& message,
                             wxWindow *parent,
                             int x, int y,
                             bool centre,
                             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,
 {
     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;
 }
 
     delete [] choices;
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
-// Overloaded for backward compatibility

 wxString wxGetSingleChoice( const wxString& message,
                             const wxString& caption,
 wxString wxGetSingleChoice( const wxString& message,
                             const wxString& caption,

-                            int n, char *choices[],
-                            wxWindow *parent,
-                            int x, int y, bool centre,
-                            int width, int height )
+                            const wxArrayString& choices,
+                            int initialSelection,
+                            wxWindow *parent)

 {
 {

-    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;
+    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);

 }
 }

-#endif // WXWIN_COMPATIBILITY_2

 
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,
 
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,


@@ -155,9 +150,13 @@ int wxGetSingleChoiceIndex( const wxString& message,
                             wxWindow *parent,
                             int WXUNUSED(x), int WXUNUSED(y),
                             bool WXUNUSED(centre),
                             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);
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);

+
+    dialog.SetSelection(initialSelection);
+

     int choice;
     if ( dialog.ShowModal() == wxID_OK )
         choice = dialog.GetSelection();
     int choice;
     if ( dialog.ShowModal() == wxID_OK )
         choice = dialog.GetSelection();


@@ -173,35 +172,44 @@ int wxGetSingleChoiceIndex( const wxString& message,
                             wxWindow *parent,
                             int x, int y,
                             bool centre,
                             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,
 {
     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;
 }
 
     delete [] choices;
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
-// Overloaded for backward compatibility

 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,

-                            int n, wxChar *choices[],
-                            wxWindow *parent,
-                            int x, int y, bool centre,
-                            int width, int height )
+                            const wxArrayString& choices,
+                            int initialSelection,
+                            wxWindow *parent)

 {
 {

-    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;
+    return wxGetSingleChoiceIndex(message, caption, choices, parent,
+                                  wxDefaultCoord, wxDefaultCoord,
+                                  true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
+                                  initialSelection);

 }
 }

-#endif // WXWIN_COMPATIBILITY_2
+
+
+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,
 
 void *wxGetSingleChoiceData( const wxString& message,
                              const wxString& caption,


@@ -210,13 +218,17 @@ void *wxGetSingleChoiceData( const wxString& message,
                              wxWindow *parent,
                              int WXUNUSED(x), int WXUNUSED(y),
                              bool WXUNUSED(centre),
                              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,
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices,

-                                (char **)client_data);
+                                client_data);
+
+    dialog.SetSelection(initialSelection);
+

     void *data;
     if ( dialog.ShowModal() == wxID_OK )
     void *data;
     if ( dialog.ShowModal() == wxID_OK )

-        data = dialog.GetSelectionClientData();
+        data = dialog.GetSelectionData();

     else
         data = NULL;
 
     else
         data = NULL;
 


@@ -230,43 +242,50 @@ void *wxGetSingleChoiceData( const wxString& message,
                              wxWindow *parent,
                              int x, int y,
                              bool centre,
                              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,
 {
     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;
 }
 
     delete [] choices;
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
-// Overloaded for backward compatibility
-void *wxGetSingleChoiceData( const wxString& message,
+void* wxGetSingleChoiceData( const wxString& message,

                              const wxString& caption,
                              const wxString& caption,

-                             int n, wxChar *choices[],
+                             const wxArrayString& choices,

                              void **client_data,
                              void **client_data,

-                             wxWindow *parent,
-                             int x, int y, bool centre, int width, int height )
+                             int initialSelection,
+                             wxWindow *parent)

 {
 {

-    wxString *strings = new wxString[n];
-    int i;
-    for ( i = 0; i < n; i++)
-    {
-        strings[i] = choices[i];
-    }
-    void *data = wxGetSingleChoiceData(message, caption,
-                                       n, (const wxString *)strings,
-                                       client_data, parent,
-                                       x, y, centre, width, height);
-    delete[] strings;
-    return data;
+    return wxGetSingleChoiceData(message, caption, choices,
+                                 client_data, parent,
+                                 wxDefaultCoord, wxDefaultCoord,
+                                 true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
+                                 initialSelection);

 }
 }

-#endif // WXWIN_COMPATIBILITY_2

 
 

-size_t wxGetMultipleChoices(wxArrayInt& selections,
+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,
                             const wxString& message,
                             const wxString& caption,
                             int n, const wxString *choices,


@@ -277,18 +296,23 @@ size_t wxGetMultipleChoices(wxArrayInt& selections,
 {
     wxMultiChoiceDialog dialog(parent, message, caption, n, choices);
 
 {
     wxMultiChoiceDialog dialog(parent, message, caption, n, choices);
 

-    if ( !selections.IsEmpty() )
-        dialog.SetSelections(selections);
+    // 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();
+    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();
 }
 
     return selections.GetCount();
 }
 

-size_t wxGetMultipleChoices(wxArrayInt& selections,
+int wxGetSelectedChoices(wxArrayInt& selections,

                             const wxString& message,
                             const wxString& caption,
                             const wxArrayString& aChoices,
                             const wxString& message,
                             const wxString& caption,
                             const wxArrayString& aChoices,


@@ -299,7 +323,7 @@ size_t wxGetMultipleChoices(wxArrayInt& selections,
 {
     wxString *choices;
     int n = ConvertWXArrayToC(aChoices, &choices);
 {
     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;
                                       n, choices, parent,
                                       x, y, centre, width, height);
     delete [] choices;


@@ -307,6 +331,50 @@ size_t wxGetMultipleChoices(wxArrayInt& selections,
     return res;
 }
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxAnyChoiceDialog
 // ----------------------------------------------------------------------------


@@ -315,48 +383,72 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
                                const wxString& message,
                                const wxString& caption,
                                int n, const wxString *choices,
                                const wxString& message,
                                const wxString& caption,
                                int n, const wxString *choices,

-                               long WXUNUSED(styleDlg), // FIXME: why unused?
+                               long styleDlg,

                                const wxPoint& pos,
                                long styleLbox)
 {
                                const wxPoint& pos,
                                long styleLbox)
 {

-    if ( !wxDialog::Create(parent, -1, caption, pos, wxDefaultSize,
-                           wxCHOICEDLG_DIALOG_STYLE) )
-        return FALSE;
+    // 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;

 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message

-    topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+    topsizer->
+        Add(CreateTextSizer(message), wxSizerFlags().Expand().TripleBorder());

 
     // 2) list box
 
     // 2) list box

-    m_listbox = new wxListBox( this, wxID_LISTBOX,
-                               wxDefaultPosition, wxDefaultSize,
-                               n, choices,
-                               styleLbox );
+    m_listbox = CreateList(n, choices, styleLbox);
+

     if ( n > 0 )
         m_listbox->SetSelection(0);
 
     if ( n > 0 )
         m_listbox->SetSelection(0);
 

-    topsizer->Add( m_listbox, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
-
-#if wxUSE_STATLINE
-    // 3) static line
-    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+    topsizer->
+        Add(m_listbox, wxSizerFlags().Expand().Proportion(1).TripleBorder(wxLEFT | wxRIGHT));

 
 

-    // 4) buttons
-    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
+    // 3) buttons if any
+    wxSizer *
+        buttonSizer = CreateSeparatedButtonSizer(styleBtns);
+    if ( buttonSizer )
+    {
+        topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
+    }

 
 

-    SetAutoLayout( TRUE );

     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 

-    Centre( wxBOTH );
+    if ( styleDlg & wxCENTRE )
+        Centre(wxBOTH);

 
     m_listbox->SetFocus();
 
 
     m_listbox->SetFocus();
 

-    return TRUE;
+    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 );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -365,70 +457,29 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 
 BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
 
 BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)

+#ifndef __SMARTPHONE__

     EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
     EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)

+#endif
+#ifdef __WXWINCE__
+    EVT_JOY_BUTTON_DOWN(wxSingleChoiceDialog::OnJoystickButtonDown)
+#endif

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
 
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
 

-wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
-                                           const wxString& message,
-                                           const wxString& caption,
-                                           int n,
-                                           const wxString *choices,
-                                           char **clientData,
-                                           long style,
-                                           const wxPoint& WXUNUSED(pos))
-{
-    Create(parent, message, caption, n, choices, clientData, style);
-}
-
-#ifdef WXWIN_COMPATIBILITY_2
-
-wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
-                                           const wxString& message,
-                                           const wxString& caption,
-                                           const wxStringList& 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;
-}
-
-#endif // WXWIN_COMPATIBILITY_2
-

 bool wxSingleChoiceDialog::Create( wxWindow *parent,
                                    const wxString& message,
                                    const wxString& caption,
                                    int n,
                                    const wxString *choices,
 bool wxSingleChoiceDialog::Create( wxWindow *parent,
                                    const wxString& message,
                                    const wxString& caption,
                                    int n,
                                    const wxString *choices,

-                                   char **clientData,
+                                   void **clientData,

                                    long style,
                                    const wxPoint& pos )
 {
     if ( !wxAnyChoiceDialog::Create(parent, message, caption,
                                     n, choices,
                                     style, pos) )
                                    long style,
                                    const wxPoint& pos )
 {
     if ( !wxAnyChoiceDialog::Create(parent, message, caption,
                                     n, choices,
                                     style, pos) )

-        return FALSE;
+        return false;

 
     m_selection = n > 0 ? 0 : -1;
 
 
     m_selection = n > 0 ? 0 : -1;
 


@@ -438,38 +489,58 @@ bool wxSingleChoiceDialog::Create( wxWindow *parent,
             m_listbox->SetClientData(i, clientData[i]);
     }
 
             m_listbox->SetClientData(i, clientData[i]);
     }
 

-    return TRUE;
+    return true;
+}
+
+bool wxSingleChoiceDialog::Create( wxWindow *parent,
+                                   const wxString& message,
+                                   const wxString& caption,
+                                   const wxArrayString& choices,
+                                   void **clientData,
+                                   long style,
+                                   const wxPoint& pos )
+{
+    wxCArrayString chs(choices);
+    return Create( parent, message, caption, chs.GetCount(), chs.GetStrings(),
+                   clientData, style, pos );

 }
 
 // Set the selection
 void wxSingleChoiceDialog::SetSelection(int sel)
 {
 }
 
 // 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;
 }
 
 void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     m_listbox->SetSelection(sel);
     m_selection = sel;
 }
 
 void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {

-    m_selection = m_listbox->GetSelection();
-    m_stringSelection = m_listbox->GetStringSelection();
-    // TODO!
-#ifndef __WXMOTIF__
-    if ( m_listbox->HasClientUntypedData() )
-        SetClientData(m_listbox->GetClientData(m_selection));
-#endif
-    EndModal(wxID_OK);
+    DoChoice();

 }
 
 }
 

+#ifndef __SMARTPHONE__

 void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
 void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))

+{
+    DoChoice();
+}
+#endif
+
+#ifdef __WXWINCE__
+void wxSingleChoiceDialog::OnJoystickButtonDown(wxJoystickEvent& WXUNUSED(event))
+{
+    DoChoice();
+}
+#endif
+
+void wxSingleChoiceDialog::DoChoice()

 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();
 
 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();
 

-    // TODO!
-#ifndef __WXMOTIF__

     if ( m_listbox->HasClientUntypedData() )
         SetClientData(m_listbox->GetClientData(m_selection));
     if ( m_listbox->HasClientUntypedData() )
         SetClientData(m_listbox->GetClientData(m_selection));

-#endif

 
     EndModal(wxID_OK);
 }
 
     EndModal(wxID_OK);
 }


@@ -488,19 +559,71 @@ bool wxMultiChoiceDialog::Create( wxWindow *parent,
                                   long style,
                                   const wxPoint& pos )
 {
                                   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,
     if ( !wxAnyChoiceDialog::Create(parent, message, caption,
                                     n, choices,
                                     style, pos,

-                                    wxLB_ALWAYS_SB | wxLB_EXTENDED) )
-        return FALSE;
+                                    styleLbox) )
+        return false;

 
 

-    return TRUE;
+    return true;
+}
+
+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 );

 }
 
 void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
 {
 }
 
 void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
 {

-    size_t count = selections.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+#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();
+    for ( n = 0; n < count; ++n )
+    {
+        m_listbox->Deselect(n);
+    }
+
+    // now select the ones which should be selected
+    count = selections.GetCount();
+    for ( n = 0; n < count; n++ )

     {
         m_listbox->Select(selections[n]);
     }
     {
         m_listbox->Select(selections[n]);
     }


@@ -508,12 +631,22 @@ void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
 
 bool wxMultiChoiceDialog::TransferDataFromWindow()
 {
 
 bool wxMultiChoiceDialog::TransferDataFromWindow()
 {

-    // VZ: I hate to do it but I can't fix wxMotif right now (FIXME)
-#ifdef __WXMOTIF__
-    #define IsSelected Selected
+    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
 
 #endif
 

-    m_selections.Empty();

     size_t count = m_listbox->GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = m_listbox->GetCount();
     for ( size_t n = 0; n < count; n++ )
     {


@@ -521,5 +654,19 @@ bool wxMultiChoiceDialog::TransferDataFromWindow()
             m_selections.Add(n);
     }
 
             m_selections.Add(n);
     }
 

-    return TRUE;
+    return true;

 }
 }

+
+#if wxUSE_CHECKLISTBOX
+
+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