wxGTK compilation fixes

[wxWidgets.git] / src / gtk1 / choicdlg.cpp

diff --git a/src/gtk1/choicdlg.cpp b/src/gtk1/choicdlg.cpp
index ee63996e06807499f83b09c29674caf502b3d92b..b9d9c5b24c1c23fa062ca68807389a9dde4d66f1 100644 (file)
--- 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)