diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-08-07 22:21:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-08-07 22:21:25 +0000 |
| commit | f82ca65b81d2200ba34a5d4ae70e522895bae342 (patch) | |
| tree | c93c78a9cadee6ea620edf64909251eca4fc8143 /gtk/gtkfilechooserdefault.c | |
| parent | 5f7fbb27c243c651dfecee5f9be22e1a6800e7b0 (diff) | |
| download | gtk+-f82ca65b81d2200ba34a5d4ae70e522895bae342.tar.gz | |
Use GtkTreeViewRowSeparatorFunc instead of GtkCellRendererSepText.
Sat Aug 7 18:19:03 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkfilechooserdefault.c (save_folder_combo_create):
(shortcuts_list_create): Use GtkTreeViewRowSeparatorFunc
instead of GtkCellRendererSepText. (#147864)
* gtk/gtkcellrendererseptext.[hc]: Removed.
* gtk/Makefile.am: Remove gtkcellrendererseptext.[hc]
Sat Aug 7 18:15:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_menu_row_deleted):
(gtk_combo_box_menu_row_inserted):
(gtk_combo_box_menu_row_changed): Correctly handle
insertion and deletion of separators in menu mode.
Diffstat (limited to 'gtk/gtkfilechooserdefault.c')
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 7564d28784..f17362f3f9 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -25,7 +25,7 @@ #include "gtkbutton.h" #include "gtkcelllayout.h" #include "gtkcellrendererpixbuf.h" -#include "gtkcellrendererseptext.h" +#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h" #include "gtkcheckmenuitem.h" #include "gtkcombobox.h" @@ -2546,6 +2546,24 @@ shortcuts_selection_changed_cb (GtkTreeSelection *selection, bookmarks_check_remove_sensitivity (impl); } +static gboolean +shortcuts_row_separator_func (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + gint column = GPOINTER_TO_INT (data); + gchar *text; + + gtk_tree_model_get (model, iter, column, &text, -1); + + if (!text) + return TRUE; + + g_free (text); + + return FALSE; +} + /* Creates the widgets for the shortcuts and bookmarks tree */ static GtkWidget * shortcuts_list_create (GtkFileChooserDefault *impl) @@ -2630,12 +2648,17 @@ shortcuts_list_create (GtkFileChooserDefault *impl) "visible", SHORTCUTS_COL_PIXBUF_VISIBLE, NULL); - renderer = _gtk_cell_renderer_sep_text_new (); + renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_attributes (column, renderer, "text", SHORTCUTS_COL_NAME, NULL); + gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), + shortcuts_row_separator_func, + GINT_TO_POINTER (SHORTCUTS_COL_NAME), + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), column); return swin; @@ -3094,13 +3117,18 @@ save_folder_combo_create (GtkFileChooserDefault *impl) "sensitive", SHORTCUTS_COL_PIXBUF_VISIBLE, NULL); - cell = _gtk_cell_renderer_sep_text_new (); + cell = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell, "text", SHORTCUTS_COL_NAME, "sensitive", SHORTCUTS_COL_PIXBUF_VISIBLE, NULL); + gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo), + shortcuts_row_separator_func, + GINT_TO_POINTER (SHORTCUTS_COL_NAME), + NULL); + g_signal_connect (combo, "changed", G_CALLBACK (save_folder_combo_changed_cb), impl); |