interface additions (mostly for new generic/toolwin)

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

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 4e6b969ccc1daa5cae15e17d6cce9b83c56d381a..f2c529666a9ab7ede46b8efeb89ba9f24c13926e 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -45,10 +45,11 @@ wxString wxGetSingleChoice( const wxString& message, const wxString& caption, in
                             int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
+    wxString choice;
     if ( dialog.ShowModal() == wxID_OK )
-        return dialog.GetStringSelection();
-    else
-        return wxT("");
+        choice = dialog.GetStringSelection();
+
+    return choice;
 }
 
 // Overloaded for backward compatibility
@@ -75,10 +76,13 @@ int wxGetSingleChoiceIndex( const wxString& message, const wxString& caption, in
                 int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
+    int choice;
     if ( dialog.ShowModal() == wxID_OK )
-        return dialog.GetSelection();
+        choice = dialog.GetSelection();
     else
-        return -1;
+        choice = -1;
+
+    return choice;
 }
 
 // Overloaded for backward compatibility
@@ -102,10 +106,13 @@ void *wxGetSingleChoiceData( const wxString& message, const wxString& caption, i
                    int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices, (char **)client_data);
+    void *data;
     if ( dialog.ShowModal() == wxID_OK )
-        return dialog.GetSelectionClientData();
+        data = dialog.GetSelectionClientData();
     else
-        return NULL;
+        data = NULL;
+
+    return data;
 }
 
 // Overloaded for backward compatibility
@@ -235,14 +242,14 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
     m_dialogStyle = style;
 
     wxBeginBusyCursor();
-    
+
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );
-    
+
     // 2) list box
-    m_listbox = new wxListBox( this, wxID_LISTBOX, wxDefaultPosition, wxSize(160,100) , 
+    m_listbox = new wxListBox( this, wxID_LISTBOX, wxDefaultPosition, wxSize(160,100) ,
                                         n, choices, wxLB_ALWAYS_SB );
     m_listbox->SetSelection( m_selection );
     if (clientData)
@@ -262,7 +269,7 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent),
 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );
-    
+
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );