[gtk+/gtk-2-22] menu: replace gdk_draw_drawable() call with Cairo equivalent

[Benjamin Otte <otte src gnome org>]

commit 6740d24bb8e0fa240a670363697fc731fe761697
Author: Benjamin Otte <otte redhat com>
Date:   Wed Jul 14 21:56:15 2010 +0200

    menu: replace gdk_draw_drawable() call with Cairo equivalent

 gtk/gtkmenu.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 174aa03..9a9ff38 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1345,16 +1345,11 @@ gtk_menu_tearoff_bg_copy (GtkMenu *menu)
   if (menu->torn_off)
     {
       GdkPixmap *pixmap;
-      GdkGC *gc;
-      GdkGCValues gc_values;
+      cairo_t *cr;
 
       menu->tearoff_active = FALSE;
       menu->saved_scroll_offset = menu->scroll_offset;
       
-      gc_values.subwindow_mode = GDK_INCLUDE_INFERIORS;
-      gc = gdk_gc_new_with_values (widget->window,
-				   &gc_values, GDK_GC_SUBWINDOW);
-      
       gdk_drawable_get_size (menu->tearoff_window->window, &width, &height);
       
       pixmap = gdk_pixmap_new (menu->tearoff_window->window,
@@ -1362,10 +1357,13 @@ gtk_menu_tearoff_bg_copy (GtkMenu *menu)
 			       height,
 			       -1);
 
-      gdk_draw_drawable (pixmap, gc,
-			 menu->tearoff_window->window,
-			 0, 0, 0, 0, -1, -1);
-      g_object_unref (gc);
+      cr = gdk_cairo_create (pixmap);
+      /* Let's hope that function never notices we're not passing it a pixmap */
+      gdk_cairo_set_source_pixmap (cr,
+                                   menu->tearoff_window->window,
+                                   0, 0);
+      cairo_paint (cr);
+      cairo_destroy (cr);
 
       gtk_widget_set_size_request (menu->tearoff_window,
 				   width,