More asserts and stuff

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 0ff03ba0b005f262e934298343eb518bebb54033..017151f3633208c2031a7e01ca68a7adbe3514a9 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -100,9 +100,9 @@ wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption,
                    int WXUNUSED(x), int WXUNUSED(y), bool WXUNUSED(centre),
                    int WXUNUSED(width), int WXUNUSED(height) )
 {
                    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);

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

-        return dialog.GetSelectionClientData();
+        return (wxChar *)dialog.GetSelectionClientData();

     else
         return NULL;
 }
     else
         return NULL;
 }


@@ -186,7 +186,7 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,
                                            const wxString& caption,
                                            const wxStringList& choices,
                                            const wxString& message,
                                            const wxString& caption,
                                            const wxStringList& choices,

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

                                            long style,
                                            const wxPoint& pos)
                     : wxDialog(parent, -1, caption, pos, wxDefaultSize,
                                            long style,
                                            const wxPoint& pos)
                     : wxDialog(parent, -1, caption, pos, wxDefaultSize,