- const wxPoint &pos, const wxSize &size,
- int n, const wxString choices[],
- long style, const wxValidator& validator, const wxString &name )
-{
- m_needParent = TRUE;
-
- PreCreation( parent, id, pos, size, style, name );
-
- SetValidator( validator );
-
- m_widget = gtk_option_menu_new();
-
- wxSize newSize = size;
- if (newSize.x == -1) newSize.x = 80;
- if (newSize.y == -1) newSize.y = 26;
- SetSize( newSize.x, newSize.y );
-
- GtkWidget *menu;
- menu = gtk_menu_new();
-
- for (int i = 0; i < n; i++)
- {
- GtkWidget *item;
- item = gtk_menu_item_new_with_label( choices[i] );
- gtk_signal_connect( GTK_OBJECT( item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
- gtk_menu_append( GTK_MENU(menu), item );
- gtk_widget_show( item );
- }
- gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
-
- PostCreation();
-
- Show( TRUE );
-
- return TRUE;
-}
-
-void wxChoice::Append( const wxString &item )
-{
- GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
- GtkWidget *menu_item;
- menu_item = gtk_menu_item_new_with_label( item );
- gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
- gtk_menu_append( GTK_MENU(menu), menu_item );
- gtk_widget_show( menu_item );
-}
-
-void wxChoice::Clear(void)
-{
- gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) );
- GtkWidget *menu = gtk_menu_new();
- gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
+ const wxPoint &pos, const wxSize &size,
+ int n, const wxString choices[],
+ long style, const wxValidator& validator, const wxString &name )
+{
+ m_needParent = TRUE;
+#if (GTK_MINOR_VERSION > 0)
+ m_acceptsFocus = TRUE;
+#endif
+
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
+ {
+ wxFAIL_MSG( wxT("wxChoice creation failed") );
+ return FALSE;
+ }
+
+ m_widget = gtk_option_menu_new();
+
+ if ( style & wxCB_SORT )
+ {
+ // if our m_strings != NULL, DoAppend() will check for it and insert
+ // items in the correct order
+ m_strings = new wxSortedArrayString;
+ }
+
+ GtkWidget *menu = gtk_menu_new();
+
+ for (int i = 0; i < n; i++)
+ {
+ GtkAppendHelper(menu, choices[i]);
+ }
+
+ gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
+
+ m_parent->DoAddChild( this );
+
+ PostCreation();
+
+ SetFont( parent->GetFont() );
+
+ SetBestSize(size);
+
+ SetBackgroundColour( parent->GetBackgroundColour() );
+ SetForegroundColour( parent->GetForegroundColour() );
+
+ Show( TRUE );
+
+ return TRUE;
+}
+
+wxChoice::~wxChoice()
+{
+ Clear();
+
+ delete m_strings;
+}
+
+int wxChoice::DoAppend( const wxString &item )
+{
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
+
+ GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
+
+ return GtkAppendHelper(menu, item);
+}
+
+void wxChoice::DoSetItemClientData( int n, void* clientData )
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
+
+ wxNode *node = m_clientList.Nth( n );
+ wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );
+
+ node->SetData( (wxObject*) clientData );
+}
+
+void* wxChoice::DoGetItemClientData( int n ) const
+{
+ wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") );
+
+ wxNode *node = m_clientList.Nth( n );
+ wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
+
+ return node->Data();
+}
+
+void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
+
+ wxNode *node = m_clientList.Nth( n );
+ wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
+
+ wxClientData *cd = (wxClientData*) node->Data();
+ delete cd;
+
+ node->SetData( (wxObject*) clientData );
+}
+
+wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+{
+ wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );
+
+ wxNode *node = m_clientList.Nth( n );
+ wxCHECK_MSG( node, (wxClientData *)NULL,
+ wxT("invalid index in wxChoice::DoGetItemClientObject") );
+
+ return (wxClientData*) node->Data();
+}
+
+void wxChoice::Clear()
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+
+ gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) );
+ GtkWidget *menu = gtk_menu_new();
+ gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
+
+ if ( HasClientObjectData() )
+ {
+ // destroy the data (due to Robert's idea of using wxList<wxObject>
+ // and not wxList<wxClientData> we can't just say
+ // m_clientList.DeleteContents(TRUE) - this would crash!
+ wxNode *node = m_clientList.First();
+ while ( node )
+ {
+ delete (wxClientData *)node->Data();
+ node = node->Next();
+ }
+ }
+ m_clientList.Clear();
+
+ if ( m_strings )
+ m_strings->Clear();
+}
+
+void wxChoice::Delete( int WXUNUSED(n) )
+{
+ wxFAIL_MSG( wxT("wxChoice:Delete not implemented") );