define WX_XTI_TEMPLATE_FIX in case it is not yet

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 4fd5d33454ee5a478165146ae37a5e7592e21761..695b283eefbb26ecf45a0f7932338dd9e9f753c1 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -2,360 +2,506 @@
 // Name:        choicdgg.cpp
 // Purpose:     Choice dialogs
 // Author:      Julian Smart
 // Name:        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$
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "choicdgg.h"
+    #pragma implementation "choicdgg.h"

 #endif
 
 #endif
 

+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_CHOICEDLG
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/layout.h"
-#include "wx/intl.h"
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/button.h"
+    #include "wx/listbox.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/generic/choicdgg.h"
 
 #endif
 
 #include "wx/generic/choicdgg.h"
 

-// Split message, using constraints to position controls
-static void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer)
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#define wxID_LISTBOX 3000
+
+// ----------------------------------------------------------------------------
+// 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) )

 {
 {

-  char *copyMessage = copystring(message);
-  size_t i = 0;
-  size_t len = strlen(copyMessage);
-  char *currentMessage = copyMessage;
-
-//  wxWindow *lastWindow = parent;
-
-  while (i < len) {
-    while ((i < len) && (copyMessage[i] != '\n')) i++;
-    if (i < len) copyMessage[i] = 0;
-    wxStaticText *mess = new wxStaticText(parent, -1, currentMessage);
-
-/*
-    wxLayoutConstraints *c = new wxLayoutConstraints;
-    c->left.SameAs             (parent, wxLeft, 10);
-    c->top.SameAs              (lastWindow, wxBottom, 5);
-    c->right.AsIs                      ();
-    c->height.AsIs                     ();
-
-    mess->SetConstraints(c);
-*/
-    sizer->AddSizerChild(mess);
-
-    messageList->Append(mess);
-
-    currentMessage = copyMessage + i + 1;
-  }
-  delete[] copyMessage;
+    wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
+    wxString choice;
+    if ( dialog.ShowModal() == wxID_OK )
+        choice = dialog.GetStringSelection();
+
+    return choice;

 }
 
 }
 

-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) )
+wxString wxGetSingleChoice( const wxString& message,
+                            const wxString& caption,
+                            const wxArrayString& aChoices,
+                            wxWindow *parent,
+                            int x, int y,
+                            bool centre,
+                            int width, int height)

 {
 {

-       wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
-       if ( dialog.ShowModal() == wxID_OK )
-       {
-               return dialog.GetStringSelection();
-       }
-       else
-               return "";
+    wxString *choices;
+    int n = ConvertWXArrayToC(aChoices, &choices);
+    wxString res = wxGetSingleChoice(message, caption, n, choices, parent,
+                                     x, y, centre, width, height);
+    delete [] choices;
+
+    return res;

 }
 
 }
 

+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 // 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,
+                            int n, wxChar *choices[],
+                            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 *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;
+}
+#endif // WXWIN_COMPATIBILITY_2
+
+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 )
+        choice = dialog.GetSelection();
+    else
+        choice = -1;
+
+    return choice;

 }
 
 }
 

-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,
+                            const wxArrayString& aChoices,
+                            wxWindow *parent,
+                            int x, int y,
+                            bool centre,
+                            int width, int height)

 {
 {

-       wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
-       if ( dialog.ShowModal() == wxID_OK )
-       {
-               return dialog.GetSelection();
-       }
-       else
-               return -1;
+    wxString *choices;
+    int n = ConvertWXArrayToC(aChoices, &choices);
+    int res = wxGetSingleChoiceIndex(message, caption, n, choices, parent,
+                                     x, y, centre, width, height);
+    delete [] choices;
+
+    return res;

 }
 
 }
 

+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 // Overloaded for backward compatibility

-int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n, 
-                            char *choices[], wxWindow *parent,
-                           int x, int y, bool centre, 
-                           int width, int height )
+int wxGetSingleChoiceIndex( const wxString& message,
+                            const wxString& caption,
+                            int n, wxChar *choices[],
+                            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];
-       }
-       int ans = wxGetSingleChoiceIndex(message, caption, n, (const wxString *)strings, parent,
-               x, y, centre, width, height);
-       delete[] strings;
-       return ans;
+    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;
+}
+#endif // WXWIN_COMPATIBILITY_2
+
+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,
+                                (char **)client_data);
+    void *data;
+    if ( dialog.ShowModal() == wxID_OK )
+        data = dialog.GetSelectionClientData();
+    else
+        data = NULL;
+
+    return data;

 }
 
 }
 

-char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n,
-                             const wxString *choices, char **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,
+                             const wxArrayString& aChoices,
+                             void **client_data,
+                             wxWindow *parent,
+                             int x, int y,
+                             bool centre,
+                             int width, int height)

 {
 {

-       wxSingleChoiceDialog dialog(parent, message, caption, n, choices, client_data);
-       if ( dialog.ShowModal() == wxID_OK )
-       {
-               return dialog.GetSelectionClientData();
-       }
-       else
-               return NULL;
+    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;

 }
 
 }
 

+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 // Overloaded for backward compatibility

-char *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n, 
-                             char *choices[], char **client_data, wxWindow *parent,
-                            int x, int y, bool centre, 
-                            int width, int height )
+void *wxGetSingleChoiceData( const wxString& message,
+                             const wxString& caption,
+                             int n, wxChar *choices[],
+                             void **client_data,
+                             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];
-       }
-       char *data = wxGetSingleChoiceData(message, caption, n, (const wxString *)strings, client_data, parent,
-               x, y, centre, width, height);
-       delete[] strings;
-       return data;
+    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;

 }
 }

+#endif // WXWIN_COMPATIBILITY_2
+
+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);

 
 

+    if ( !selections.IsEmpty() )
+        dialog.SetSelections(selections);

 
 

-/* 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)
+    if ( dialog.ShowModal() == wxID_OK )
+        selections = dialog.GetSelections();
+    else
+        selections.Empty();
+
+    return selections.GetCount();
+}
+
+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)

 {
 {

-       return -1;
+    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)
+{
+    if ( !wxDialog::Create(parent, -1, caption, pos, wxDefaultSize, styleDlg) )
+        return FALSE;
+
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
+    // 1) text message
+    topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
+
+    // 2) list box
+    m_listbox = new wxListBox( this, wxID_LISTBOX,
+                               wxDefaultPosition, wxDefaultSize,
+                               n, choices,
+                               styleLbox );
+    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
+
+    // 4) buttons
+    topsizer->Add( CreateButtonSizer( styleDlg & (wxOK|wxCANCEL) ), 0, wxCENTRE | wxALL, 10 );
+
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );
+
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );
+
+    Centre( wxBOTH );
+
+    m_listbox->SetFocus();
+
+    return TRUE;

 }
 }

-*/

 
 

+// ----------------------------------------------------------------------------

 // wxSingleChoiceDialog
 // wxSingleChoiceDialog

+// ----------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARY

 BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
 BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)

-       EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
-       EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
+    EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
+    EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
-#endif
+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& pos):
-         wxDialog(parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+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);
+    Create(parent, message, caption, n, choices, clientData, style);

 }
 
 }
 

-wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
-        const wxStringList& choices, char **clientData, long style, const wxPoint& pos):
-         wxDialog(parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+#if 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);
+    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,
+                                  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;
+    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;

 }
 
 }
 

-bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& message, 
-                                   const wxString& WXUNUSED(caption), int n, 
-                                  const wxString *choices, char **clientData, long style,
-                                  const wxPoint& WXUNUSED(pos) )
+#endif // WXWIN_COMPATIBILITY_2
+
+bool wxSingleChoiceDialog::Create( wxWindow *parent,
+                                   const wxString& message,
+                                   const wxString& caption,
+                                   int n,
+                                   const wxString *choices,
+                                   char **clientData,
+                                   long style,
+                                   const wxPoint& pos )

 {
 {

-       m_dialogStyle = style;
-       m_selection = 0;
-       m_stringSelection = "";
-       m_clientData = NULL;
-
-       wxBeginBusyCursor();
-
-       wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
-       topSizer->SetBorder(10, 10);
-
-       wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
-       messageSizer->SetName("messageSizer");
-
-//    bool centre = ((style & wxCENTRE) == wxCENTRE);
-
-       wxList messageList;
-       wxSplitMessage2(message, &messageList, this, messageSizer);
-
-       // Insert a spacer
-       wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 10);
-
-       wxListBox *listBox = new wxListBox(this, wxID_LISTBOX, wxPoint(-1, -1), wxSize(240, 160),
-               n, choices);
-    listBox->SetSelection(m_selection);
-       if ( clientData )
-       {
-               int i;
-               for ( i = 0; i < n; i++)
-               {
-                               listBox->SetClientData(i, clientData[i]);
-               }
-       }
-
-       wxRowColSizer *listBoxSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-       listBoxSizer->AddSizerChild(listBox);
-       listBoxSizer->SetName("listBoxSizer");
-
-       // Create constraints for the text sizer
-       wxLayoutConstraints *textC = new wxLayoutConstraints;
-       textC->left.SameAs              (messageSizer, wxLeft);
-       textC->top.Below                (spacingSizer);
-       listBoxSizer->SetConstraints(textC);
-
-       // Insert another spacer
-       wxSpacingSizer *spacingSizer2 = new wxSpacingSizer(topSizer, wxBelow, listBoxSizer, 10);
-       spacingSizer->SetName("spacingSizer2");
-
-       // Insert a sizer for the buttons
-       wxRowColSizer *buttonSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-       buttonSizer->SetName("buttonSizer");
-       buttonSizer->SetSpacing(12,0);
-
-       // Specify constraints for the button sizer
-       wxLayoutConstraints *c = new wxLayoutConstraints;
-       c->width.AsIs           ();
-       c->height.AsIs          ();
-       c->top.Below            (spacingSizer2);
-       c->centreX.SameAs       (listBoxSizer, wxCentreX);
-       buttonSizer->SetConstraints(c);
-
-    wxButton *ok = NULL;
-       wxButton *cancel = NULL;
-
-  if (style & wxOK) {
-    ok = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxSize(75,-1) );
-       buttonSizer->AddSizerChild(ok);
-  }
-
-  if (style & wxCANCEL) {
-    cancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(75,-1));
-       buttonSizer->AddSizerChild(cancel);
-  }
-
-  if (ok)
-  {
-    ok->SetDefault();
-    ok->SetFocus();
-  }
-
-  Layout();
-  Centre(wxBOTH);
-
-  wxEndBusyCursor();
-
-  return TRUE;
+    if ( !wxAnyChoiceDialog::Create(parent, message, caption,
+                                    n, choices,
+                                    style, pos) )
+        return FALSE;
+
+    m_selection = n > 0 ? 0 : -1;
+
+    if (clientData)
+    {
+        for (int i = 0; i < n; i++)
+            m_listbox->SetClientData(i, clientData[i]);
+    }
+
+    return TRUE;

 }
 
 // Set the selection
 void wxSingleChoiceDialog::SetSelection(int sel)
 {
 }
 
 // Set the selection
 void wxSingleChoiceDialog::SetSelection(int sel)
 {

-       wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
-    if (listBox)
-    {
-        listBox->SetSelection(sel);
-    }
+    m_listbox->SetSelection(sel);

     m_selection = sel;
 }
 
 void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     m_selection = sel;
 }
 
 void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {

-       wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
-       if ( listBox )
-       {
-               m_selection = listBox->GetSelection();
-               m_stringSelection = listBox->GetStringSelection();
-               m_clientData = (char*)listBox->GetClientData(m_selection);
-       }
-
-       EndModal(wxID_OK);
+    m_selection = m_listbox->GetSelection();
+    m_stringSelection = m_listbox->GetStringSelection();
+    if ( m_listbox->HasClientUntypedData() )
+        SetClientData(m_listbox->GetClientData(m_selection));
+    EndModal(wxID_OK);

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

-       wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
-       if ( listBox )
-       {
-               m_selection = listBox->GetSelection();
-               m_stringSelection = listBox->GetStringSelection();
-               m_clientData = (char*)listBox->GetClientData(m_selection);
-       }
-
-       EndModal(wxID_OK);
+    m_selection = m_listbox->GetSelection();
+    m_stringSelection = m_listbox->GetStringSelection();
+
+    if ( m_listbox->HasClientUntypedData() )
+        SetClientData(m_listbox->GetClientData(m_selection));
+
+    EndModal(wxID_OK);
+}
+
+// ----------------------------------------------------------------------------
+// wxMultiChoiceDialog
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog)
+
+bool wxMultiChoiceDialog::Create( wxWindow *parent,
+                                  const wxString& message,
+                                  const wxString& caption,
+                                  int n,
+                                  const wxString *choices,
+                                  long style,
+                                  const wxPoint& pos )
+{
+    if ( !wxAnyChoiceDialog::Create(parent, message, caption,
+                                    n, choices,
+                                    style, pos,
+                                    wxLB_ALWAYS_SB | wxLB_EXTENDED) )
+        return FALSE;
+
+    return TRUE;

 }
 
 }
 

+void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)
+{
+    size_t count = selections.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        m_listbox->Select(selections[n]);
+    }
+}
+
+bool wxMultiChoiceDialog::TransferDataFromWindow()
+{
+    m_selections.Empty();
+    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;
+}

 
 

+#endif // wxUSE_CHOICEDLG