/////////////////////////////////////////////////////////////////////////////
-// Name: choice.cpp
+// Name: src/gtk/choice.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+#include "wx/wxprec.h"
-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+#if wxUSE_CHOICE || wxUSE_COMBOBOX
#include "wx/choice.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#ifndef WX_PRECOMP
+ #include "wx/arrstr.h"
+#endif
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
-extern bool g_blockEventsOnDrag;
+// ----------------------------------------------------------------------------
+// GTK callbacks
+// ----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-// "activate"
-//-----------------------------------------------------------------------------
+extern "C" {
-static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
+static void
+gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
{
- if (!choice->HasVMT())
- return;
-
- if (g_blockEventsOnDrag)
- return;
+ choice->SendSelectionChangedEvent(wxEVT_CHOICE);
+}
- wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
- event.SetInt( choice->GetSelection() );
- event.SetString( choice->GetStringSelection() );
- event.SetEventObject(choice);
- choice->GetEventHandler()->ProcessEvent(event);
}
//-----------------------------------------------------------------------------
// wxChoice
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
-
-wxChoice::wxChoice()
+void wxChoice::Init()
{
+ m_strings = NULL;
+ m_stringCellIndex = 0;
}
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 )
+ const wxArrayString& choices,
+ long style, const wxValidator& validator,
+ const wxString &name )
{
- m_needParent = TRUE;
-#if (GTK_MINOR_VERSION > 0)
- m_acceptsFocus = TRUE;
-#endif
+ wxCArrayString chs(choices);
- 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 = gtk_menu_new();
+ return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name );
+}
- for (int i = 0; i < n; i++)
+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 )
+{
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, validator, name ))
{
- m_clientDataList.Append( (wxObject*) NULL );
- m_clientObjectList.Append( (wxObject*) NULL );
-
- GtkWidget *item = gtk_menu_item_new_with_label( choices[i] );
- gtk_menu_append( GTK_MENU(menu), item );
-
- gtk_widget_realize( item );
- gtk_widget_realize( GTK_BIN(item)->child );
-
- gtk_widget_show( item );
+ wxFAIL_MSG( wxT("wxChoice creation failed") );
+ return false;
+ }
- gtk_signal_connect( GTK_OBJECT( item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+ if ( IsSorted() )
+ {
+ // if our m_strings != NULL, Append() will check for it and insert
+ // items in the correct order
+ m_strings = new wxGtkCollatedArrayString;
}
- gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
- m_parent->AddChild( this );
+#ifdef __WXGTK3__
+ m_widget = gtk_combo_box_text_new();
+#else
+ m_widget = gtk_combo_box_new_text();
+#endif
+ g_object_ref(m_widget);
- (m_parent->m_insertCallback)( m_parent, this );
+ Append(n, choices);
- PostCreation();
+ m_parent->DoAddChild( this );
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
- SetFont( parent->GetFont() );
+ PostCreation(size);
- Show( TRUE );
+ g_signal_connect_after (m_widget, "changed",
+ G_CALLBACK (gtk_choice_changed_callback), this);
- return TRUE;
+ return true;
}
wxChoice::~wxChoice()
{
- Clear();
+ delete m_strings;
}
-void wxChoice::AppendCommon( const wxString &item )
+void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text )
{
- wxCHECK_RET( m_widget != NULL, "invalid choice" );
-
- GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
- GtkWidget *menu_item = gtk_menu_item_new_with_label( item );
-
- gtk_menu_append( GTK_MENU(menu), menu_item );
-
- gtk_widget_realize( menu_item );
- gtk_widget_realize( GTK_BIN(menu_item)->child );
-
- if (m_widgetStyle) ApplyWidgetStyle();
-
- gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-
- gtk_widget_show( menu_item );
+#ifdef __WXGTK3__
+ gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(m_widget), n, wxGTK_CONV(text));
+#else
+ gtk_combo_box_insert_text( GTK_COMBO_BOX( m_widget ), n, wxGTK_CONV( text ) );
+#endif
}
-void wxChoice::Append( const wxString &item )
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type)
{
- m_clientDataList.Append( (wxObject*) NULL );
- m_clientObjectList.Append( (wxObject*) NULL );
+ wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") );
- AppendCommon( item );
-}
+ wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
+ wxT("In a sorted choice data could only be appended"));
-void wxChoice::Append( const wxString &item, void *clientData )
-{
- m_clientDataList.Append( (wxObject*) clientData );
- m_clientObjectList.Append( (wxObject*) NULL );
+ const int count = items.GetCount();
- AppendCommon( item );
-}
+ int n = wxNOT_FOUND;
-void wxChoice::Append( const wxString &item, wxClientData *clientData )
-{
- m_clientObjectList.Append( (wxObject*) clientData );
- m_clientDataList.Append( (wxObject*) NULL );
+ for ( int i = 0; i < count; ++i )
+ {
+ n = pos + i;
+ // If sorted, use this wxSortedArrayStrings to determine
+ // the right insertion point
+ if (m_strings)
+ n = m_strings->Add(items[i]);
- AppendCommon( item );
-}
+ GTKInsertComboBoxTextItem( n, items[i] );
-void wxChoice::SetClientData( int n, void* clientData )
-{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ m_clientData.Insert( NULL, n );
+ AssignNewItemClientData(n, clientData, i, type);
+ }
- wxNode *node = m_clientDataList.Nth( n );
- if (!node) return;
+ InvalidateBestSize();
- node->SetData( (wxObject*) clientData );
+ return n;
}
-void* wxChoice::GetClientData( int n )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
{
- wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
-
- wxNode *node = m_clientDataList.Nth( n );
- if (!node) return NULL;
+ m_clientData[n] = clientData;
+}
- return node->Data();
+void* wxChoice::DoGetItemClientData(unsigned int n) const
+{
+ return m_clientData[n];
}
-void wxChoice::SetClientObject( int n, wxClientData* clientData )
+void wxChoice::DoClear()
{
- wxCHECK_RET( m_widget != NULL, "invalid combobox" );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- wxNode *node = m_clientObjectList.Nth( n );
- if (!node) return;
+ GTKDisableEvents();
- wxClientData *cd = (wxClientData*) node->Data();
- if (cd) delete cd;
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ GtkTreeModel* model = gtk_combo_box_get_model( combobox );
+ gtk_list_store_clear(GTK_LIST_STORE(model));
- node->SetData( (wxObject*) clientData );
-}
+ m_clientData.Clear();
-wxClientData* wxChoice::GetClientObject( int n )
-{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, "invalid combobox" );
+ if (m_strings)
+ m_strings->Clear();
- wxNode *node = m_clientObjectList.Nth( n );
- if (!node) return (wxClientData*) NULL;
+ GTKEnableEvents();
- return (wxClientData*) node->Data();
+ InvalidateBestSize();
}
-void wxChoice::Clear()
+void wxChoice::DoDeleteOneItem(unsigned int n)
{
- wxCHECK_RET( m_widget != NULL, "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 );
-
- wxNode *node = m_clientObjectList.First();
- while (node)
+ 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;
+ if ( !gtk_tree_model_iter_nth_child(model, &iter, NULL, n) )
{
- wxClientData *cd = (wxClientData*)node->Data();
- if (cd) delete cd;
- node = node->Next();
+ // This is really not supposed to happen for a valid index.
+ wxFAIL_MSG(wxS("Item unexpectedly not found."));
+ return;
}
- m_clientObjectList.Clear();
+ gtk_list_store_remove( store, &iter );
- m_clientDataList.Clear();
-}
+ m_clientData.RemoveAt( n );
+ if ( m_strings )
+ m_strings->RemoveAt( n );
-void wxChoice::Delete( int WXUNUSED(n) )
-{
- wxFAIL_MSG( "wxChoice:Delete not implemented" );
+ InvalidateBestSize();
}
-int wxChoice::FindString( const wxString &string ) const
+int wxChoice::FindString( const wxString &item, bool bCase ) const
{
- wxCHECK_MSG( m_widget != NULL, -1, "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_BUTTON(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 , "wxChoice: invalid label" );
+ if (item.IsSameAs( str, bCase ) )
+ return count;
- if (string == label->label)
- return count;
-
- child = child->next;
- count++;
+ count++;
}
+ while ( gtk_tree_model_iter_next(model, &iter) );
- return -1;
+ return wxNOT_FOUND;
}
-int wxChoice::GetColumns() const
+int wxChoice::GetSelection() const
{
- return 1;
+ return gtk_combo_box_get_active( GTK_COMBO_BOX( m_widget ) );
}
-int wxChoice::GetSelection()
+void wxChoice::SetString(unsigned int n, const wxString &text)
{
- wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- 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)
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ wxCHECK_RET( IsValid(n), wxT("invalid index") );
+
+ GtkTreeModel *model = gtk_combo_box_get_model( combobox );
+ GtkTreeIter iter;
+ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, n))
{
- GtkBin *bin = GTK_BIN( child->data );
- if (!bin->child) return count;
- child = child->next;
- count++;
+ 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 );
}
- wxFAIL_MSG( "wxChoice: no selection" );
-
- return -1;
+ InvalidateBestSize();
}
-wxString wxChoice::GetString( int n ) const
+wxString wxChoice::GetString(unsigned int n) const
{
- wxCHECK_MSG( m_widget != NULL, "", "invalid choice" );
+ wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid control") );
- 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)
+ wxString str;
+
+ 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))
{
- 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_BUTTON(m_widget)->child );
-
- wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
-
- return label->label;
- }
- child = child->next;
- count++;
+ 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( "wxChoice: invalid index in GetString()" );
+ return str;
+}
- return "";
+unsigned int wxChoice::GetCount() const
+{
+ 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;
}
-wxString wxChoice::GetStringSelection() const
+void wxChoice::SetSelection( int n )
{
- wxCHECK_MSG( m_widget != NULL, "", "invalid choice" );
+ wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
- GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
+ GTKDisableEvents();
- wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
+ GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
+ gtk_combo_box_set_active( combobox, n );
- return label->label;
+ GTKEnableEvents();
}
-int wxChoice::Number() const
+void wxChoice::SetColumns(int n)
{
- wxCHECK_MSG( m_widget != NULL, 0, "invalid choice" );
-
- 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)
- {
- count++;
- child = child->next;
- }
- return count;
+ gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n);
}
-void wxChoice::SetColumns( int WXUNUSED(n) )
+int wxChoice::GetColumns() const
{
+ // 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;
}
-void wxChoice::SetSelection( int n )
+void wxChoice::GTKDisableEvents()
{
- wxCHECK_RET( m_widget != NULL, "invalid choice" );
-
- int tmp = n;
- gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
+ g_signal_handlers_block_by_func(m_widget,
+ (gpointer) gtk_choice_changed_callback, this);
+}
- gtk_choice_clicked_callback( (GtkWidget *) NULL, this );
+void wxChoice::GTKEnableEvents()
+{
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer) gtk_choice_changed_callback, this);
}
-void wxChoice::SetStringSelection( const wxString &string )
+GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
- wxCHECK_RET( m_widget != NULL, "invalid choice" );
+ return gtk_widget_get_window(m_widget);
+}
- int n = FindString( string );
- if (n != -1) SetSelection( n );
+wxSize wxChoice::DoGetBestSize() const
+{
+ // Get the height of the control from GTK+ itself, but use our own version
+ // to compute the width large enough to show all our strings as GTK+
+ // doesn't seem to take the control contents into account.
+ return GetSizeFromTextSize(wxChoiceBase::DoGetBestSize().x);
}
-void wxChoice::ApplyWidgetStyle()
+wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const
{
- SetWidgetStyle();
+ wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") );
- GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+ // a GtkEntry for wxComboBox and a GtkCellView for wxChoice
+ GtkWidget* childPart = gtk_bin_get_child(GTK_BIN(m_widget));
- gtk_widget_set_style( m_widget, m_widgetStyle );
- gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle );
+ // Set a as small as possible size for the control, so preferred sizes
+ // return "natural" sizes, not taking into account the previous ones (which
+ // seems to be GTK+3 behaviour)
+ gtk_widget_set_size_request(m_widget, 0, 0);
- GList *child = menu_shell->children;
- while (child)
- {
- gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle );
+ // We are interested in the difference of sizes between the whole contol
+ // and its child part. I.e. arrow, separators, etc.
+ GtkRequisition req;
+ gtk_widget_get_preferred_size(childPart, NULL, &req);
+ wxSize totalS = GTKGetPreferredSize(m_widget);
- GtkBin *bin = GTK_BIN( child->data );
- GtkWidget *label = (GtkWidget *) NULL;
- if (bin->child) label = bin->child;
- if (!label) label = GTK_BUTTON(m_widget)->child;
+ wxSize tsize(xlen + totalS.x - req.width, totalS.y);
- gtk_widget_set_style( label, m_widgetStyle );
+ // For a wxChoice, not for wxComboBox, add some margins
+ if ( !GTK_IS_ENTRY(childPart) )
+ tsize.IncBy(5, 0);
- child = child->next;
- }
+ // Perhaps the user wants something different from CharHeight
+ if ( ylen > 0 )
+ tsize.IncBy(0, ylen - GetCharHeight());
+
+ return tsize;
+}
+
+void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+ GTKApplyStyle(m_widget, style);
+ GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
+}
+
+// static
+wxVisualAttributes
+wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new());
}
+#endif // wxUSE_CHOICE || wxUSE_COMBOBOX
projects / wxWidgets.git / blobdiff