X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6538e2c55535a747aec939d0f6659f91bc623d4..e86f2cc84aabc8a58b1984c1ed7fb9475f6abe67:/src/gtk/choice.cpp?ds=sidebyside diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 81d2380a01..8f25aa9632 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: choice.cpp +// Name: src/gtk/choice.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,24 +7,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "choice.h" -#endif +#if wxUSE_CHOICE #include "wx/choice.h" -#if wxUSE_CHOICE - -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +// 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 -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // data @@ -36,30 +37,56 @@ extern bool g_blockEventsOnDrag; // "activate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) { - if (g_isIdle) - wxapp_install_idle_handler(); - 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() ); - event.SetInt( choice->GetSelection() ); + int n = choice->GetSelection(); + + event.SetInt( n ); event.SetString( choice->GetStringSelection() ); event.SetEventObject(choice); - choice->GetEventHandler()->ProcessEvent(event); + + if ( choice->HasClientObjectData() ) + event.SetClientObject( choice->GetClientObject(n) ); + else if ( choice->HasClientUntypedData() ) + event.SetClientData( choice->GetClientData(n) ); + + choice->HandleWindowEvent(event); +} } //----------------------------------------------------------------------------- // wxChoice //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems) 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, @@ -67,162 +94,168 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, 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; + return false; } 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 = gtk_menu_new(); - - for (int i = 0; i < n; i++) + if ( IsSorted() ) { - m_clientList.Append( (wxObject*) NULL ); + // if our m_strings != NULL, Append() will check for it and insert + // items in the correct order + m_strings = new wxSortedArrayString; + } - GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() ); - gtk_menu_append( GTK_MENU(menu), item ); + // If we have items, GTK will choose the first item by default + m_selection_hack = n > 0 ? 0 : wxNOT_FOUND; - gtk_widget_show( item ); + GtkWidget *menu = gtk_menu_new(); - gtk_signal_connect( GTK_OBJECT( item ), "activate", - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); + for (unsigned int i = 0; i < (unsigned int)n; i++) + { + GtkAddHelper(menu, i, choices[i]); } + gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); + PostCreation(size); + SetInitialSize(size); // need this too because this is a wxControlWithItems - Show( TRUE ); + // 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; - return TRUE; + return true; } wxChoice::~wxChoice() { Clear(); + + delete m_strings; } -int wxChoice::DoAppend( const wxString &item ) +int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, + unsigned int pos, + void **clientData, wxClientDataType type) { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") ); - GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); - GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() ); + const unsigned int count = items.GetCount(); - gtk_menu_append( GTK_MENU(menu), menu_item ); + GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); - if (GTK_WIDGET_REALIZED(m_widget)) + for ( unsigned int i = 0; i < count; ++i, ++pos ) { - gtk_widget_realize( menu_item ); - gtk_widget_realize( GTK_BIN(menu_item)->child ); + int n = GtkAddHelper(menu, pos, items[i]); + if ( n == wxNOT_FOUND ) + return n; - if (m_widgetStyle) ApplyWidgetStyle(); + AssignNewItemClientData(n, clientData, i, type); } - gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); - - gtk_widget_show( menu_item ); + // 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_clientList.Append( (wxObject*) NULL ); + // 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; - // return the index of the item in the control - return GetCount() - 1; + return pos - 1; } -void wxChoice::DoSetClientData( int n, void* clientData ) +void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - wxNode *node = m_clientList.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientData") ); - - node->SetData( (wxObject*) clientData ); + m_clientData[n] = clientData; } -void* wxChoice::DoGetClientData( int n ) const +void* wxChoice::DoGetItemClientData(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); - - wxNode *node = m_clientList.Nth( n ); - wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetClientData") ); - - return node->Data(); + return m_clientData[n]; } -void wxChoice::DoSetClientObject( int n, wxClientData* clientData ) +void wxChoice::DoClear() { - wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); - - wxNode *node = m_clientList.Nth( n ); - wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientObject") ); + wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); - wxClientData *cd = (wxClientData*) node->Data(); - delete cd; + 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 ); - node->SetData( (wxObject*) clientData ); -} + m_clientData.Clear(); -wxClientData* wxChoice::DoGetClientObject( int n ) const -{ - wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid combobox") ); + if ( m_strings ) + m_strings->Clear(); - wxNode *node = m_clientList.Nth( n ); - wxCHECK_MSG( node, (wxClientData *)NULL, - wxT("invalid index in wxChoice::DoGetClientObject") ); - - return (wxClientData*) node->Data(); + // begin with no selection + m_selection_hack = wxNOT_FOUND; } -void wxChoice::Clear() +void wxChoice::DoDeleteOneItem(unsigned int n) { wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); + wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") ); - 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 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(); - if (m_clientDataItemsType == ClientData_Object) + wxArrayString items; + wxArrayPtrVoid itemsData; + items.Alloc(count - 1); + itemsData.Alloc(count - 1); + for ( unsigned i = 0; i < count; i++ ) { - wxNode *node = m_clientList.First(); - while (node) + if ( i != n ) { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); - } + items.Add(GetString(i)); + itemsData.Add(m_clientData[i]); + } } - m_clientList.Clear(); -} -void wxChoice::Delete( int WXUNUSED(n) ) -{ - wxFAIL_MSG( wxT("wxChoice:Delete not implemented") ); + wxChoice::DoClear(); + + 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 } -int wxChoice::FindString( const wxString &string ) const +int wxChoice::FindString( const wxString &string, bool bCase ) const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") ); + 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. @@ -234,45 +267,69 @@ int wxChoice::FindString( const wxString &string ) const { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = (GtkLabel *) NULL; - if (bin->child) label = GTK_LABEL(bin->child); - if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child ); + if (bin->child) + label = GTK_LABEL(bin->child); + if (!label) + label = GTK_LABEL(GTK_BIN(m_widget)->child); wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); - if (string == wxString(label->label,*wxConvCurrent)) - return count; + wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) ); + if (string.IsSameAs( tmp, bCase )) + return count; - child = child->next; - count++; + child = child->next; + count++; } - return -1; + return wxNOT_FOUND; } int wxChoice::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") ); + wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") ); + + return m_selection_hack; + +} + +void wxChoice::SetString(unsigned int n, const wxString& str) +{ + wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - int count = 0; + unsigned int count = 0; GList *child = menu_shell->children; while (child) { GtkBin *bin = GTK_BIN( child->data ); - if (!bin->child) return count; + 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); + + wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); + + gtk_label_set_text( label, wxGTK_CONV( str ) ); + + InvalidateBestSize(); + + return; + } child = child->next; count++; } - - return -1; } -wxString wxChoice::GetString( int n ) const +wxString wxChoice::GetString(unsigned int n) const { - wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") ); + 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) ) ); - int count = 0; + unsigned int count = 0; GList *child = menu_shell->children; while (child) { @@ -280,12 +337,14 @@ wxString wxChoice::GetString( int n ) const if (count == n) { GtkLabel *label = (GtkLabel *) NULL; - if (bin->child) label = GTK_LABEL(bin->child); - if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child ); + if (bin->child) + label = GTK_LABEL(bin->child); + if (!label) + label = GTK_LABEL(GTK_BIN(m_widget)->child); wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); - return wxString(label->label,*wxConvCurrent); + return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) ); } child = child->next; count++; @@ -293,15 +352,15 @@ wxString wxChoice::GetString( int n ) const wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") ); - return wxT(""); + return wxEmptyString; } -int wxChoice::GetCount() const +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) ) ); - int count = 0; + unsigned int count = 0; GList *child = menu_shell->children; while (child) { @@ -317,61 +376,152 @@ void wxChoice::SetSelection( int n ) int tmp = n; gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); + + // 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; + } } -void wxChoice::DisableEvents() +void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style) { -/* 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_signal_disconnect_by_func( GTK_OBJECT( child->data ), - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); + 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; } -*/ } -void wxChoice::EnableEvents() +int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item) { -/* - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - GList *child = menu_shell->children; - while (child) + 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 ) { - gtk_signal_connect( GTK_OBJECT( child->data ), "activate", - GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); + // sorted control, need to insert at the correct index + pos = m_strings->Add(item); + } - child = child->next; + // 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 ); + + 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(); + + g_signal_connect_after (menu_item, "activate", + G_CALLBACK (gtk_choice_clicked_callback), + this); + + gtk_widget_show( menu_item ); + + // return the index of the item in the control + return pos; } -void wxChoice::ApplyWidgetStyle() +wxSize wxChoice::DoGetBestSize() const { - SetWidgetStyle(); + wxSize ret( wxControl::DoGetBestSize() ); - GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); + // we know better our horizontal extent: it depends on the longest string + // we have + ret.x = 0; + if ( m_widget ) + { + 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; + } - gtk_widget_set_style( m_widget, m_widgetStyle ); - gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle ); + // 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; + } - GList *child = menu_shell->children; - while (child) - { - gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle ); + // but not less than the minimal width + if ( ret.x < 80 ) + ret.x = 80; - GtkBin *bin = GTK_BIN( child->data ); - GtkWidget *label = (GtkWidget *) NULL; - if (bin->child) label = bin->child; - if (!label) label = GTK_BUTTON(m_widget)->child; + // 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(); - gtk_widget_set_style( label, m_widgetStyle ); + CacheBestSize(ret); + return ret; +} - child = child->next; - } +GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const +{ + return GTK_BUTTON(m_widget)->event_window; } -#endif +// static +wxVisualAttributes +wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_option_menu_new); +} + + +#endif // wxUSE_CHOICE