Trim trailing white spaces.

[geeqie.git] / src / cellrenderericon.c

diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c
index 2a2a5ba..e158f2a 100644 (file)
--- a/src/cellrenderericon.c
+++ b/src/cellrenderericon.c
@@ -44,17 +44,17 @@ static void gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class);
 static void gqv_cell_renderer_icon_finalize(GObject *object);
 static void gqv_cell_renderer_icon_get_size(GtkCellRenderer    *cell,
                                            GtkWidget           *widget,
-                                           GdkRectangle        *rectangle,
+                                           const GdkRectangle  *rectangle,
                                            gint                *x_offset,
                                            gint                *y_offset,
                                            gint                *width,
                                            gint                *height);
 #if GTK_CHECK_VERSION(3,0,0)
-static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, 
-                                          cairo_t *cr, 
-                                          GtkWidget *widget, 
-                                          const GdkRectangle *background_area, 
-                                          const GdkRectangle *cell_area, 
+static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
+                                          cairo_t *cr,
+                                          GtkWidget *widget,
+                                          const GdkRectangle *background_area,
+                                          const GdkRectangle *cell_area,
                                           GtkCellRendererState flags);
 #else
 static void gqv_cell_renderer_icon_render(GtkCellRenderer      *cell,
@@ -67,12 +67,12 @@ static void gqv_cell_renderer_icon_render(GtkCellRenderer   *cell,
 #endif
 
 
-static gint gqv_cell_renderer_icon_activate(GtkCellRenderer      *cell,
+static gboolean gqv_cell_renderer_icon_activate(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);
 
 enum {
@@ -553,7 +553,7 @@ gqv_cell_renderer_icon_new(void)
 static void
 gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell,
                                GtkWidget       *widget,
-                               GdkRectangle    *cell_area,
+                               const GdkRectangle      *cell_area,
                                gint            *x_offset,
                                gint            *y_offset,
                                gint            *width,
@@ -630,11 +630,11 @@ gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell,
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, 
-                                          cairo_t *cr, 
-                                          GtkWidget *widget, 
-                                          const GdkRectangle *background_area, 
-                                          const GdkRectangle *cell_area, 
+static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell,
+                                          cairo_t *cr,
+                                          GtkWidget *widget,
+                                          const GdkRectangle *background_area,
+                                          const GdkRectangle *cell_area,
                                           GtkCellRendererState flags)
 
 {
@@ -678,22 +678,14 @@ gqv_cell_renderer_icon_render(GtkCellRenderer             *cell,
 
        if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_has_focus(widget))
-#else
-               if (GTK_WIDGET_HAS_FOCUS(widget))
-#endif
                        state = GTK_STATE_SELECTED;
                else
                        state = GTK_STATE_ACTIVE;
                }
        else
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_state(widget) == GTK_STATE_INSENSITIVE)
-#else
-               if (GTK_WIDGET_STATE(widget) == GTK_STATE_INSENSITIVE)
-#endif
                        state = GTK_STATE_INSENSITIVE;
                else
                        state = GTK_STATE_NORMAL;
@@ -722,7 +714,7 @@ gqv_cell_renderer_icon_render(GtkCellRenderer               *cell,
                        pix_rect.y = cell_area->y + cell_rect.y;
                        }
 
-               if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect) 
+               if (gdk_rectangle_intersect(cell_area, &pix_rect, &draw_rect)
 #if !GTK_CHECK_VERSION(3,0,0)
                    && gdk_rectangle_intersect(expose_area, &draw_rect, &draw_rect)
 #endif
@@ -736,19 +728,6 @@ gqv_cell_renderer_icon_render(GtkCellRenderer              *cell,
                                        draw_rect.height);
 
                        cairo_fill (cr);
-/*                     
-                       gdk_draw_pixbuf(window,
-                                       widget->style->black_gc,
-                                       pixbuf,
-                                       draw_rect.x - pix_rect.x,
-                                       draw_rect.y - pix_rect.y,
-                                       draw_rect.x,
-                                       draw_rect.y,
-                                       draw_rect.width,
-                                       draw_rect.height,
-                                       GDK_RGB_DITHER_NORMAL,
-                                       0, 0);
-*/
                        }
                }
 
@@ -819,7 +798,7 @@ gqv_cell_renderer_icon_render(GtkCellRenderer               *cell,
 
                                cairo_save (cr);
 
-                               cairo_rectangle(cr, 
+                               cairo_rectangle(cr,
                                                pix_rect.x + i * TOGGLE_SPACING + (TOGGLE_WIDTH - TOGGLE_SPACING) / 2,
                                                pix_rect.y,
                                                TOGGLE_WIDTH, TOGGLE_WIDTH);
@@ -849,11 +828,7 @@ gqv_cell_renderer_icon_render(GtkCellRenderer              *cell,
                        }
                 }
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (cellicon->focused && gtk_widget_has_focus(widget))
-#else
-       if (cellicon->focused && GTK_WIDGET_HAS_FOCUS(widget))
-#endif
                {
 #if GTK_CHECK_VERSION(3,0,0)
 #else
@@ -870,13 +845,13 @@ gqv_cell_renderer_icon_render(GtkCellRenderer             *cell,
 #endif
 }
 
-static gint
+static gboolean
 gqv_cell_renderer_icon_activate(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)
 {
        GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell;