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

[Tristan Van Berkom <tvb src gnome org>]

commit 84e2a854ddac6fc77af9da951c8008e452444cc1
Merge: 237d97d 95a1c31
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Tue Jun 29 17:13:19 2010 -0400

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

 autogen.sh                                  |    9 +-
 configure.ac                                |    6 +-
 docs/reference/gdk/Makefile.am              |    1 -
 docs/reference/gdk/gdk3-sections.txt        |   70 -
 docs/reference/gdk/tmpl/fonts.sgml          |  371 ---
 docs/reference/gdk/tmpl/gcs.sgml            |    1 -
 docs/reference/gdk/tmpl/images.sgml         |    9 +
 docs/reference/gdk/tmpl/regions.sgml        |  260 +--
 docs/reference/gdk/tmpl/x_interaction.sgml  |   65 -
 docs/reference/gtk/tmpl/gtkbutton.sgml      |    9 +
 docs/reference/gtk/tmpl/gtkcalendar.sgml    |    3 -
 docs/reference/gtk/tmpl/gtkentry.sgml       |    1 -
 docs/reference/gtk/tmpl/gtkfontseldlg.sgml  |    9 +
 docs/reference/gtk/tmpl/gtkicontheme.sgml   |   13 +
 docs/reference/gtk/tmpl/gtknotebook.sgml    |   22 -
 docs/reference/gtk/tmpl/gtkprogressbar.sgml |   71 +-
 docs/reference/gtk/tmpl/gtktable.sgml       |   10 +
 docs/reference/gtk/tmpl/gtkwindowgroup.sgml |    9 +
 examples/gdk/composited-window-example.c    |    7 +-
 gdk/Makefile.am                             |   10 +-
 gdk/directfb/Makefile.am                    |    1 -
 gdk/directfb/TODO                           |    1 -
 gdk/directfb/gdkdrawable-directfb.c         |   53 +-
 gdk/directfb/gdkfont-directfb.c             |  206 --
 gdk/directfb/gdkgc-directfb.c               |   19 +-
 gdk/directfb/gdkgeometry-directfb.c         |   72 +-
 gdk/directfb/gdkprivate-directfb.h          |   27 +-
 gdk/directfb/gdkwindow-directfb.c           |   32 +-
 gdk/gdk.h                                   |    2 -
 gdk/gdk.symbols                             |   69 -
 gdk/gdkcairo.c                              |   19 +-
 gdk/gdkcairo.h                              |    2 +-
 gdk/gdkdraw.c                               |   28 +-
 gdk/gdkdrawable.h                           |    8 +-
 gdk/gdkevents.c                             |    4 +-
 gdk/gdkevents.h                             |    2 +-
 gdk/gdkfont.c                               |  125 -
 gdk/gdkfont.h                               |   87 -
 gdk/gdkgc.c                                 |   60 +-
 gdk/gdkgc.h                                 |   34 +-
 gdk/gdkinternals.h                          |   51 +-
 gdk/gdkoffscreenwindow.c                    |   14 +-
 gdk/gdkpango.c                              |   24 +-
 gdk/gdkpango.h                              |    4 +-
 gdk/gdkpolyreg-generic.c                    |  624 -----
 gdk/gdkregion-generic.c                     | 1902 --------------
 gdk/gdkregion-generic.h                     |  177 --
 gdk/gdkregion.h                             |  115 -
 gdk/gdktypes.h                              |   13 +-
 gdk/gdkwindow.c                             |  801 +++---
 gdk/gdkwindow.h                             |   16 +-
 gdk/gdkwindowimpl.h                         |   12 +-
 gdk/makefile.msc                            |    5 -
 gdk/quartz/GdkQuartzView.c                  |   14 +-
 gdk/quartz/Makefile.am                      |    1 -
 gdk/quartz/gdkfont-quartz.c                 |   89 -
 gdk/quartz/gdkgc-quartz.c                   |   32 +-
 gdk/quartz/gdkgeometry-quartz.c             |   23 +-
 gdk/quartz/gdkprivate-quartz.h              |    9 +-
 gdk/quartz/gdkwindow-quartz.c               |  135 +-
 gdk/quartz/gdkwindow-quartz.h               |    4 +-
 gdk/win32/Makefile.am                       |    1 -
 gdk/win32/gdkdrawable-win32.c               |   31 +-
 gdk/win32/gdkevents-win32.c                 |   16 +-
 gdk/win32/gdkfont-win32.c                   | 1538 ------------
 gdk/win32/gdkgc-win32.c                     |   56 +-
 gdk/win32/gdkgeometry-win32.c               |   26 +-
 gdk/win32/gdkmain-win32.c                   |    3 +-
 gdk/win32/gdkprivate-win32.h                |   30 +-
 gdk/win32/gdkwindow-win32.c                 |   20 +-
 gdk/win32/makefile.msc                      |    1 -
 gdk/x11/Makefile.am                         |    1 -
 gdk/x11/gdkdnd-x11.c                        |   14 +-
 gdk/x11/gdkdrawable-x11.c                   |   27 +-
 gdk/x11/gdkfont-x11.c                       |  551 ----
 gdk/x11/gdkgc-x11.c                         |   12 +-
 gdk/x11/gdkgeometry-x11.c                   |   41 +-
 gdk/x11/gdkmain-x11.c                       |   25 +-
 gdk/x11/gdkprivate-x11.h                    |    9 +-
 gdk/x11/gdkwindow-x11.c                     |   50 +-
 gdk/x11/gdkx.h                              |   22 -
 gdk/x11/gdkxid.c                            |   11 +-
 gtk/gtkcontainer.c                          |    4 +-
 gtk/gtkfilesystemmodel.c                    |    2 +-
 gtk/gtkfontsel.c                            |   32 -
 gtk/gtkfontsel.h                            |    4 -
 gtk/gtkgc.c                                 |    9 -
 gtk/gtkiconview.c                           |   31 +-
 gtk/gtklabel.c                              |   14 +-
 gtk/gtkmenu.c                               |  183 +-
 gtk/gtkmenu.h                               |    2 +-
 gtk/gtkrange.c                              |    4 +-
 gtk/gtkstyle.c                              |   21 -
 gtk/gtkstyle.h                              |    1 -
 gtk/gtktextdisplay.c                        |   18 +-
 gtk/gtktreeselection.c                      |    2 +-
 gtk/gtktreeview.c                           |   45 +-
 gtk/gtkwidget.c                             |   44 +-
 gtk/gtkwidget.h                             |    4 +-
 po-properties/he.po                         | 3605 ++++++++++++++-------------
 po/he.po                                    | 1704 +++++++-------
 tests/testgtk.c                             |   12 +-
 102 files changed, 3819 insertions(+), 10279 deletions(-)
---
diff --cc gtk/gtktreeview.c
index a04f161,387bdde..3351832
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@@ -4601,20 -4532,9 +4601,20 @@@ gtk_tree_view_bin_expose (GtkWidge
  	      cell_area.height -= grid_line_width;
  	    }
  
 +	  /* Now that we've deduced the real rendering area,
 +	   * do a couple of assertions to make sure we're rendereing
 +	   * a relevant area. 
 +	   */
 +	  if (cell_offset > event->area.x + event->area.width ||
 +	      cell_offset + column->width < event->area.x)
 +	    {
 +	      cell_offset += background_area.width;
 +	      continue;
 +	    }
 +
- 	  if (gdk_region_rect_in (event->region, &background_area) == GDK_OVERLAP_RECTANGLE_OUT)
+ 	  if (cairo_region_contains_rectangle (event->region, &background_area) == CAIRO_REGION_OVERLAP_OUT)
  	    {
 -	      cell_offset += column->width;
 +	      cell_offset += background_area.width;
  	      continue;
  	    }