A little clarification

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 1c270386e120e460b73a7b3ac9b6860d9ce9e21a..960619d89357b5c2df8afec0e8d66d875ee6097f 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -13,7 +13,7 @@
 // declarations
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "choicdgg.h"
 #endif
 
@@ -39,6 +39,7 @@
     #include "wx/stattext.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"
+    #include "wx/arrstr.h"
 #endif
 
 #if wxUSE_STATLINE
@@ -118,28 +119,6 @@ wxString wxGetSingleChoice( const wxString& message,
     return res;
 }
 
-#if WXWIN_COMPATIBILITY_2
-// Overloaded for backward compatibility
-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;
-}
-#endif // WXWIN_COMPATIBILITY_2
-
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,
                             int n, const wxString *choices,
@@ -175,25 +154,6 @@ int wxGetSingleChoiceIndex( const wxString& message,
     return res;
 }
 
-#if WXWIN_COMPATIBILITY_2
-// 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 )
-{
-    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,
@@ -233,30 +193,6 @@ void *wxGetSingleChoiceData( const wxString& message,
     return res;
 }
 
-#if WXWIN_COMPATIBILITY_2
-// 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 )
-{
-    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,
@@ -302,6 +238,22 @@ size_t wxGetMultipleChoices(wxArrayInt& selections,
 // wxAnyChoiceDialog
 // ----------------------------------------------------------------------------
 
+wxAnyChoiceDialog::wxAnyChoiceDialog()
+{
+}
+
+wxAnyChoiceDialog::wxAnyChoiceDialog(wxWindow *parent,
+                                     const wxString& message,
+                                     const wxString& caption,
+                                     int n,
+                                     const wxString *choices,
+                                     long styleDlg,
+                                     const wxPoint& pos,
+                                     long styleLbox)
+{
+    (void)Create(parent, message, caption, n, choices, styleDlg, pos, styleLbox);
+}
+
 bool wxAnyChoiceDialog::Create(wxWindow *parent,
                                const wxString& message,
                                const wxString& caption,
@@ -360,52 +312,23 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
 
-wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
-                                           const wxString& message,
-                                           const wxString& caption,
-                                           int n,
-                                           const wxString *choices,
-                                           char **clientData,
-                                           long style,
-                                           const wxPoint& WXUNUSED(pos))
+wxSingleChoiceDialog::wxSingleChoiceDialog()
 {
-    Create(parent, message, caption, n, choices, clientData, style);
+    m_selection = -1;
 }
 
-#if WXWIN_COMPATIBILITY_2
-
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,
                                            const wxString& caption,
-                                           const wxStringList& choices,
+                                           int n,
+                                           const wxString *choices,
                                            char **clientData,
                                            long style,
                                            const wxPoint& WXUNUSED(pos))
 {
-    Create(parent, message, caption, choices, clientData, style);
-}
-
-bool wxSingleChoiceDialog::Create(wxWindow *parent,
-                                  const wxString& message,
-                                  const wxString& caption,
-                                  const wxStringList& choices,
-                                  char **clientData,
-                                  long style,
-                                  const wxPoint& pos)
-{
-    wxString *strings = new wxString[choices.Number()];
-    int i;
-    for ( i = 0; i < choices.Number(); i++)
-    {
-        strings[i] = (char *)choices.Nth(i)->Data();
-    }
-    bool ans = Create(parent, message, caption, choices.Number(), strings, clientData, style, pos);
-    delete[] strings;
-    return ans;
+    Create(parent, message, caption, n, choices, clientData, style);
 }
 
-#endif // WXWIN_COMPATIBILITY_2
-
 bool wxSingleChoiceDialog::Create( wxWindow *parent,
                                    const wxString& message,
                                    const wxString& caption,
@@ -464,6 +387,21 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event))
 
 IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog)
 
+wxMultiChoiceDialog::wxMultiChoiceDialog()
+{
+}
+
+wxMultiChoiceDialog::wxMultiChoiceDialog(wxWindow *parent,
+                                         const wxString& message,
+                                         const wxString& caption,
+                                         int n,
+                                         const wxString *choices,
+                                         long style,
+                                         const wxPoint& pos)
+{
+    (void)Create(parent, message, caption, n, choices, style, pos);
+}
+
 bool wxMultiChoiceDialog::Create( wxWindow *parent,
                                   const wxString& message,
                                   const wxString& caption,