X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50f1fb9226d9260454ccb9c8a67d0be23c2827f..23aa4f09d26bd1eb5df7f7170276744a293cbe19:/src/generic/choicdgg.cpp diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index 0ff03ba0b0..017151f363 100644 --- 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) ) { - wxSingleChoiceDialog dialog(parent, message, caption, n, choices, client_data); + wxSingleChoiceDialog dialog(parent, message, caption, n, choices, (char **)client_data); if ( dialog.ShowModal() == wxID_OK ) - return dialog.GetSelectionClientData(); + return (wxChar *)dialog.GetSelectionClientData(); else return NULL; } @@ -186,7 +186,7 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, const wxStringList& choices, - wxChar **clientData, + char **clientData, long style, const wxPoint& pos) : wxDialog(parent, -1, caption, pos, wxDefaultSize,