diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-04-24 08:24:19 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-04-24 08:24:19 +0000 |
| commit | b5888320e2d6e03217c8fda8cb61a6ae76ea0ff1 (patch) | |
| tree | 03aaa053d465abba1c1d89a6d2b2ca159c973e63 /src | |
| parent | skip recursion into clone's children in stroke adjustment; fix paint adjuster... (diff) | |
| download | inkscape-b5888320e2d6e03217c8fda8cb61a6ae76ea0ff1.tar.gz inkscape-b5888320e2d6e03217c8fda8cb61a6ae76ea0ff1.zip | |
Added base icon support to combo box presentation
(bzr r2955)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ege-select-one-action.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/ege-select-one-action.cpp b/src/ege-select-one-action.cpp index 0f1d410ca..0bf1a3fc9 100644 --- a/src/ege-select-one-action.cpp +++ b/src/ege-select-one-action.cpp @@ -46,6 +46,7 @@ #include <gtk/gtktoolitem.h> #include <gtk/gtkcombobox.h> #include <gtk/gtkcellrenderertext.h> +#include <gtk/gtkcellrendererpixbuf.h> #include <gtk/gtkcelllayout.h> #include <gtk/gtkradioaction.h> #include <gtk/gtkradiomenuitem.h> @@ -566,9 +567,19 @@ GtkWidget* create_tool_item( GtkAction* action ) GtkWidget* holder = gtk_table_new( 1, 3, FALSE ); GtkWidget* normal = gtk_combo_box_new_with_model( act->private_data->model ); - GtkCellRenderer * renderer = gtk_cell_renderer_text_new(); + GtkCellRenderer * renderer = 0; + + if ( act->private_data->iconColumn >= 0 ) { + renderer = gtk_cell_renderer_pixbuf_new(); + gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(normal), renderer, TRUE ); + + // "icon-name" + gtk_cell_layout_add_attribute( GTK_CELL_LAYOUT(normal), renderer, "stock-id", act->private_data->iconColumn ); + } + + renderer = gtk_cell_renderer_text_new(); gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(normal), renderer, TRUE ); - gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT(normal), renderer, "text", act->private_data->labelColumn, (gchar*)0); + gtk_cell_layout_add_attribute( GTK_CELL_LAYOUT(normal), renderer, "text", act->private_data->labelColumn ); gtk_combo_box_set_active( GTK_COMBO_BOX(normal), act->private_data->active ); |