X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bc4102d7ba31a8b8680d980aaac34bfdea5e52..d8c5974799b29e0a0382ffca9c9db9377581bbd4:/src/gtk1/choice.cpp

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 5874c0fd6a..6eef00f624 100644
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -73,6 +73,18 @@ wxChoice::wxChoice()
     m_strings = (wxSortedArrayString *)NULL;
 }
 
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+                       const wxPoint &pos, const wxSize &size,
+                       const wxArrayString& choices,
+                       long style, const wxValidator& validator,
+                       const wxString &name )
+{
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                   style, validator, name );
+}
+
 bool wxChoice::Create( wxWindow *parent, wxWindowID id,
                        const wxPoint &pos, const wxSize &size,
                        int n, const wxString choices[],
@@ -111,14 +123,10 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     m_parent->DoAddChild( this );
 
     PostCreation();
-
-    SetFont( parent->GetFont() );
+    InheritAttributes();
 
     SetBestSize(size);
 
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-
     Show( TRUE );
 
     return TRUE;
@@ -346,11 +354,33 @@ int wxChoice::GetSelection() const
 #endif
 }
 
-void wxChoice::SetString( int WXUNUSED(n), const wxString& WXUNUSED(string) )
+void wxChoice::SetString( int n, const wxString& str )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
 
-    wxFAIL_MSG(wxT("not implemented"));
+    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+    int count = 0;
+    GList *child = menu_shell->children;
+    while (child)
+    {
+        GtkBin *bin = GTK_BIN( child->data );
+        if (count == n)
+        {
+            GtkLabel *label = (GtkLabel *) NULL;
+            if (bin->child)
+                label = GTK_LABEL(bin->child);
+            if (!label)
+                label = GTK_LABEL( BUTTON_CHILD(m_widget) );
+
+            wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
+
+            gtk_label_set_text( label, wxGTK_CONV( str ) ); 
+            
+            return;
+        }
+        child = child->next;
+        count++;
+    }
 }
 
 wxString wxChoice::GetString( int n ) const