[gucharmap] Use ::draw on gtk3

[Christian Persch <chpe src gnome org>]

commit f07b49f33aa5a72c5c9d5ed88f9beb34866f61f7
Author: Christian Persch <chpe gnome org>
Date:   Sun Sep 26 16:02:14 2010 +0200

    Use ::draw on gtk3

 gucharmap/gucharmap-chartable.c |   49 +++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 9 deletions(-)
---
diff --git a/gucharmap/gucharmap-chartable.c b/gucharmap/gucharmap-chartable.c
index 1d0470f..6ad98ac 100644
--- a/gucharmap/gucharmap-chartable.c
+++ b/gucharmap/gucharmap-chartable.c
@@ -1462,24 +1462,45 @@ gucharmap_chartable_drag_data_received (GtkWidget *widget,
   /* no need to chain up */
 }
 
+#if GTK_CHECK_VERSION (2, 90, 8)
+static gboolean
+gucharmap_chartable_draw (GtkWidget *widget,
+                          cairo_t *cr)
+#else
 static gboolean
 gucharmap_chartable_expose_event (GtkWidget *widget, 
                                   GdkEventExpose *event)
+#endif
 {
   GucharmapChartable *chartable = GUCHARMAP_CHARTABLE (widget);
   GucharmapChartablePrivate *priv = chartable->priv;
   GtkStyle *style;
-  cairo_t *cr;
   int row, col;
+#if GTK_CHECK_VERSION (2, 90, 8)
+  cairo_rectangle_int_t clip_rect;
+  cairo_region_t *region;
+#else
+  GdkRegion *region = event->region;
+  cairo_t *cr;
+#endif
 
+#if !GTK_CHECK_VERSION (2, 90, 8)
   if (event->window != gtk_widget_get_window (widget))
     return FALSE;
+#endif
 
-#if GTK_CHECK_VERSION (2, 90, 5)
-  if (cairo_region_is_empty (event->region))
+#if GTK_CHECK_VERSION (2, 90, 8)
+  if (!gdk_cairo_get_clip_rectangle (cr, &clip_rect))
     return FALSE;
+
+  region = cairo_region_create_rectangle (&clip_rect);
+
+  if (cairo_region_is_empty (region)) {
+    cairo_region_destroy (region);
+    return FALSE;
+  }
 #else
-  if (gdk_region_empty (event->region))
+  if (gdk_region_empty (region))
     return FALSE;
 #endif
 
@@ -1498,13 +1519,15 @@ gucharmap_chartable_expose_event (GtkWidget *widget,
   }
 #endif
 
+#if !GTK_CHECK_VERSION (2, 90, 8)
   cr = gdk_cairo_create (event->window);
-  gdk_cairo_region (cr, event->region);
+  gdk_cairo_region (cr, region);
   cairo_clip (cr);
+#endif
 
   style = gtk_widget_get_style (widget);
   gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
-  gdk_cairo_region (cr, event->region);
+  gdk_cairo_region (cr, region);
   cairo_fill (cr);
 
   if (priv->codepoint_list == NULL)
@@ -1527,11 +1550,11 @@ gucharmap_chartable_expose_event (GtkWidget *widget,
           rect.width = _gucharmap_chartable_column_width (chartable, col);
           rect.height = _gucharmap_chartable_row_height (chartable, row);
 
-#if GTK_CHECK_VERSION (2, 90, 5)
-          if (cairo_region_contains_rectangle (event->region, &rect) == CAIRO_REGION_OVERLAP_OUT)
+#if GTK_CHECK_VERSION (2, 90, 8)
+          if (cairo_region_contains_rectangle (region, &rect) == CAIRO_REGION_OVERLAP_OUT)
             continue;
 #else
-          if (gdk_region_rect_in (event->region, &rect) == GDK_OVERLAP_RECTANGLE_OUT)
+          if (gdk_region_rect_in (region, &rect) == GDK_OVERLAP_RECTANGLE_OUT)
             continue;
 #endif
 
@@ -1544,7 +1567,11 @@ gucharmap_chartable_expose_event (GtkWidget *widget,
 
 expose_done:
 
+#if GTK_CHECK_VERSION (2, 90, 8)
+  cairo_region_destroy (region);
+#else
   cairo_destroy (cr);
+#endif
 
   /* no need to chain up */
   return FALSE;
@@ -2199,7 +2226,11 @@ gucharmap_chartable_class_init (GucharmapChartableClass *klass)
   widget_class->drag_data_received = gucharmap_chartable_drag_data_received;
   widget_class->button_press_event = gucharmap_chartable_button_press;
   widget_class->button_release_event = gucharmap_chartable_button_release;
+#if GTK_CHECK_VERSION (2, 90, 8)
+  widget_class->draw = gucharmap_chartable_draw;
+#else
   widget_class->expose_event = gucharmap_chartable_expose_event;
+#endif
   widget_class->focus_in_event = gucharmap_chartable_focus_in_event;
   widget_class->focus_out_event = gucharmap_chartable_focus_out_event;
   widget_class->key_press_event = gucharmap_chartable_key_press_event;