remove all gtk3 conditionals

[claws.git] / src / gtk / colorlabel.c

diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index 78130ae82e045d9cbe7b103f6d598d68c9d109df..2703096e7d702998ae63ddcbd50389a1daa0e441 100644 (file)
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -189,26 +189,18 @@ gchar *colorlabel_get_color_default_text(gint color_index)
 }
 
 static gboolean colorlabel_drawing_area_expose_event_cb
 }
 
 static gboolean colorlabel_drawing_area_expose_event_cb

-#if !GTK_CHECK_VERSION(3, 0, 0)

        (GtkWidget *widget, GdkEventExpose *expose, gpointer data)
        (GtkWidget *widget, GdkEventExpose *expose, gpointer data)

-#else
-       (GtkWidget *widget, cairo_t *cr, gpointer data)
-#endif

 {
 {

-#if !GTK_CHECK_VERSION(3, 0, 0)

        cairo_t *cr;
        GdkWindow *drawable = gtk_widget_get_window(widget);
        cairo_t *cr;
        GdkWindow *drawable = gtk_widget_get_window(widget);

-#endif

        GtkAllocation allocation;
        gulong c = (gulong) GPOINTER_TO_INT(data);
        GdkColor color;
 
        INTCOLOR_TO_GDKCOLOR(c, color)
 
        GtkAllocation allocation;
        gulong c = (gulong) GPOINTER_TO_INT(data);
        GdkColor color;
 
        INTCOLOR_TO_GDKCOLOR(c, color)
 

-#if !GTK_CHECK_VERSION(3, 0, 0)

        gdk_colormap_alloc_color(gtk_widget_get_colormap(widget), &color, FALSE, TRUE);
        cr = gdk_cairo_create(drawable);
        gdk_colormap_alloc_color(gtk_widget_get_colormap(widget), &color, FALSE, TRUE);
        cr = gdk_cairo_create(drawable);

-#endif

        gtk_widget_get_allocation(widget, &allocation);
 
        cairo_set_source_rgb(cr, 0., 0., 0.);
        gtk_widget_get_allocation(widget, &allocation);
 
        cairo_set_source_rgb(cr, 0., 0., 0.);


@@ -221,10 +213,8 @@ static gboolean colorlabel_drawing_area_expose_event_cb
            allocation.width - 2,
            allocation.height - 2);
        cairo_fill(cr);
            allocation.width - 2,
            allocation.height - 2);
        cairo_fill(cr);

-#if !GTK_CHECK_VERSION(3, 0, 0)

        cairo_destroy(cr);
        cairo_destroy(cr);

-#endif
-       
+

        return FALSE;
 }
 
        return FALSE;
 }
 


@@ -241,19 +231,11 @@ static GtkWidget *colorlabel_create_color_widget(GdkColor color)
                         (CL(g) << (gulong)  8) | \
                         (CL(b)))
 
                         (CL(g) << (gulong)  8) | \
                         (CL(b)))
 

-#if !GTK_CHECK_VERSION(3, 0, 0)

        g_signal_connect(G_OBJECT(widget), "expose_event", 
                         G_CALLBACK
                                (colorlabel_drawing_area_expose_event_cb),
                         GINT_TO_POINTER
                                ((gint)CR(color.red, color.green, color.blue)));
        g_signal_connect(G_OBJECT(widget), "expose_event", 
                         G_CALLBACK
                                (colorlabel_drawing_area_expose_event_cb),
                         GINT_TO_POINTER
                                ((gint)CR(color.red, color.green, color.blue)));

-#else
-       g_signal_connect(G_OBJECT(widget), "draw", 
-                        G_CALLBACK
-                               (colorlabel_drawing_area_expose_event_cb),
-                        GINT_TO_POINTER
-                               ((gint)CR(color.red, color.green, color.blue)));
-#endif

 
        return widget;
 }
 
        return widget;
 }