]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/choicdgg.cpp
wxWebKit now properly updates after a resize event.
[wxWidgets.git] / src / generic / choicdgg.cpp
index 560eee9c2b3044d37450a334e53fb09cb9ae1628..0f7324317e82f6a9499f95f1e5d273cb99d1f6ea 100644 (file)
@@ -2,17 +2,25 @@
 // 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$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+// ============================================================================
+// declarations
+// ============================================================================
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "choicdgg.h"
 #endif
 
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -20,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CHOICEDLG
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/utils.h"
@@ -29,6 +39,7 @@
     #include "wx/stattext.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"
+    #include "wx/arrstr.h"
 #endif
 
 #if wxUSE_STATLINE
 
 #include "wx/generic/choicdgg.h"
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
 #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),
+// ----------------------------------------------------------------------------
+// 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);
+    wxString choice;
     if ( dialog.ShowModal() == wxID_OK )
-        return dialog.GetStringSelection();
-    else
-        return wxT("");
+        choice = dialog.GetStringSelection();
+
+    return choice;
 }
 
-// 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,
+                            const wxArrayString& aChoices,
+                            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 *choices;
+    int n = ConvertWXArrayToC(aChoices, &choices);
+    wxString res = wxGetSingleChoice(message, caption, n, choices, parent,
+                                     x, y, centre, width, height);
+    delete [] choices;
+
+    return res;
 }
 
-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,
+                            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 )
-        return dialog.GetSelection();
+        choice = dialog.GetSelection();
     else
-        return -1;
+        choice = -1;
+
+    return choice;
 }
 
-// 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,
+                            const wxArrayString& aChoices,
+                            wxWindow *parent,
+                            int x, int y,
+                            bool centre,
+                            int width, int height)
 {
-    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;
+    wxString *choices;
+    int n = ConvertWXArrayToC(aChoices, &choices);
+    int res = wxGetSingleChoiceIndex(message, caption, n, choices, parent,
+                                     x, y, centre, width, height);
+    delete [] choices;
+
+    return res;
 }
 
-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) )
+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);
+    wxSingleChoiceDialog dialog(parent, message, caption, n, choices,
+                                (char **)client_data);
+    void *data;
     if ( dialog.ShowModal() == wxID_OK )
-        return dialog.GetSelectionClientData();
+        data = dialog.GetSelectionClientData();
     else
-        return NULL;
+        data = NULL;
+
+    return data;
 }
 
-// Overloaded for backward compatibility
-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 )
+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 *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;
+    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;
 }
 
+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 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;
+}
+
+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);
+}
+
+// ----------------------------------------------------------------------------
 // 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()
 
-IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
-#endif
-
-#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
-
+IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
 
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,
@@ -184,9 +316,7 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            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);
 }
@@ -194,89 +324,52 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,
                                            const wxString& caption,
-                                           const wxStringList& choices,
+                                           const wxArrayString& 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, 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;
-}
-
-bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
+bool wxSingleChoiceDialog::Create( wxWindow *parent,
                                    const wxString& message,
-                                   const wxString& WXUNUSED(caption),
+                                   const wxString& caption,
                                    int n,
                                    const wxString *choices,
                                    char **clientData,
                                    long style,
-                                   const wxPoint& WXUNUSED(pos) )
+                                   const wxPoint& pos )
 {
-    m_selection = 0;
+    if ( !wxAnyChoiceDialog::Create(parent, message, caption,
+                                    n, choices,
+                                    style, pos) )
+        return FALSE;
 
-    m_dialogStyle = style;
+    m_selection = n > 0 ? 0 : -1;
 
-    wxBeginBusyCursor();
-    
-    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, wxSize(160,100) , 
-                                        n, choices, wxLB_ALWAYS_SB );
-    m_listbox->SetSelection( m_selection );
     if (clientData)
     {
         for (int i = 0; i < n; i++)
             m_listbox->SetClientData(i, clientData[i]);
     }
-    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();
-
-    wxEndBusyCursor();
 
     return TRUE;
 }
 
+bool wxSingleChoiceDialog::Create( wxWindow *parent,
+                                   const wxString& message,
+                                   const wxString& caption,
+                                   const wxArrayString& choices,
+                                   char **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)
 {
@@ -290,7 +383,6 @@ void wxSingleChoiceDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     m_stringSelection = m_listbox->GetStringSelection();
     if ( m_listbox->HasClientUntypedData() )
         SetClientData(m_listbox->GetClientData(m_selection));
-
     EndModal(wxID_OK);
 }
 
@@ -298,9 +390,68 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
 {
     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;
+}
+
+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)
+{
+    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