- 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;
+ 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[],
+ 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;
+ }
+
+ // begin with no selection
+ m_selection_hack = wxNOT_FOUND;
+
+ GtkWidget *menu = gtk_menu_new();
+
+ for (int i = 0; i < n; i++)
+ {
+ GtkAddHelper(menu, i, choices[i]);
+ }
+
+ gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
+
+ m_parent->DoAddChild( this );
+
+ PostCreation(size);
+ SetBestSize(size); // need this too because this is a wxControlWithItems
+
+ 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 GtkAddHelper(menu, GetCount(), item);
+}
+
+int wxChoice::DoInsert( const wxString &item, int pos )
+{
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
+ wxCHECK_MSG( (pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+
+ if (pos == GetCount())
+ return DoAppend(item);
+
+ GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
+
+ // if the item to insert is at or before the selection, and the selection is valid
+ if ((pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
+ {
+ // move the selection forward one
+ m_selection_hack++;
+ }
+
+ return GtkAddHelper(menu, pos, item);
+}
+
+void wxChoice::DoSetItemClientData( int n, void* clientData )
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
+
+ wxList::compatibility_iterator node = m_clientList.Item( 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") );
+
+ wxList::compatibility_iterator node = m_clientList.Item( n );
+ wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
+
+ return node->GetData();
projects / wxWidgets.git / blobdiff