callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fontchooser: Store tree model member variables as GtkTreeModel

Browse Source 
... and remove the now unnecessary treemodel casts everywhere.

Just code cleanup.
This commit is contained in:
Benjamin Otte
2011-09-20 17:07:44 +02:00
parent 3d87ee7716
commit 6499088f7f
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkfontchooserwidget.c
View File

@ -81,7 +81,7 @@ struct _GtkFontChooserWidgetPrivate
GtkWidget *list_scrolled_window; GtkWidget *list_scrolled_window;
GtkWidget *empty_list; GtkWidget *empty_list;
GtkWidget *list_notebook; GtkWidget *list_notebook;
GtkListStore *model; GtkTreeModel *model;
GtkTreeModel *filter_model; GtkTreeModel *filter_model;
GtkWidget *preview; GtkWidget *preview;
@ -379,13 +379,13 @@ cursor_changed_cb (GtkTreeView *treeview,
if (!path) if (!path)
return; return;
if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->filter_model), &iter, path)) if (!gtk_tree_model_get_iter (priv->filter_model, &iter, path))
{ {
gtk_tree_path_free (path); gtk_tree_path_free (path);
return; return;
} }
gtk_tree_model_get (GTK_TREE_MODEL (priv->filter_model), &iter, gtk_tree_model_get (priv->filter_model, &iter,
FACE_COLUMN, &face, FACE_COLUMN, &face,
FAMILY_COLUMN, &family, FAMILY_COLUMN, &family,
-1); -1);
@ -787,19 +787,19 @@ gtk_font_chooser_widget_bootstrap_fontlist (GtkFontChooserWidget *fontchooser)
GtkCellRenderer *cell; GtkCellRenderer *cell;
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
priv->model = gtk_list_store_new (4, priv->model = GTK_TREE_MODEL (gtk_list_store_new (4,
PANGO_TYPE_FONT_FAMILY, PANGO_TYPE_FONT_FAMILY,
PANGO_TYPE_FONT_FACE, PANGO_TYPE_FONT_FACE,
PANGO_TYPE_FONT_DESCRIPTION, PANGO_TYPE_FONT_DESCRIPTION,
G_TYPE_STRING); G_TYPE_STRING));
priv->filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (priv->model), NULL); priv->filter_model = gtk_tree_model_filter_new (priv->model, NULL);
g_object_unref (priv->model); g_object_unref (priv->model);
gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->filter_model), gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->filter_model),
visible_func, (gpointer)priv, NULL); visible_func, (gpointer)priv, NULL);
gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (priv->filter_model)); gtk_tree_view_set_model (treeview, priv->filter_model);
g_object_unref (priv->filter_model); g_object_unref (priv->filter_model);
gtk_tree_view_set_rules_hint (treeview, TRUE); gtk_tree_view_set_rules_hint (treeview, TRUE);
@ -855,11 +855,11 @@ gtk_font_chooser_widget_find_font (GtkFontChooserWidget *fontchooser,
PangoFontDescription *desc; PangoFontDescription *desc;
gboolean valid; gboolean valid;
for (valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->model), iter); for (valid = gtk_tree_model_get_iter_first (priv->model, iter);
valid; valid;
valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->model), iter)) valid = gtk_tree_model_iter_next (priv->model, iter))
{ {
gtk_tree_model_get (GTK_TREE_MODEL (priv->model), iter, gtk_tree_model_get (priv->model, iter,
FACE_COLUMN, face, FACE_COLUMN, face,
FAMILY_COLUMN, family, FAMILY_COLUMN, family,
FONT_DESC_COLUMN, &desc, FONT_DESC_COLUMN, &desc,
@ -1007,7 +1007,7 @@ gtk_font_chooser_widget_select_font (GtkFontChooserWidget *fontchooser)
&filter_iter, &filter_iter,
&iter)) &iter))
{ {
GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->filter_model), &filter_iter); GtkTreePath *path = gtk_tree_model_get_path (priv->filter_model, &filter_iter);
gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->family_face_list), gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->family_face_list),
path, path,
NULL, NULL,