[libegg] Adapt treeviewutils for recent GTK+ 2 changes

[David King <davidk src gnome org>]

commit ccf090e95f23a023d128eb1207b4cc4f5d8a16f4
Author: David King <davidk openismus com>
Date:   Fri Apr 1 15:05:23 2011 +0200

    Adapt treeviewutils for recent GTK+ 2 changes
    
    Adapt to struct member sealing. Make some parameters for GtkCellRenderer
    virtual functions const. Use newer GDK_KEY_ defines rather than GDK_
    equivealents.

 libegg/treeviewutils/egg-cell-renderer-text.c |   37 ++++++-----
 libegg/treeviewutils/eggcellrendererkeys.c    |   79 ++++++++++++++++---------
 2 files changed, 71 insertions(+), 45 deletions(-)
---
diff --git a/libegg/treeviewutils/egg-cell-renderer-text.c b/libegg/treeviewutils/egg-cell-renderer-text.c
index cdd8a01..a0a8803 100644
--- a/libegg/treeviewutils/egg-cell-renderer-text.c
+++ b/libegg/treeviewutils/egg-cell-renderer-text.c
@@ -25,10 +25,10 @@ static void egg_cell_renderer_text_class_init
 static void egg_cell_renderer_text_render     (GtkCellRenderer          *cell,
 					       GdkWindow                *window,
 					       GtkWidget                *widget,
-					       GdkRectangle             *background_area,
-					       GdkRectangle             *cell_area,
-					       GdkRectangle             *expose_area,
-					       guint                     flags);
+					       const GdkRectangle       *background_area,
+					       const GdkRectangle       *cell_area,
+					       const GdkRectangle       *expose_area,
+					       GtkCellRendererState      flags);
 
 static GtkCellRendererTextClass *parent_class = NULL;
 
@@ -76,18 +76,20 @@ egg_cell_renderer_text_new (void)
 {
   return GTK_CELL_RENDERER (g_object_new (EGG_TYPE_CELL_RENDERER_TEXT, NULL));
 }
+
 static void
-egg_cell_renderer_text_render (GtkCellRenderer    *cell,
-			       GdkWindow          *window,
-			       GtkWidget          *widget,
-			       GdkRectangle       *background_area,
-			       GdkRectangle       *cell_area,
-			       GdkRectangle       *expose_area,
-			       guint               flags)
+egg_cell_renderer_text_render (GtkCellRenderer     *cell,
+			       GdkWindow           *window,
+			       GtkWidget           *widget,
+			       const GdkRectangle  *background_area,
+			       const GdkRectangle  *cell_area,
+			       const GdkRectangle  *expose_area,
+			       GtkCellRendererState flags)
 
 {
 	GtkCellRendererText *celltext = (GtkCellRendererText *) cell;
 	GtkStateType state;
+	gboolean background_set;
 	
 	if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
 	{
@@ -112,14 +114,15 @@ egg_cell_renderer_text_render (GtkCellRenderer    *cell,
 			state = GTK_STATE_NORMAL;
 	}
 
-	if ( state == GTK_STATE_SELECTED  && celltext->background_set)
+	g_object_get (celltext, "cell-background-set", &background_set, NULL);
+	if (state == GTK_STATE_SELECTED && background_set)
 	{
 		GdkColor color;
 		cairo_t *cr;
+		guint ypad;
 		
-		color.red = celltext->background.red;
-		color.green = celltext->background.green;
-		color.blue = celltext->background.blue;
+		g_object_get (celltext, "cell-background-gdk", &color,
+		                        "ypad", &ypad, NULL);
 		
 		cr = gdk_cairo_create (window);
 
@@ -127,9 +130,9 @@ egg_cell_renderer_text_render (GtkCellRenderer    *cell,
 
 		cairo_rectangle (cr,
 		                 background_area->x,
-				 background_area->y + cell->ypad,
+				 background_area->y + ypad,
 				 background_area->width,
-				 background_area->height - 2 * cell->ypad);
+				 background_area->height - 2 * ypad);
 
 		cairo_fill (cr);
 		cairo_destroy (cr);
diff --git a/libegg/treeviewutils/eggcellrendererkeys.c b/libegg/treeviewutils/eggcellrendererkeys.c
index a136d0f..9d3f269 100644
--- a/libegg/treeviewutils/eggcellrendererkeys.c
+++ b/libegg/treeviewutils/eggcellrendererkeys.c
@@ -31,8 +31,8 @@ static GtkCellEditable *egg_cell_renderer_keys_start_editing (GtkCellRenderer
 							      GdkEvent                 *event,
 							      GtkWidget                *widget,
 							      const gchar              *path,
-							      GdkRectangle             *background_area,
-							      GdkRectangle             *cell_area,
+							      const GdkRectangle       *background_area,
+							      const GdkRectangle       *cell_area,
 							      GtkCellRendererState      flags);
 
 
@@ -44,13 +44,13 @@ static void egg_cell_renderer_keys_set_property (GObject         *object,
 						 guint            param_id,
 						 const GValue    *value,
 						 GParamSpec      *pspec);
-static void egg_cell_renderer_keys_get_size     (GtkCellRenderer *cell,
-						 GtkWidget       *widget,
-						 GdkRectangle    *cell_area,
-						 gint            *x_offset,
-						 gint            *y_offset,
-						 gint            *width,
-						 gint            *height);
+static void egg_cell_renderer_keys_get_size     (GtkCellRenderer    *cell,
+						 GtkWidget          *widget,
+						 const GdkRectangle *cell_area,
+						 gint               *x_offset,
+						 gint               *y_offset,
+						 gint               *width,
+						 gint               *height);
 
 
 enum {
@@ -365,13 +365,13 @@ is_modifier (guint keycode)
 }
 
 static void
-egg_cell_renderer_keys_get_size (GtkCellRenderer *cell,
-				 GtkWidget       *widget,
-				 GdkRectangle    *cell_area,
-				 gint            *x_offset,
-				 gint            *y_offset,
-				 gint            *width,
-				 gint            *height)
+egg_cell_renderer_keys_get_size (GtkCellRenderer       *cell,
+				 GtkWidget             *widget,
+				 const GdkRectangle    *cell_area,
+				 gint                  *x_offset,
+				 gint                  *y_offset,
+				 gint                  *width,
+				 gint                  *height)
 
 {
   EggCellRendererKeys *keys = (EggCellRendererKeys *) cell;
@@ -380,7 +380,11 @@ egg_cell_renderer_keys_get_size (GtkCellRenderer *cell,
   if (keys->sizing_label == NULL)
     keys->sizing_label = gtk_label_new (TOOLTIP_TEXT);
 
+#if GTK_CHECK_VERSION (3,0,0)
+  gtk_widget_get_preferred_size (keys->sizing_label, NULL, &requisition);
+#else
   gtk_widget_size_request (keys->sizing_label, &requisition);
+#endif
   (* GTK_CELL_RENDERER_CLASS (parent_class)->get_size) (cell, widget, cell_area, x_offset, y_offset, width, height);
   /* FIXME: need to take the cell_area et al. into account */
   if (width)
@@ -425,8 +429,8 @@ grab_key_callback (GtkWidget    *widget,
 
   upper = event->keyval;
   accel_keyval = gdk_keyval_to_lower (upper);
-  if (accel_keyval == GDK_ISO_Left_Tab)
-    accel_keyval = GDK_Tab;
+  if (accel_keyval == GDK_KEY_ISO_Left_Tab)
+    accel_keyval = GDK_KEY_Tab;
 
 
 
@@ -460,11 +464,11 @@ grab_key_callback (GtkWidget    *widget,
   else
     g_assert_not_reached ();
 
-  if (accel_mods == 0 && accel_keyval == GDK_Escape)
+  if (accel_mods == 0 && accel_keyval == GDK_KEY_Escape)
     goto out; /* cancel */
 
   /* clear the accelerator on Backspace */
-  if (accel_mods == 0 && accel_keyval == GDK_BackSpace)
+  if (accel_mods == 0 && accel_keyval == GDK_KEY_BackSpace)
     {
       cleared = TRUE;
       goto out;
@@ -569,29 +573,37 @@ egg_cell_renderer_keys_start_editing (GtkCellRenderer      *cell,
 				      GdkEvent             *event,
 				      GtkWidget            *widget,
 				      const gchar          *path,
-				      GdkRectangle         *background_area,
-				      GdkRectangle         *cell_area,
+				      const GdkRectangle   *background_area,
+				      const GdkRectangle   *cell_area,
 				      GtkCellRendererState  flags)
 {
   GtkCellRendererText *celltext;
   EggCellRendererKeys *keys;
   GtkWidget *label;
   GtkWidget *eventbox;
+  GdkWindow *window;
+  gboolean editable;
+#if GTK_CHECK_VERSION (3,0,0)
+  GdkRGBA box_color;
+  GdkRGBA label_color;
+#endif
 
   celltext = GTK_CELL_RENDERER_TEXT (cell);
   keys = EGG_CELL_RENDERER_KEYS (cell);
 
   /* If the cell isn't editable we return NULL. */
-  if (celltext->editable == FALSE)
+  g_object_get (celltext, "editable", &editable, NULL);
+  if (editable == FALSE)
     return NULL;
 
-  g_return_val_if_fail (widget->window != NULL, NULL);
+  window = gtk_widget_get_window (widget);
+  g_return_val_if_fail (window != NULL, NULL);
 
-  if (gdk_keyboard_grab (widget->window, FALSE,
+  if (gdk_keyboard_grab (window, FALSE,
                          gdk_event_get_time (event)) != GDK_GRAB_SUCCESS)
     return NULL;
 
-  if (gdk_pointer_grab (widget->window, FALSE,
+  if (gdk_pointer_grab (window, FALSE,
                         GDK_BUTTON_PRESS_MASK,
                         NULL, NULL,
                         gdk_event_get_time (event)) != GDK_GRAB_SUCCESS)
@@ -615,11 +627,22 @@ egg_cell_renderer_keys_start_editing (GtkCellRenderer      *cell,
   label = gtk_label_new (NULL);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 
+#if GTK_CHECK_VERSION (3,0,0)
+  gtk_style_context_get_background_color (gtk_widget_get_style_context (widget),
+                                          GTK_STATE_SELECTED,
+                                         &box_color);
+  gtk_widget_override_background_color (eventbox, GTK_STATE_NORMAL, &box_color);
+  gtk_style_context_get_color (gtk_widget_get_style_context (widget),
+                               GTK_STATE_SELECTED,
+                              &label_color);
+  gtk_widget_override_color (label, GTK_STATE_NORMAL, &label_color);
+#else
   gtk_widget_modify_bg (eventbox, GTK_STATE_NORMAL,
-                        &widget->style->bg[GTK_STATE_SELECTED]);
+                        &(gtk_widget_get_style (widget)->bg[GTK_STATE_SELECTED]));
 
   gtk_widget_modify_fg (label, GTK_STATE_NORMAL,
-                        &widget->style->fg[GTK_STATE_SELECTED]);
+                        &(gtk_widget_get_style (widget)->fg[GTK_STATE_SELECTED]));
+#endif
 
   gtk_label_set_text (GTK_LABEL (label),
 		  TOOLTIP_TEXT);