Mercurial > hg > forks > geeqie
changeset 2278:f69d3d47d874
Fix wrong gtk3 function calls in gtk2
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Sun, 06 Mar 2016 23:48:42 +0100 |
| parents | 3bb22c74f12e |
| children | 5a9bdebb109f |
| files | src/cellrenderericon.c |
| diffstat | 1 files changed, 67 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cellrenderericon.c Sun Mar 06 23:47:14 2016 +0100 +++ b/src/cellrenderericon.c Sun Mar 06 23:48:42 2016 +0100 @@ -42,13 +42,23 @@ static void gqv_cell_renderer_icon_init(GQvCellRendererIcon *celltext); 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, - 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_get_size(GtkCellRenderer *cell, + GtkWidget *widget, + const GdkRectangle *rectangle, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height); +#else +static void gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell, + GtkWidget *widget, + GdkRectangle *rectangle, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height); +#endif #if GTK_CHECK_VERSION(3,0,0) static void gqv_cell_renderer_icon_render(GtkCellRenderer *cell, cairo_t *cr, @@ -67,13 +77,23 @@ #endif +#if GTK_CHECK_VERSION(3,0,0) static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - const GdkRectangle *background_area, - const GdkRectangle *cell_area, - GtkCellRendererState flags); + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + GtkCellRendererState flags); +#else +static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags); +#endif enum { TOGGLED, @@ -550,14 +570,23 @@ return g_object_new(GQV_TYPE_CELL_RENDERER_ICON, NULL); } -static void -gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell, - GtkWidget *widget, - const GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height) +#if GTK_CHECK_VERSION(3,0,0) +static void gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell, + GtkWidget *widget, + const GdkRectangle *cell_area, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height) +#else +static void gqv_cell_renderer_icon_get_size(GtkCellRenderer *cell, + GtkWidget *widget, + GdkRectangle *cell_area, + gint *x_offset, + gint *y_offset, + gint *width, + gint *height) +#endif { GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell; gint calc_width; @@ -845,14 +874,23 @@ #endif } -static gboolean -gqv_cell_renderer_icon_activate(GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - const GdkRectangle *background_area, - const GdkRectangle *cell_area, - GtkCellRendererState flags) +#if GTK_CHECK_VERSION(3,0,0) +static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, + GtkCellRendererState flags) +#else +static gboolean gqv_cell_renderer_icon_activate(GtkCellRenderer *cell, + GdkEvent *event, + GtkWidget *widget, + const gchar *path, + GdkRectangle *background_area, + GdkRectangle *cell_area, + GtkCellRendererState flags) +#endif { GQvCellRendererIcon *cellicon = (GQvCellRendererIcon *) cell; GdkEventButton *bevent = &event->button;