fixed few regressions after gtk3 port

4 files changed, 14 insertions, 12 deletions

diff --git a/plugins/gtkui/ddbequalizer.c b/plugins/gtkui/ddbequalizer.c
index ea31a742..88a9356e 100644
--- a/plugins/gtkui/ddbequalizer.c
+++ b/plugins/gtkui/ddbequalizer.c
@@ -826,10 +826,10 @@ static gboolean ddb_equalizer_real_draw (GtkWidget *base, cairo_t *cr) {
 #if !GTK_CHECK_VERSION(3,0,0)
 static gboolean ddb_equalizer_real_expose_event (GtkWidget* base, GdkEventExpose* event) {
 	g_return_val_if_fail (event != NULL, FALSE);
-	cairo_t *ctx= gdk_cairo_create ((GdkDrawable*) gtk_widget_get_window (base));
+	cairo_t *cr= gdk_cairo_create ((GdkDrawable*) gtk_widget_get_window (base));
     ddb_equalizer_real_draw (base, cr);
-	_cairo_destroy0 (ctx);
-	return result;
+	_cairo_destroy0 (cr);
+	return FALSE;
 }
 #endif
 
diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c
index 4123dfc0..0d4cb15b 100644
--- a/plugins/gtkui/ddblistview.c
+++ b/plugins/gtkui/ddblistview.c
@@ -619,6 +619,8 @@ ddb_listview_list_pickpoint_y (DdbListview *listview, int y, DdbListviewGroup **
 
 void
 ddb_listview_list_render (DdbListview *listview, cairo_t *cr, int x, int y, int w, int h) {
+    cairo_set_line_width (cr, 1);
+    cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
     GtkWidget *treeview = theme_treeview;
 
 #if !GTK_CHECK_VERSION(3,0,0)
@@ -767,8 +769,6 @@ ddb_listview_list_draw               (GtkWidget       *widget,
 {
     DdbListview *ps = DDB_LISTVIEW (g_object_get_data (G_OBJECT (widget), "owner"));
     widget = ps->list;
-    cairo_set_line_width (cr, 1);
-    cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
     // FIXME: clip region
     ddb_listview_list_render (ps, cr, 0, 0, gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget));
     if (ps->drag_motion_y >= 0/* && ps->drag_motion_y-ps->scrollpos-3 < event->area.y+event->area.height && ps->drag_motion_y-ps->scrollpos+3 >= event->area.y*/) {
@@ -2077,7 +2077,7 @@ ddb_listview_list_track_dragdrop (DdbListview *ps, int y) {
 
 #if !GTK_CHECK_VERSION(3,0,0)
     // FIXME
-    ddb_listview_draw_dnd_marker (ps, cr);
+//    ddb_listview_draw_dnd_marker (ps, cr);
 #endif
     
     if (y < 10) {
@@ -2281,7 +2281,9 @@ ddb_listview_header_draw                 (GtkWidget       *widget,
     // FIXME: clip region
     cairo_set_line_width (cr, 1);
     cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE);
-    ddb_listview_header_expose (ps, cr, 0, 0, gtk_widget_get_allocated_width (widget), gtk_widget_get_allocated_height (widget));
+    GtkAllocation a;
+    gtk_widget_get_allocation (widget, &a);
+    ddb_listview_header_expose (ps, cr, 0, 0, a.width, a.height);
     return FALSE;
 }
 
diff --git a/plugins/gtkui/ddbvolumebar.c b/plugins/gtkui/ddbvolumebar.c
index c0f28d15..bfc9325f 100644
--- a/plugins/gtkui/ddbvolumebar.c
+++ b/plugins/gtkui/ddbvolumebar.c
@@ -182,8 +182,8 @@ volumebar_draw (GtkWidget *widget, cairo_t *cr) {
 
     GdkColor clr_fg;
     GdkColor clr_bg;
-    gtkui_get_bar_background_color (&clr_fg);
-    gtkui_get_bar_foreground_color (&clr_bg);
+    gtkui_get_bar_foreground_color (&clr_fg);
+    gtkui_get_bar_background_color (&clr_bg);
 
     for (int i = 0; i < n; i++) {
         float iy = (float)i + 3;
@@ -228,9 +228,9 @@ gboolean
 on_volumebar_expose_event                 (GtkWidget       *widget,
                                         GdkEventExpose  *event)
 {
-    cairo_t *cr = gdk_cairo_create (widget);
+    cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
     on_volumebar_draw (widget, cr);
-    gdk_cairo_destroy (cr);
+    cairo_destroy (cr);
     return FALSE;
 }
 #endif
diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c
index 3fea720c..4ad851c2 100644
--- a/plugins/gtkui/plcommon.c
+++ b/plugins/gtkui/plcommon.c
@@ -101,7 +101,7 @@ void draw_column_data (DdbListview *listview, cairo_t *cr, DdbListviewIter it, D
                 .width = width,
                 .height = height,
             };
-            gtk_paint_flat_box (gtk_widget_get_style (theme_treeview), cr, GTK_STATE_NORMAL, GTK_SHADOW_NONE, &clip, theme_treeview, "cell_even_ruled", x-1, y, width+2, height);
+            gtk_paint_flat_box (gtk_widget_get_style (theme_treeview), gtk_widget_get_window (listview->list), GTK_STATE_NORMAL, GTK_SHADOW_NONE, &clip, theme_treeview, "cell_even_ruled", x-1, y, width+2, height);
 #endif
         }
         else {