diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-17 15:25:15 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-17 15:25:15 +0900 |
| commit | 71e7cd0ec407f489549ed045b7e9bfdff8c70c58 (patch) | |
| tree | aab2e74e2a73dcd875eaf2c55509186ac362461c /tests/testtreeedit.c | |
| parent | 735fa8b1976e3bbe045e5365d42f0d67007e5293 (diff) | |
| parent | e9a77a153501dd5f1ecf1726f23afac0229eed61 (diff) | |
| download | gtk+-71e7cd0ec407f489549ed045b7e9bfdff8c70c58.tar.gz | |
Merge branch 'master' into treeview-refactor
Conflicts:
tests/testtreeedit.c
Diffstat (limited to 'tests/testtreeedit.c')
| -rw-r--r-- | tests/testtreeedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c index 86956975d4..01e1f2bbe7 100644 --- a/tests/testtreeedit.c +++ b/tests/testtreeedit.c @@ -56,8 +56,8 @@ create_model (void) GtkWidget *blah; blah = gtk_window_new (GTK_WINDOW_TOPLEVEL); - foo = gtk_widget_render_icon (blah, GTK_STOCK_NEW, GTK_ICON_SIZE_MENU, NULL); - bar = gtk_widget_render_icon (blah, GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU, NULL); + foo = gtk_widget_render_icon_pixbuf (blah, GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); + bar = gtk_widget_render_icon_pixbuf (blah, GTK_STOCK_DELETE, GTK_ICON_SIZE_MENU); gtk_widget_destroy (blah); model = gtk_tree_store_new (NUM_COLUMNS, |