GTK2 no longer supported

[geeqie.git] / src / bar_histogram.c

diff --git a/src/bar_histogram.c b/src/bar_histogram.c
index 58af06c..41d25db 100644 (file)
--- a/src/bar_histogram.c
+++ b/src/bar_histogram.c
@@ -148,8 +148,7 @@ static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer
                }
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
-static gboolean bar_pane_histogram_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data)
+static gboolean bar_pane_histogram_draw_cb(GtkWidget *UNUSED(widget), cairo_t *cr, gpointer data)
 {
        PaneHistogramData *phd = data;
        if (!phd) return TRUE;
@@ -167,29 +166,7 @@ static gboolean bar_pane_histogram_draw_cb(GtkWidget *widget, cairo_t *cr, gpoin
        return TRUE;
 }
 
-#else
-static gboolean bar_pane_histogram_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-       PaneHistogramData *phd = data;
-       if (!phd) return TRUE;
-
-       if (phd->need_update)
-               {
-               bar_pane_histogram_update(phd);
-               }
-
-       if (!phd->pixbuf) return TRUE;
-
-       cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
-       gdk_cairo_set_source_pixbuf (cr, phd->pixbuf, 0, 0);
-       cairo_paint (cr);
-       cairo_destroy (cr);
-
-       return TRUE;
-}
-#endif
-
-static void bar_pane_histogram_size_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+static void bar_pane_histogram_size_cb(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
 {
        PaneHistogramData *phd = data;
 
@@ -198,7 +175,7 @@ static void bar_pane_histogram_size_cb(GtkWidget *widget, GtkAllocation *allocat
        bar_pane_histogram_update(phd);
 }
 
-static void bar_pane_histogram_destroy(GtkWidget *widget, gpointer data)
+static void bar_pane_histogram_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
        PaneHistogramData *phd = data;
 
@@ -268,7 +245,7 @@ static GtkWidget *bar_pane_histogram_menu(PaneHistogramData *phd)
        return menu;
 }
 
-static gboolean bar_pane_histogram_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean bar_pane_histogram_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
 {
        PaneHistogramData *phd = data;
 
@@ -317,13 +294,8 @@ static GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gi
        g_signal_connect_after(G_OBJECT(phd->drawing_area), "size_allocate",
                                G_CALLBACK(bar_pane_histogram_size_cb), phd);
 
-#if GTK_CHECK_VERSION(3,0,0)
        g_signal_connect(G_OBJECT(phd->drawing_area), "draw",
                         G_CALLBACK(bar_pane_histogram_draw_cb), phd);
-#else
-       g_signal_connect(G_OBJECT(phd->drawing_area), "expose_event",
-                        G_CALLBACK(bar_pane_histogram_expose_event_cb), phd);
-#endif
 
        gtk_box_pack_start(GTK_BOX(phd->widget), phd->drawing_area, TRUE, TRUE, 0);
        gtk_widget_show(phd->drawing_area);