[gtk-engines] redmond: Replace GDK drawing API with cairo

[Benjamin Otte <otte src gnome org>]

commit 10257e9a3723f7c6962064604e8b772acbe1ee73
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Aug 12 12:21:57 2010 +0200

    redmond: Replace GDK drawing API with cairo
    
    The GDK drawing API was deprecated/removed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=626678
    
    Reviewed-by: Benjamin Otte <otte redhat com>

 engines/redmond/src/redmond_gtk2_drawing.c |   40 ++++++++++++++++++----------
 1 files changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/engines/redmond/src/redmond_gtk2_drawing.c b/engines/redmond/src/redmond_gtk2_drawing.c
index c3dc8e3..35dd137 100644
--- a/engines/redmond/src/redmond_gtk2_drawing.c
+++ b/engines/redmond/src/redmond_gtk2_drawing.c
@@ -665,10 +665,12 @@ redmond_draw_combobox_button (GtkStyle * style,
 	      if (parent_state != GTK_STATE_INSENSITIVE)
                 parent_state = GTK_STATE_NORMAL;
 
-	      gdk_draw_rectangle (window,
-	      	                  parent_style->base_gc[parent_state],
-			          TRUE, x - 2, y, width + 2, height);
-
+              cr = gdk_cairo_create (window);
+              gdk_cairo_set_source_color (cr,
+                                          &parent_style->base[parent_state]);
+              cairo_rectangle (cr, x - 2, y, width + 2, height);
+              cairo_fill (cr);
+              cairo_destroy (cr);
             }
           else
             gtk_paint_flat_box (style, window, state_type,
@@ -707,14 +709,18 @@ redmond_draw_combobox_button (GtkStyle * style,
  
         ge_cairo_pattern_fill (cr, DEFAULT_BACKGROUND_PATTERN(redmond_style, state_type),
 				          x, y + 2, width - 2, height - 4);
-      cairo_destroy(cr);
 
       if (shadow_type == GTK_SHADOW_IN)
-        gdk_draw_rectangle (window, style->dark_gc[state_type], FALSE, x,
-	   		    y + 2, width - 3, height - 5);
+        {
+          gdk_cairo_set_source_color (cr, &style->dark[state_type]);
+          ge_cairo_inner_rectangle (cr, x, y + 2, width - 3, height - 5);
+          cairo_stroke (cr);
+        }
       else
         gtk_paint_shadow (style, window, state_type, shadow_type, area,
 		          widget, detail, x, y + 2, width - 2, height - 4);
+
+      cairo_destroy (cr);
     } 
   else
     {
@@ -734,9 +740,12 @@ redmond_draw_combobox_button (GtkStyle * style,
               if (parent_state != GTK_STATE_INSENSITIVE)
                 parent_state = GTK_STATE_NORMAL;
 
-	      gdk_draw_rectangle (window,
-		  	          parent_style->base_gc[parent_state],
-			          TRUE, x + 2, y, width + 2, height);
+              cr = gdk_cairo_create (window);
+              gdk_cairo_set_source_color (cr,
+                                          &parent_style->base[parent_state]);
+              cairo_rectangle (cr, x + 2, y, width + 2, height);
+              cairo_fill (cr);
+              cairo_destroy (cr);
             }
           else
             gtk_paint_flat_box (style, window, state_type,
@@ -775,15 +784,18 @@ redmond_draw_combobox_button (GtkStyle * style,
 
       ge_cairo_pattern_fill (cr, DEFAULT_BACKGROUND_PATTERN(redmond_style, state_type),
 				          x + 2, y + 2, width - 2, height - 4);
-
-      cairo_destroy(cr);
  
       if (shadow_type == GTK_SHADOW_IN)
-        gdk_draw_rectangle (window, style->dark_gc[state_type], FALSE, x + 2,
-			    y + 2, width - 3, height - 5);
+        {
+          gdk_cairo_set_source_color (cr, &style->dark[state_type]);
+          ge_cairo_inner_rectangle (cr, x + 2, y + 2, width - 3, height - 5);
+          cairo_stroke (cr);
+        }
       else
         gtk_paint_shadow (style, window, state_type, shadow_type, area,
 		          widget, detail, x + 2, y + 2, width - 2, height - 4);
+
+      cairo_destroy(cr);
     }
 }