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

move the ITALIC_COLUMN over to a STYLE_COLUMN which sets the style

Browse Source 
2006-08-17  Kristian Rietveld  <kris@gtk.org>

	* demos/gtk-demo/main.c (window_closed_cb), (row_activated_cb),
	(create_tree): move the ITALIC_COLUMN over to a STYLE_COLUMN
	which sets the style attribute.  Makes drawing the active demos
	in italic work again.
This commit is contained in:
Kristian Rietveld
2006-08-16 23:32:07 +00:00
committed by Kristian Rietveld
parent f50e3bbb47
commit 8b999165bd
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-08-17 Kristian Rietveld <kris@gtk.org>
* demos/gtk-demo/main.c (window_closed_cb), (row_activated_cb),
(create_tree): move the ITALIC_COLUMN over to a STYLE_COLUMN
which sets the style attribute. Makes drawing the active demos
in italic work again.
2006-08-16 Matthias Clasen <mclasen@redhat.com> 2006-08-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_base_init): Add some * gtk/gtktreemodel.c (gtk_tree_model_base_init): Add some

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2006-08-17 Kristian Rietveld <kris@gtk.org>
* demos/gtk-demo/main.c (window_closed_cb), (row_activated_cb),
(create_tree): move the ITALIC_COLUMN over to a STYLE_COLUMN
which sets the style attribute. Makes drawing the active demos
in italic work again.
2006-08-16 Matthias Clasen <mclasen@redhat.com> 2006-08-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_base_init): Add some * gtk/gtktreemodel.c (gtk_tree_model_base_init): Add some

28
demos/gtk-demo/main.c
View File

@ -19,7 +19,7 @@ enum {
TITLE_COLUMN, TITLE_COLUMN,
FILENAME_COLUMN, FILENAME_COLUMN,
FUNC_COLUMN, FUNC_COLUMN,
ITALIC_COLUMN, STYLE_COLUMN,
NUM_COLUMNS NUM_COLUMNS
}; };
@ -94,15 +94,15 @@ window_closed_cb (GtkWidget *window, gpointer data)
{ {
CallbackData *cbdata = data; CallbackData *cbdata = data;
GtkTreeIter iter; GtkTreeIter iter;
gboolean italic; PangoStyle style;
gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path); gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter, gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
ITALIC_COLUMN, &italic, STYLE_COLUMN, &style,
-1); -1);
if (italic) if (style == PANGO_STYLE_ITALIC)
gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter, gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
ITALIC_COLUMN, !italic, STYLE_COLUMN, PANGO_STYLE_NORMAL,
-1); -1);
gtk_tree_path_free (cbdata->path); gtk_tree_path_free (cbdata->path);
@ -586,7 +586,7 @@ row_activated_cb (GtkTreeView *tree_view,
GtkTreeViewColumn *column) GtkTreeViewColumn *column)
{ {
GtkTreeIter iter; GtkTreeIter iter;
gboolean italic; PangoStyle style;
GDoDemoFunc func; GDoDemoFunc func;
GtkWidget *window; GtkWidget *window;
GtkTreeModel *model; GtkTreeModel *model;
@ -597,14 +597,14 @@ row_activated_cb (GtkTreeView *tree_view,
gtk_tree_model_get (GTK_TREE_MODEL (model), gtk_tree_model_get (GTK_TREE_MODEL (model),
&iter, &iter,
FUNC_COLUMN, &func, FUNC_COLUMN, &func,
ITALIC_COLUMN, &italic, STYLE_COLUMN, &style,
-1); -1);
if (func) if (func)
{ {
gtk_tree_store_set (GTK_TREE_STORE (model), gtk_tree_store_set (GTK_TREE_STORE (model),
&iter, &iter,
ITALIC_COLUMN, !italic, STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
-1); -1);
window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view))); window = (func) (gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
@ -700,7 +700,7 @@ create_tree (void)
Demo *d = testgtk_demos; Demo *d = testgtk_demos;
model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN); model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_INT);
tree_view = gtk_tree_view_new (); tree_view = gtk_tree_view_new ();
gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model)); gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (model));
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
@ -723,7 +723,7 @@ create_tree (void)
TITLE_COLUMN, d->title, TITLE_COLUMN, d->title,
FILENAME_COLUMN, d->filename, FILENAME_COLUMN, d->filename,
FUNC_COLUMN, d->func, FUNC_COLUMN, d->func,
ITALIC_COLUMN, FALSE, STYLE_COLUMN, PANGO_STYLE_NORMAL,
-1); -1);
d++; d++;
@ -742,7 +742,7 @@ create_tree (void)
TITLE_COLUMN, children->title, TITLE_COLUMN, children->title,
FILENAME_COLUMN, children->filename, FILENAME_COLUMN, children->filename,
FUNC_COLUMN, children->func, FUNC_COLUMN, children->func,
ITALIC_COLUMN, FALSE, STYLE_COLUMN, PANGO_STYLE_NORMAL,
-1); -1);
children++; children++;
@ -751,14 +751,10 @@ create_tree (void)
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
g_object_set (cell,
"style", PANGO_STYLE_ITALIC,
NULL);
column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)", column = gtk_tree_view_column_new_with_attributes ("Widget (double click for demo)",
cell, cell,
"text", TITLE_COLUMN, "text", TITLE_COLUMN,
"style_set", ITALIC_COLUMN, "style", STYLE_COLUMN,
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),