[gtk+/treeview-refactor: 85/87] Merge branch 'master' into treeview-refactor
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/treeview-refactor: 85/87] Merge branch 'master' into treeview-refactor
- Date: Fri, 17 Dec 2010 06:32:00 +0000 (UTC)
commit 71e7cd0ec407f489549ed045b7e9bfdff8c70c58
Merge: 735fa8b e9a77a1
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Fri Dec 17 15:25:15 2010 +0900
Merge branch 'master' into treeview-refactor
Conflicts:
tests/testtreeedit.c
demos/gtk-demo/assistant.c | 6 +-
demos/gtk-demo/clipboard.c | 6 +-
demos/gtk-demo/combobox.c | 4 +-
demos/gtk-demo/stock_browser.c | 6 +-
demos/gtk-demo/toolpalette.c | 2 +-
docs/reference/gdk/Makefile.am | 3 +-
docs/reference/gdk/gdk-docs.sgml | 1 +
docs/reference/gdk/gdk3-sections.txt | 4 +-
docs/reference/gtk/Makefile.am | 3 +-
docs/reference/gtk/gtk3-sections.txt | 3 +-
docs/reference/gtk/tmpl/gtkdrawingarea.sgml | 49 +-
gdk/Makefile.am | 3 +-
gdk/gdk.c | 16 +-
gdk/gdk.symbols | 6 +-
gdk/gdkdevice.c | 120 ++
gdk/gdkdevice.h | 1 +
gdk/gdkdevicemanager.c | 31 +-
gdk/gdkdeviceprivate.h | 4 +
gdk/gdkdisplay.c | 19 +-
gdk/gdkdnd.c | 37 +
gdk/gdkdnd.h | 2 +
gdk/gdkevents.c | 60 +
gdk/gdkevents.h | 3 +
gdk/gdkglobals.c | 2 +-
gdk/gdkinternals.h | 9 +-
gdk/gdkmain.h | 2 +-
gdk/gdkpoly-generic.h | 291 -----
gdk/gdkwindow.c | 192 +++-
gdk/gdkwindow.h | 6 +
gdk/x11/gdkdevicemanager-x11.c | 2 +-
gdk/x11/gdkdevicemanager-xi2.c | 178 ++-
gdk/x11/gdkdevicemanager-xi2.h | 1 -
gdk/x11/gdkdisplay-x11.c | 2 +-
gdk/x11/gdkmain-x11.c | 2 +-
gdk/x11/gdkwindow-x11.h | 3 +
gtk/gtk.symbols | 1 -
gtk/gtkaboutdialog.c | 541 +++++---
gtk/gtkbuilder.c | 2 +-
gtk/gtkcalendar.c | 10 +-
gtk/gtkcellrendererpixbuf.c | 7 +-
gtk/gtkclipboard.c | 32 +-
gtk/gtkcolorbutton.c | 16 +-
gtk/gtkcolorsel.c | 30 +-
gtk/gtkcomboboxtext.c | 3 +
gtk/gtkcssprovider.c | 60 +-
gtk/gtkdnd-quartz.c | 4 +-
gtk/gtkdnd.c | 106 +-
gtk/gtkentry.c | 240 ++--
gtk/gtkexpander.c | 190 +--
gtk/gtkfilechooserbutton.c | 2 +-
gtk/gtkfilechooserdefault.c | 19 +-
gtk/gtkiconfactory.c | 8 +-
gtk/gtkiconview.c | 10 +-
gtk/gtkimage.c | 28 +-
gtk/gtkinfobar.c | 146 +--
gtk/gtklinkbutton.c | 2 +-
gtk/gtknotebook.c | 554 ++++++---
gtk/gtkprintunixdialog.c | 1 +
gtk/gtkrange.c | 342 +++---
gtk/gtkrc.c | 1848 ---------------------------
gtk/gtkscale.c | 68 +-
gtk/gtkscrollbar.c | 12 +-
gtk/gtksearchenginetracker.c | 571 ++++-----
gtk/gtksizerequest.c | 16 +
gtk/gtkspinbutton.c | 243 ++--
gtk/gtkstatusicon.c | 14 +-
gtk/gtkstylecontext.c | 44 +-
gtk/gtkstylecontext.h | 81 ++-
gtk/gtktextbuffer.c | 27 +-
gtk/gtktextview.c | 163 ++-
gtk/gtkthemingengine.c | 62 +-
gtk/gtkthemingengine.h | 2 +
gtk/gtktoolpalette.c | 30 +-
gtk/gtktrayicon-x11.c | 11 +-
gtk/gtktreednd.c | 10 +-
gtk/gtktreeview.c | 12 +-
gtk/gtkwidget.c | 67 +-
gtk/gtkwidget.h | 12 +-
gtk/gtkwidgetprivate.h | 5 +
modules/input/gtkimcontextxim.c | 35 +-
modules/other/gail/libgail-util/gailmisc.c | 42 +-
po/es.po | 308 +++---
tests/testassistant.c | 6 +-
tests/testcombo.c | 64 +-
tests/testdnd.c | 16 +-
tests/testgtk.c | 10 +-
tests/testiconview-keynav.c | 36 +-
tests/testimage.c | 2 +-
tests/testinput.c | 17 +-
tests/testnotebookdnd.c | 8 +-
tests/testselection.c | 31 +-
tests/testtreeedit.c | 4 +-
92 files changed, 3111 insertions(+), 4199 deletions(-)
---
diff --cc tests/testtreeedit.c
index 8695697,4375691..01e1f2b
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@@ -56,8 -55,7 +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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]