fix for discrepancies between wxNotebookEvent and wxNotebook GetSelection() results

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 2529df3ccdb409e54c237c48929b9e85c3f95b6f..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"
 


@@ -21,76 +29,112 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-  #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 <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"

 #endif
 
 #if wxUSE_STATLINE
 #endif
 
 #if wxUSE_STATLINE

-  #include "wx/statline.h" 
+    #include "wx/statline.h"

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

-/* Split message, using constraints to position controls */
-static wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#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
+// ----------------------------------------------------------------------------
+
+// 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 y = 10;
-    int w = 50;
-    wxString line( _T("") );
-    for (size_t pos = 0; pos < message.Len(); pos++)
-    {
-        if (message[pos] == _T('\n'))
-        {
-            if (!line.IsEmpty())
-            {
-                wxStaticText *s1 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
-                wxSize size1( s1->GetSize() );
-                if (size1.x > w) w = size1.x;
-                line = _T("");
-            }
-            y += 18;
-        }
-        else
-        {
-            line += message[pos];
-        }
-    }
-    
-    if (!line.IsEmpty())
+    int n = aChoices.GetCount();
+    *choices = new wxString[n];
+
+    for ( int i = 0; i < n; i++ )

     {
     {

-        wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(15,y) );
-        wxSize size2( s2->GetSize() );
-        if (size2.x > w) w = size2.x;
+        (*choices)[i] = aChoices[i];   

     }
     }

-        
-    y += 18;
-    
-    return wxSize(w+30,y);
-}

 
 

+    return n;
+}

 
 

-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) )
+// ----------------------------------------------------------------------------
+// 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);
 {
     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,
-                int x, int y, bool centre, 
-                int width, int height )
+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 *strings = new wxString[n];
     int i;
 {
     wxString *strings = new wxString[n];
     int i;


@@ -103,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++)


@@ -130,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;


@@ -155,67 +240,151 @@ 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);

 
 

-/* 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)
+{
+    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)

 {
 {

-    return -1;
+    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
+IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)

 
 

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

 }
 
 }
 

-bool wxSingleChoiceDialog::Create(wxWindow *parent, const wxString& message, const wxString& caption,
-        const wxStringList& choices, wxChar **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;
 {
     wxString *strings = new wxString[choices.Number()];
     int i;


@@ -228,121 +397,112 @@ bool wxSingleChoiceDialog::Create(wxWindow *parent, const wxString& message, con
     return ans;
 }
 
     return ans;
 }
 

-bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& message, 
-                                   const wxString& WXUNUSED(caption), int n, 
-                                   const wxString *choices, wxChar **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 = _T("");
-    m_clientData = NULL;
-
-    wxBeginBusyCursor();
-    
-    wxSize message_size( wxSplitMessage2( message, this ) );
-
-    wxButton *ok = (wxButton *) NULL;
-    wxButton *cancel = (wxButton *) NULL;
-    wxList m_buttons;
-    
-    int y = message_size.y + 15;
-    
-    int listbox_height = wxMin( 160, n*20 );
-    
-    wxListBox *listBox = new wxListBox( this, wxID_LISTBOX, wxPoint(10, y), wxSize(240, listbox_height), 
-                                        n, choices, wxLB_ALWAYS_SB );
-    listBox->SetSelection( m_selection );
+    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++)
     if (clientData)
     {
         for (int i = 0; i < n; i++)

-            listBox->SetClientData(i, clientData[i]);
+            m_listbox->SetClientData(i, clientData[i]);

     }
     }

-    
-    y += listbox_height + 35;

 
 

-    if (style & wxOK) 
-    {
-        ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );
-       m_buttons.Append( ok );
-    }
-
-    if (style & wxCANCEL) 
-    {
-        cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );
-       m_buttons.Append( cancel );
-    }
+    return TRUE;
+}

 
 

-    if (ok)
-    {
-        ok->SetDefault();
-        ok->SetFocus();
-    }
+// Set the selection
+void wxSingleChoiceDialog::SetSelection(int sel)
+{
+    m_listbox->SetSelection(sel);
+    m_selection = sel;
+}

 
 

-    int w = m_buttons.GetCount() * 100;
-    if (message_size.x > w) w = message_size.x;
-    int space = w / (m_buttons.GetCount()*2);
-    
-    listBox->SetSize( 20, -1, w-10, listbox_height );
-    
-    int m = 0;
-    wxNode *node = m_buttons.First();
-    while (node)
-    {
-        wxWindow *win = (wxWindow*)node->Data();
-        int x = (m*2+1)*space - 40 + 15;
-        win->Move( x, -1 );
-        node = node->Next();
-        m++;
-    }
-    
-#if wxUSE_STATLINE
-    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+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
 #endif

-    
-    SetSize( w+30, y+40 );
+    EndModal(wxID_OK);
+}

 
 

-    Centre( wxBOTH );
+void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
+{
+    m_selection = m_listbox->GetSelection();
+    m_stringSelection = m_listbox->GetStringSelection();

 
 

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

 
 

-    return TRUE;
+    EndModal(wxID_OK);

 }
 
 }
 

-// Set the selection
-void wxSingleChoiceDialog::SetSelection(int sel)
+// ----------------------------------------------------------------------------
+// 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 )

 {
 {

-    wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
-    if (listBox)
-    {
-        listBox->SetSelection(sel);
-    }
-    m_selection = sel;
+    if ( !wxAnyChoiceDialog::Create(parent, message, caption,
+                                    n, choices,
+                                    style, pos,
+                                    wxLB_ALWAYS_SB | wxLB_EXTENDED) )
+        return FALSE;
+
+    return TRUE;

 }
 
 }
 

-void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+void wxMultiChoiceDialog::SetSelections(const wxArrayInt& selections)

 {
 {

-    wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
-    if ( listBox )
+    size_t count = selections.GetCount();
+    for ( size_t n = 0; n < count; n++ )

     {
     {

-        m_selection = listBox->GetSelection();
-        m_stringSelection = listBox->GetStringSelection();
-        m_clientData = (wxChar*)listBox->GetClientData(m_selection);
+        m_listbox->Select(selections[n]);

     }
     }

-
-    EndModal(wxID_OK);

 }
 
 }
 

-void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
+bool wxMultiChoiceDialog::TransferDataFromWindow()

 {
 {

-    wxListBox *listBox = (wxListBox *)FindWindow(wxID_LISTBOX);
-    if ( listBox )
+    // 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++ )

     {
     {

-        m_selection = listBox->GetSelection();
-        m_stringSelection = listBox->GetStringSelection();
-        m_clientData = (wxChar*)listBox->GetClientData(m_selection);
+        if ( m_listbox->IsSelected(n) )
+            m_selections.Add(n);

     }
 
     }
 

-    EndModal(wxID_OK);
+    return TRUE;

 }
 }

-