Remove commented out code.

[geeqie.git] / src / bar_histogram.c

diff --git a/src/bar_histogram.c b/src/bar_histogram.c
index 7d032de..9a218e2 100644 (file)
--- a/src/bar_histogram.c
+++ b/src/bar_histogram.c
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2004 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: Vladimir Nadvornik
  *
@@ -61,7 +61,7 @@ static void bar_pane_histogram_update(PaneHistogramData *phd)
        /* histmap_get is relatively expensive, run it only when we really need it
           and with lower priority than pixbuf_renderer 
           FIXME: this does not work for fullscreen*/
-       if (GTK_WIDGET_DRAWABLE(phd->drawing_area))
+       if (gtk_widget_is_drawable(phd->drawing_area))
                {
                if (!phd->idle_id)
                        {
@@ -140,6 +140,26 @@ 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)
+{
+       PaneHistogramData *phd = data;
+       if (!phd) return TRUE;
+       
+       if (phd->need_update)
+               {
+               bar_pane_histogram_update(phd);
+               }
+       
+       if (!phd->pixbuf) return TRUE;
+       
+       gdk_cairo_set_source_pixbuf(cr, phd->pixbuf, 0, 0);
+       cairo_paint (cr);
+
+       return TRUE;
+}
+
+#else
 static gboolean bar_pane_histogram_expose_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
        PaneHistogramData *phd = data;
@@ -152,15 +172,14 @@ static gboolean bar_pane_histogram_expose_event_cb(GtkWidget *widget, GdkEventEx
        
        if (!phd->pixbuf) return TRUE;
        
-       gdk_draw_pixbuf(widget->window,
-                       widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
-                       phd->pixbuf,
-                       0, 0,
-                       0, 0,
-                       -1, -1,
-                       GDK_RGB_DITHER_NORMAL, 0, 0);
+       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)
 {
@@ -171,18 +190,6 @@ static void bar_pane_histogram_size_cb(GtkWidget *widget, GtkAllocation *allocat
        bar_pane_histogram_update(phd);
 }
 
-#if 0
-static void bar_pane_histogram_close(GtkWidget *pane)
-{
-       PaneHistogramData *phd;
-
-       phd = g_object_get_data(G_OBJECT(pane), "pane_data");
-       if (!phd) return;
-
-       gtk_widget_destroy(phd->widget);
-}
-#endif
-
 static void bar_pane_histogram_destroy(GtkWidget *widget, gpointer data)
 {
        PaneHistogramData *phd = data;
@@ -302,8 +309,13 @@ 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);