X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57dde4bd5860cda4666326b611f535dfc28139f2..d9ea011f4d7f66c9728593c5ee10ce2c34964545:/src/gtk1/choicdlg.cpp diff --git a/src/gtk1/choicdlg.cpp b/src/gtk1/choicdlg.cpp index ee63996e06..b9d9c5b24c 100644 --- a/src/gtk1/choicdlg.cpp +++ b/src/gtk1/choicdlg.cpp @@ -138,7 +138,7 @@ wxChar *wxGetSingleChoiceData( const wxString& message, const wxString& caption, { wxSingleChoiceDialog dialog(parent, message, caption, n, choices, client_data); if ( dialog.ShowModal() == wxID_OK ) - return dialog.GetSelectionClientData(); + return (wxChar *)dialog.GetSelectionClientData(); else return NULL; } @@ -248,9 +248,9 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& m int y = message_size.y + 15; - int listbox_height = wxMin( 160, n*20 ); + int listbox_height = 150; - wxListBox *listBox = new wxListBox( this, wxID_LISTBOX, wxPoint(10, y), wxSize(240, listbox_height), + wxListBox *listBox = new wxListBox( this, wxID_LISTBOX, wxPoint(10, y), wxSize(360, listbox_height), n, choices, wxLB_ALWAYS_SB ); listBox->SetSelection( m_selection ); if (clientData)