Fixed wxHTML code in a Watcom Win32 DLL

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 0ff03ba0b005f262e934298343eb518bebb54033..5616efce9e39b68fbf1e59bf49bc5875b805e6ea 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -2,17 +2,25 @@
 // 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
+// Copyright:   (c) wxWindows team

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

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

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

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

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


@@ -28,6 +36,7 @@
     #include "wx/listbox.h"
     #include "wx/stattext.h"
     #include "wx/intl.h"
     #include "wx/listbox.h"
     #include "wx/stattext.h"
     #include "wx/intl.h"

+    #include "wx/sizer.h"

 #endif
 
 #if wxUSE_STATLINE
 #endif
 
 #if wxUSE_STATLINE


@@ -36,23 +45,94 @@
 
 #include "wx/generic/choicdgg.h"
 
 
 #include "wx/generic/choicdgg.h"
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+

 #define wxID_LISTBOX 3000
 
 #define wxID_LISTBOX 3000
 

-wxString wxGetSingleChoice( const wxString& message, const wxString& caption, int n,
-                            const wxString *choices, wxWindow *parent,
-                            int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre),
+#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
+// ----------------------------------------------------------------------------
+
+// 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) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
                             int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);

+    wxString choice;

     if ( dialog.ShowModal() == wxID_OK )
     if ( dialog.ShowModal() == wxID_OK )

-        return dialog.GetStringSelection();
-    else
-        return _T("");
+        choice = dialog.GetStringSelection();
+
+    return choice;

 }
 
 }
 

+wxString wxGetSingleChoice( const wxString& message,
+                            const wxString& caption,
+                            const wxArrayString& aChoices,
+                            wxWindow *parent,
+                            int x, int y,
+                            bool centre,
+                            int width, int height)
+{
+    wxString *choices;
+    int n = ConvertWXArrayToC(aChoices, &choices);
+    wxString res = wxGetSingleChoice(message, caption, n, choices, parent,
+                                     x, y, centre, width, height);
+    delete [] choices;
+
+    return res;
+}
+
+#ifdef 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,
+wxString wxGetSingleChoice( const wxString& message,
+                            const wxString& caption,
+                            int n, char *choices[],
+                            wxWindow *parent,

                             int x, int y, bool centre,
                             int width, int height )
 {
                             int x, int y, bool centre,
                             int width, int height )
 {


@@ -67,24 +147,34 @@ wxString wxGetSingleChoice( const wxString& message, const wxString& caption, in
     delete[] strings;
     return ans;
 }
     delete[] strings;
     return ans;
 }

-
-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) )
+#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);
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);

+    int choice;

     if ( dialog.ShowModal() == wxID_OK )
     if ( dialog.ShowModal() == wxID_OK )

-        return dialog.GetSelection();
+        choice = dialog.GetSelection();

     else
     else

-        return -1;
+        choice = -1;
+
+    return choice;

 }
 
 }
 

+#ifdef WXWIN_COMPATIBILITY_2

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

-int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, int n,
-                            wxChar *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];
     for ( int i = 0; i < n; i++)
 {
     wxString *strings = new wxString[n];
     for ( int i = 0; i < n; i++)


@@ -94,24 +184,55 @@ int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, in
     delete[] strings;
     return ans;
 }
     delete[] strings;
     return ans;
 }

-
-wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n,
-                   const wxString *choices, wxChar **client_data, wxWindow *parent,
-                   int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre),
-                   int WXUNUSED(width), int WXUNUSED(height) )
+#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, client_data);
+    wxSingleChoiceDialog dialog(parent, message, caption, n, choices,
+                                (char **)client_data);
+    void *data;

     if ( dialog.ShowModal() == wxID_OK )
     if ( dialog.ShowModal() == wxID_OK )

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

     else
     else

-        return NULL;
+        data = NULL;
+
+    return data;
+}
+
+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)
+{
+    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;

 }
 
 }
 

+#ifdef WXWIN_COMPATIBILITY_2

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

-wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, int n,
-                   wxChar *choices[], wxChar **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;
 {
     wxString *strings = new wxString[n];
     int i;


@@ -119,54 +240,118 @@ wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption,
     {
         strings[i] = choices[i];
     }
     {
         strings[i] = choices[i];
     }

-    wxChar *data = wxGetSingleChoiceData(message, caption, n, (const wxString *)strings, client_data, parent,
-        x, y, centre, width, height);
+    void *data = wxGetSingleChoiceData(message, caption,
+                                       n, (const wxString *)strings,
+                                       client_data, parent,
+                                       x, y, centre, width, height);

     delete[] strings;
     return data;
 }
     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);
+
+    if ( dialog.ShowModal() == wxID_OK )
+        selections = dialog.GetSelections();
+    else
+        selections.Empty();

 
 

+    return selections.GetCount();
+}

 
 

-/* 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)
+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 WXUNUSED(styleDlg), // FIXME: why unused?
+                               const wxPoint& pos,
+                               long styleLbox)
+{
+    if ( !wxDialog::Create(parent, -1, caption, pos, wxDefaultSize,
+                           wxCHOICEDLG_DIALOG_STYLE) )
+        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( 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)
     EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
     EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
     EVT_LISTBOX_DCLICK(wxID_LISTBOX, wxSingleChoiceDialog::OnListBoxDClick)
 END_EVENT_TABLE()
 

-IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
-#endif
-
-#define wxCHOICEDLG_DIALOG_STYLE (wxDEFAULT_DIALOG_STYLE | \
-                                  wxDIALOG_MODAL |         \
-                                  wxTAB_TRAVERSAL)
+IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)

 
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,
 
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,


@@ -175,22 +360,20 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString *choices,
                                            char **clientData,
                                            long style,
                                            const wxString *choices,
                                            char **clientData,
                                            long style,

-                                           const wxPoint& pos)
-                    : wxDialog(parent, -1, caption, pos, wxDefaultSize,
-                               wxCHOICEDLG_DIALOG_STYLE)
+                                           const wxPoint& WXUNUSED(pos))

 {
     Create(parent, message, caption, n, choices, clientData, style);
 }
 
 {
     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,
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,
                                            const wxString& caption,
                                            const wxStringList& choices,

-                                           wxChar **clientData,
+                                           char **clientData,

                                            long style,
                                            long style,

-                                           const wxPoint& pos)
-                    : wxDialog(parent, -1, caption, pos, wxDefaultSize,
-                               wxCHOICEDLG_DIALOG_STYLE)
+                                           const wxPoint& WXUNUSED(pos))

 {
     Create(parent, message, caption, choices, clientData, style);
 }
 {
     Create(parent, message, caption, choices, clientData, style);
 }


@@ -214,130 +397,30 @@ bool wxSingleChoiceDialog::Create(wxWindow *parent,
     return ans;
 }
 
     return ans;
 }
 

-bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
+#endif // WXWIN_COMPATIBILITY_2
+
+bool wxSingleChoiceDialog::Create( wxWindow *parent,

                                    const wxString& message,
                                    const wxString& message,

-                                   const wxString& WXUNUSED(caption),
+                                   const wxString& caption,

                                    int n,
                                    const wxString *choices,
                                    char **clientData,
                                    long style,
                                    int n,
                                    const wxString *choices,
                                    char **clientData,
                                    long style,

-                                   const wxPoint& WXUNUSED(pos) )
+                                   const wxPoint& pos )

 {
 {

-    m_selection = 0;
-    m_clientData = NULL;
-
-    // calc the message size
-    // ---------------------
-
-    wxArrayString lines;
-    wxSize sizeText = SplitTextMessage(message, &lines);
-    long heightTextMax = sizeText.GetHeight(),
-         widthTextMax = sizeText.GetWidth();
-    size_t nLineCount = lines.Count();
-    long hTotalMsg = heightTextMax*nLineCount;
-
-    // calc the button size
-    // --------------------
-
-    // always create the OK button - the code below supposes we do have buttons
-    // and besides the user should have some way to close this dialog
-    wxASSERT_MSG( style & wxOK, _T("this dialog should have OK button") );
+    if ( !wxAnyChoiceDialog::Create(parent, message, caption,
+                                    n, choices,
+                                    style, pos) )
+        return FALSE;

 
 

-    bool hasCancel = (style & wxCANCEL) != 0;
+    m_selection = n > 0 ? 0 : -1;

 
 

-    wxSize sizeButtons = GetStandardButtonSize(hasCancel);
-
-    long wButton = sizeButtons.GetWidth(),
-         hButton = sizeButtons.GetHeight();
-
-    long wTotalButtons = wButton;
-    if ( hasCancel )
-    {
-        wTotalButtons *= 2;                         // second button
-        wTotalButtons += MARGIN_BETWEEN_BUTTONS;    // margin between the 2
-    }
-
-    // listbox and stat line
-    // ---------------------
-
-    // make the listbox at least as tall as the message - otherwise it looks
-    // ugly (the lower limit of 300 for the width is arbitrary OTOH)
-    //
-    // NB: we write "n + 2" because the horiz. scrollbar also takes some place
-    long hListbox = wxMax((n + 2) * heightTextMax, hTotalMsg),
-         wListbox = wxMax(300, wxMax(wTotalButtons, widthTextMax));
-
-#if wxUSE_STATLINE
-    long hStatLine = wxStaticLine::GetDefaultSize();
-#endif
-
-    // now the complete dialog size
-    // ----------------------------
-
-    long hDialog = 2*LAYOUT_Y_MARGIN +  // top margin
-                   hTotalMsg +          // message
-                   2*LAYOUT_Y_MARGIN +  // margin between text and listbox
-                   hListbox +           // listbox
-#if wxUSE_STATLINE
-                   LAYOUT_Y_MARGIN +    // margin
-                   hStatLine +          // separator line
-#endif
-                   2*LAYOUT_Y_MARGIN +  // margin between listbox and buttons
-                   hButton +            // button(s)
-                   LAYOUT_Y_MARGIN;     // bottom margin
-
-    long wDialog = wxMax(wListbox, wxMax(wTotalButtons, widthTextMax)) +
-                   4*LAYOUT_X_MARGIN;   // 2 from each side
-
-    // create the controls
-    // -------------------
-
-    // message
-    wxStaticText *text;
-    int y = 2*LAYOUT_Y_MARGIN;
-    for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
-    {
-        text = new wxStaticText(this, -1, lines[nLine],
-                                wxPoint(2*LAYOUT_X_MARGIN, y),
-                                wxSize(widthTextMax, heightTextMax));
-        y += heightTextMax;
-    }
-
-    y += 2*LAYOUT_X_MARGIN;
-
-    // listbox
-    m_listbox = new wxListBox( this, wxID_LISTBOX,
-                               wxPoint(2*LAYOUT_X_MARGIN, y),
-                               wxSize(wListbox, hListbox),
-                               n, choices,
-                               wxLB_HSCROLL);
-    y += hListbox;
-
-    if ( clientData )
+    if (clientData)

     {
         for (int i = 0; i < n; i++)
             m_listbox->SetClientData(i, clientData[i]);
     }
 
     {
         for (int i = 0; i < n; i++)
             m_listbox->SetClientData(i, clientData[i]);
     }
 

-    // separator line
-#if wxUSE_STATLINE
-    (void) new wxStaticLine( this, -1,
-                             wxPoint(2*LAYOUT_X_MARGIN, y + LAYOUT_Y_MARGIN),
-                             wxSize(wDialog - 4*LAYOUT_X_MARGIN, hStatLine) );
-
-    y += LAYOUT_Y_MARGIN + hStatLine;
-#endif
-
-    // buttons
-
-    y += 2*LAYOUT_X_MARGIN;
-
-    CreateStandardButtons(wDialog, y, wButton, hButton, hasCancel);
-
-    SetClientSize( wDialog, hDialog );
-
-    Centre( wxBOTH );
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -352,8 +435,11 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();
 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();

-    m_clientData = m_listbox->GetClientData(m_selection);
-
+    // TODO!
+#ifndef __WXMOTIF__
+    if ( m_listbox->HasClientUntypedData() )
+        SetClientData(m_listbox->GetClientData(m_selection));
+#endif

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


@@ -361,8 +447,62 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();
 {
     m_selection = m_listbox->GetSelection();
     m_stringSelection = m_listbox->GetStringSelection();

-    m_clientData = m_listbox->GetClientData(m_selection);
+
+    // TODO!
+#ifndef __WXMOTIF__
+    if ( m_listbox->HasClientUntypedData() )
+        SetClientData(m_listbox->GetClientData(m_selection));
+#endif

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