X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b8e857f8877a1c02a83b6eb18e6528e2c8eb7e4..8a31648287be0ef976f133de2786b137f1e98340:/src/gtk/choice.cpp?ds=sidebyside diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 8f25aa9632..d9fc4408c7 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -9,7 +9,7 @@ #include "wx/wxprec.h" -#if wxUSE_CHOICE +#if wxUSE_CHOICE || wxUSE_COMBOBOX #include "wx/choice.h" @@ -17,64 +17,31 @@ #include "wx/arrstr.h" #endif -// FIXME: We use GtkOptionMenu which has been deprecated since GTK+ 2.3.0 in -// favour of GtkComboBox. -// Later use GtkComboBox if GTK+ runtime version is new enough. -#include -#if defined(GTK_DISABLE_DEPRECATED) && GTK_CHECK_VERSION(2,3,0) -#undef GTK_DISABLE_DEPRECATED -#endif - #include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// data -//----------------------------------------------------------------------------- - -extern bool g_blockEventsOnDrag; -//----------------------------------------------------------------------------- -// "activate" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// GTK callbacks +// ---------------------------------------------------------------------------- extern "C" { -static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) -{ - if (!choice->m_hasVMT) return; - - if (g_blockEventsOnDrag) return; - - int selection = wxNOT_FOUND; - - selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) ); - - choice->m_selection_hack = selection; - - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() ); - int n = choice->GetSelection(); - - event.SetInt( n ); - event.SetString( choice->GetStringSelection() ); - event.SetEventObject(choice); - - if ( choice->HasClientObjectData() ) - event.SetClientObject( choice->GetClientObject(n) ); - else if ( choice->HasClientUntypedData() ) - event.SetClientData( choice->GetClientData(n) ); - choice->HandleWindowEvent(event); +static void +gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) +{ + choice->SendSelectionChangedEvent(wxEVT_COMMAND_CHOICE_SELECTED); } + } //----------------------------------------------------------------------------- // wxChoice //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) - -wxChoice::wxChoice() +void wxChoice::Init() { - m_strings = (wxSortedArrayString *)NULL; + m_strings = NULL; + m_stringCellIndex = 0; } bool wxChoice::Create( wxWindow *parent, wxWindowID id, @@ -92,7 +59,8 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, 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 ) + long style, const wxValidator& validator, + const wxString &name ) { if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) @@ -101,82 +69,87 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, return false; } - m_widget = gtk_option_menu_new(); - if ( IsSorted() ) { // if our m_strings != NULL, Append() will check for it and insert // items in the correct order - m_strings = new wxSortedArrayString; + m_strings = new wxGtkCollatedArrayString; } - // If we have items, GTK will choose the first item by default - m_selection_hack = n > 0 ? 0 : wxNOT_FOUND; - - GtkWidget *menu = gtk_menu_new(); - - for (unsigned int i = 0; i < (unsigned int)n; i++) - { - GtkAddHelper(menu, i, choices[i]); - } + m_widget = gtk_combo_box_new_text(); + g_object_ref(m_widget); - gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); + Append(n, choices); m_parent->DoAddChild( this ); PostCreation(size); - SetInitialSize(size); // need this too because this is a wxControlWithItems - // workaround for bug in gtk_option_menu_set_history(), it causes - // gtk_widget_size_allocate() to be called with the current - // widget->allocation values, which will be zero if a proper - // size_allocate has not occured yet - m_widget->allocation.width = m_width; - m_widget->allocation.height = m_height; + g_signal_connect_after (m_widget, "changed", + G_CALLBACK (gtk_choice_changed_callback), this); return true; } wxChoice::~wxChoice() { - Clear(); - delete m_strings; } +void wxChoice::SendSelectionChangedEvent(wxEventType evt_type) +{ + if (!m_hasVMT) + return; + + if (GetSelection() == -1) + return; + + wxCommandEvent event( evt_type, GetId() ); + + int n = GetSelection(); + event.SetInt( n ); + event.SetString( GetStringSelection() ); + event.SetEventObject( this ); + InitCommandEventWithItems( event, n ); + + HandleWindowEvent( event ); +} + +void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) +{ + gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) ); +} + int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, unsigned int pos, void **clientData, wxClientDataType type) { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") ); - const unsigned int count = items.GetCount(); + wxASSERT_MSG( !IsSorted() || (pos == GetCount()), + wxT("In a sorted choice data could only be appended")); - GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); + const int count = items.GetCount(); - for ( unsigned int i = 0; i < count; ++i, ++pos ) + int n = wxNOT_FOUND; + + for ( int i = 0; i < count; ++i ) { - int n = GtkAddHelper(menu, pos, items[i]); - if ( n == wxNOT_FOUND ) - return n; + n = pos + i; + // If sorted, use this wxSortedArrayStrings to determine + // the right insertion point + if (m_strings) + n = m_strings->Add(items[i]); - AssignNewItemClientData(n, clientData, i, type); - } + GTKInsertComboBoxTextItem( n, items[i] ); - // if the item to insert is at or before the selection, and the selection is valid - if (((int)pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND)) - { - // move the selection forward - m_selection_hack += count; + m_clientData.Insert( NULL, n ); + AssignNewItemClientData(n, clientData, i, type); } - // We must set the selection so that it can be read back even if - // the user has not modified it since GTK+ will then select the - // first item so well return 0. - if ((count > 0) && (m_selection_hack==wxNOT_FOUND)) - m_selection_hack = 0; + InvalidateBestSize(); - return pos - 1; + return n; } void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) @@ -191,337 +164,223 @@ void* wxChoice::DoGetItemClientData(unsigned int n) const void wxChoice::DoClear() { - wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - 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 ); + GTKDisableEvents(); + + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + GtkTreeModel* model = gtk_combo_box_get_model( combobox ); + gtk_list_store_clear(GTK_LIST_STORE(model)); m_clientData.Clear(); - if ( m_strings ) + if (m_strings) m_strings->Clear(); - // begin with no selection - m_selection_hack = wxNOT_FOUND; + GTKEnableEvents(); + + InvalidateBestSize(); } void wxChoice::DoDeleteOneItem(unsigned int n) { - wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); - wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") ); - - // if the item to delete is before the selection, and the selection is valid - if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND)) - { - // move the selection back one - m_selection_hack--; - } - else if ((int)n == m_selection_hack) - { - // invalidate the selection - m_selection_hack = wxNOT_FOUND; - } - - // VZ: apparently GTK+ doesn't have a built-in function to do it (not even - // in 2.0), hence this dumb implementation -- still better than nothing - const unsigned int count = GetCount(); - - wxArrayString items; - wxArrayPtrVoid itemsData; - items.Alloc(count - 1); - itemsData.Alloc(count - 1); - for ( unsigned i = 0; i < count; i++ ) - { - if ( i != n ) - { - items.Add(GetString(i)); - itemsData.Add(m_clientData[i]); - } - } - - wxChoice::DoClear(); + wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); + wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") ); + + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + GtkTreeModel* model = gtk_combo_box_get_model( combobox ); + GtkListStore* store = GTK_LIST_STORE(model); + GtkTreeIter iter; + gtk_tree_model_iter_nth_child( model, &iter, + NULL, (gint) n ); + gtk_list_store_remove( store, &iter ); + + m_clientData.RemoveAt( n ); + if ( m_strings ) + m_strings->RemoveAt( n ); - if ( count > 1 ) - { - void ** const data = &itemsData[0]; - if ( HasClientObjectData() ) - Append(items, wx_reinterpret_cast(wxClientData **, data)); - else - Append(items, data); - } - //else: the control is now empty, nothing to append + InvalidateBestSize(); } -int wxChoice::FindString( const wxString &string, bool bCase ) const +int wxChoice::FindString( const wxString &item, bool bCase ) const { - wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") ); - - // If you read this code once and you think you understand - // it, then you are very wrong. Robert Roebling. - - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid control") ); + + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + GtkTreeModel* model = gtk_combo_box_get_model( combobox ); + GtkTreeIter iter; + gtk_tree_model_get_iter_first( model, &iter ); + if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter )) + return -1; int count = 0; - GList *child = menu_shell->children; - while (child) + do { - GtkBin *bin = GTK_BIN( child->data ); - GtkLabel *label = (GtkLabel *) NULL; - if (bin->child) - label = GTK_LABEL(bin->child); - if (!label) - label = GTK_LABEL(GTK_BIN(m_widget)->child); + GValue value = { 0, }; + gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value ); + wxString str = wxGTK_CONV_BACK( g_value_get_string( &value ) ); + g_value_unset( &value ); - wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); - - wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) ); - if (string.IsSameAs( tmp, bCase )) + if (item.IsSameAs( str, bCase ) ) return count; - child = child->next; count++; } + while ( gtk_tree_model_iter_next(model, &iter) ); return wxNOT_FOUND; } int wxChoice::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") ); - - return m_selection_hack; - + return gtk_combo_box_get_active( GTK_COMBO_BOX( m_widget ) ); } -void wxChoice::SetString(unsigned int n, const wxString& str) +void wxChoice::SetString(unsigned int n, const wxString &text) { - wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); - - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - unsigned 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(GTK_BIN(m_widget)->child); + wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + wxCHECK_RET( IsValid(n), wxT("invalid index") ); - gtk_label_set_text( label, wxGTK_CONV( str ) ); - - InvalidateBestSize(); - - return; - } - child = child->next; - count++; + GtkTreeModel *model = gtk_combo_box_get_model( combobox ); + GtkTreeIter iter; + if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) + { + GValue value = { 0, }; + g_value_init( &value, G_TYPE_STRING ); + g_value_set_string( &value, wxGTK_CONV( text ) ); + gtk_list_store_set_value( GTK_LIST_STORE(model), &iter, m_stringCellIndex, &value ); + g_value_unset( &value ); } + + InvalidateBestSize(); } wxString wxChoice::GetString(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid choice") ); - - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - unsigned 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(GTK_BIN(m_widget)->child); + wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid control") ); - wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); + wxString str; - return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) ); - } - child = child->next; - count++; + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + GtkTreeModel *model = gtk_combo_box_get_model( combobox ); + GtkTreeIter iter; + if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n)) + { + GValue value = { 0, }; + gtk_tree_model_get_value( model, &iter, m_stringCellIndex, &value ); + wxString tmp = wxGTK_CONV_BACK( g_value_get_string( &value ) ); + g_value_unset( &value ); + return tmp; } - wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") ); - - return wxEmptyString; + return str; } unsigned int wxChoice::GetCount() const { - wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") ); - - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - unsigned int count = 0; - GList *child = menu_shell->children; - while (child) - { - count++; - child = child->next; - } - return count; + wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid control") ); + + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + GtkTreeModel* model = gtk_combo_box_get_model( combobox ); + GtkTreeIter iter; + gtk_tree_model_get_iter_first( model, &iter ); + if (!gtk_list_store_iter_is_valid(GTK_LIST_STORE(model), &iter )) + return 0; + unsigned int ret = 1; + while (gtk_tree_model_iter_next( model, &iter )) + ret++; + return ret; } void wxChoice::SetSelection( int n ) { - wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid control") ); - int tmp = n; - gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); + GTKDisableEvents(); - // set the local selection variable manually - if ((n >= 0) && ((unsigned int)n < GetCount())) - { - // a valid selection has been made - m_selection_hack = n; - } - else if ((n == wxNOT_FOUND) || (GetCount() == 0)) - { - // invalidates the selection if there are no items - // or if it is specifically set to wxNOT_FOUND - m_selection_hack = wxNOT_FOUND; - } - else - { - // this selects the first item by default if the selection is out of bounds - m_selection_hack = 0; - } + GtkComboBox* combobox = GTK_COMBO_BOX( m_widget ); + gtk_combo_box_set_active( combobox, n ); + + GTKEnableEvents(); } -void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) +void wxChoice::SetColumns(int n) { - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - - gtk_widget_modify_style( m_widget, style ); - gtk_widget_modify_style( GTK_WIDGET( menu_shell ), style ); - - GList *child = menu_shell->children; - while (child) - { - gtk_widget_modify_style( GTK_WIDGET( child->data ), style ); - - GtkBin *bin = GTK_BIN( child->data ); - GtkWidget *label = (GtkWidget *) NULL; - if (bin->child) - label = bin->child; - if (!label) - label = GTK_BIN(m_widget)->child; - - gtk_widget_modify_style( label, style ); - - child = child->next; - } + gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n); } -int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item) +int wxChoice::GetColumns() const { - wxCHECK_MSG(pos<=m_clientData.GetCount(), -1, wxT("invalid index")); - - GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) ); - - if ( m_strings ) - { - // sorted control, need to insert at the correct index - pos = m_strings->Add(item); - } - - // don't call wxChoice::GetCount() from here because it doesn't work - // if we're called from ctor (and GtkMenuShell is still NULL) - if (pos == m_clientData.GetCount()) - gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item ); - else - gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos ); - - m_clientData.Insert( NULL, pos ); - - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_realize( menu_item ); - gtk_widget_realize( GTK_BIN(menu_item)->child ); + // gtk_combo_box_get_wrap_width() was added in gtk 2.6 + gint intval; + g_object_get(G_OBJECT(m_widget), "wrap-width", &intval, NULL); + return intval; +} - ApplyWidgetStyle(); - } - // The best size of a wxChoice should probably - // be changed everytime the control has been - // changed, but at least after adding an item - // it has to change. Adapted from Matt Ownby. - InvalidateBestSize(); +void wxChoice::GTKDisableEvents() +{ + g_signal_handlers_block_by_func(m_widget, + (gpointer) gtk_choice_changed_callback, this); +} - g_signal_connect_after (menu_item, "activate", - G_CALLBACK (gtk_choice_clicked_callback), - this); +void wxChoice::GTKEnableEvents() +{ + g_signal_handlers_unblock_by_func(m_widget, + (gpointer) gtk_choice_changed_callback, this); +} - gtk_widget_show( menu_item ); - // return the index of the item in the control - return pos; +GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const +{ + return gtk_widget_get_window(m_widget); } +// Notice that this method shouldn't be necessary, because GTK calculates +// properly size of the combobox but for unknown reasons it doesn't work +// correctly in wx without this. wxSize wxChoice::DoGetBestSize() const { + // strangely, this returns a width of 188 pixels from GTK+ (?) wxSize ret( wxControl::DoGetBestSize() ); // we know better our horizontal extent: it depends on the longest string - // we have - ret.x = 0; + // in the combobox if ( m_widget ) { + ret.x = GetCount() > 0 ? 0 : 60; // start with something "sensible" int width; unsigned int count = GetCount(); for ( unsigned int n = 0; n < count; n++ ) { - GetTextExtent( GetString(n), &width, NULL, NULL, NULL ); - if ( width > ret.x ) - ret.x = width; + GetTextExtent(GetString(n), &width, NULL, NULL, NULL ); + if ( width + 40 > ret.x ) // 40 for drop down arrow and space around text + ret.x = width + 40; } - - // add extra for the choice "=" button - - // VZ: I don't know how to get the right value, it seems to be in - // GtkOptionMenuProps struct from gtkoptionmenu.c but we can't get - // to it - maybe we can use gtk_option_menu_size_request() for this - // somehow? - // - // This default value works only for the default GTK+ theme (i.e. - // no theme at all) (FIXME) - static const int widthChoiceIndicator = 35; - ret.x += widthChoiceIndicator; } - // but not less than the minimal width - if ( ret.x < 80 ) + // empty combobox should have some reasonable default size too + if ((GetCount() == 0) && (ret.x < 80)) ret.x = 80; - // If this request_size is called with no entries then - // the returned height is wrong. Give it a reasonable - // default value. - if (ret.y <= 18) - ret.y = 8 + GetCharHeight(); - CacheBestSize(ret); return ret; } -GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const +void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) { - return GTK_BUTTON(m_widget)->event_window; + gtk_widget_modify_style(m_widget, style); + gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style); } + // static wxVisualAttributes wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return GetDefaultAttributesFromGTKWidget(gtk_option_menu_new); + return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new); } -#endif // wxUSE_CHOICE +#endif // wxUSE_CHOICE || wxUSE_COMBOBOX