[gtk+/native-layout: 5/5] Merge branch 'master' into native-layout

[Tristan Van Berkom <tvb src gnome org>]

commit 1d0650f871c9cef960dfb08c07c69f6df1c5965f
Merge: 9d97153 ef25dba
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Fri Jun 25 12:25:28 2010 -0400

    Merge branch 'master' into native-layout
    
    Conflicts:
    	gtk/gtktreeview.c

 docs/reference/gdk/gdk3-sections.txt     |    2 -
 docs/reference/gdk/tmpl/drawing.sgml     |    8 -----
 docs/reference/gtk/tmpl/gtktreeview.sgml |    8 ++++-
 docs/tutorial/gtk-tut.sgml               |    2 -
 gdk/Makefile.am                          |    2 +-
 gdk/gdkdrawable.h                        |    4 --
 gtk/Makefile.am                          |    5 ++-
 gtk/gtktreeview.c                        |   47 +++++++++++++++++++++--------
 8 files changed, 46 insertions(+), 32 deletions(-)
---
diff --cc gtk/gtktreeview.c
index 18be081,22d25ab..e00abab
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@@ -465,20 -465,16 +465,25 @@@ static GtkTreeViewColumn *gtk_tree_view
  							 GtkTreeViewColumn *column,
  							 gint               drop_position);
  
- /* GtkBuildable */
- static void gtk_tree_view_buildable_add_child (GtkBuildable *tree_view,
- 					       GtkBuilder  *builder,
- 					       GObject     *child,
- 					       const gchar *type);
- static void gtk_tree_view_buildable_init      (GtkBuildableIface *iface);
++/* GtkSizeRequest */
 +static void gtk_tree_view_size_request_init   (GtkSizeRequestIface *iface);
 +static void gtk_tree_view_get_width           (GtkSizeRequest *widget,
 +					       gint           *minimum_size,
 +					       gint           *natural_size);
 +static void gtk_tree_view_get_height          (GtkSizeRequest *widget,
 +					       gint           *minimum_size,
 +					       gint           *natural_size);
 +
+ /* GtkBuildable */
+ static void     gtk_tree_view_buildable_add_child          (GtkBuildable      *tree_view,
+ 							    GtkBuilder        *builder,
+ 							    GObject           *child,
+ 							    const gchar       *type);
+ static GObject *gtk_tree_view_buildable_get_internal_child (GtkBuildable      *buildable,
+ 							    GtkBuilder        *builder,
+ 							    const gchar       *childname);
+ static void     gtk_tree_view_buildable_init               (GtkBuildableIface *iface);
+ 
  
  static gboolean scroll_row_timeout                   (gpointer     data);
  static void     add_scroll_timeout                   (GtkTreeView *tree_view);