Merge pull request #50 from jasmineaura/develop

eel-bg and lc-p rendering-cleanup followups, eel-bg-box rendering-cleanup

2 files changed, 23 insertions, 13 deletions

diff --git a/eel/eel-background-box.c b/eel/eel-background-box.c
index 6e25cc62..5aeac5a6 100644
--- a/eel/eel-background-box.c
+++ b/eel/eel-background-box.c
@@ -27,35 +27,45 @@
 
 #include "eel-background.h"
 
-static void eel_background_box_class_init   (EelBackgroundBoxClass *background_box_class);
-static void eel_background_box_init         (EelBackgroundBox      *background);
-
 G_DEFINE_TYPE (EelBackgroundBox, eel_background_box, GTK_TYPE_EVENT_BOX)
 
 static gboolean
-eel_background_box_expose_event (GtkWidget *widget,
-                                 GdkEventExpose *event)
+eel_background_box_draw (GtkWidget *widget,
+#if GTK_CHECK_VERSION (3, 0, 0)
+                         cairo_t *cr)
+#else
+                         GdkEventExpose *event)
+#endif
 {
+#if GTK_CHECK_VERSION (3, 0, 0)
+    eel_background_draw (widget, cr);
+    gtk_container_propagate_draw (GTK_CONTAINER (widget),
+                                  gtk_bin_get_child (GTK_BIN (widget)),
+                                  cr);
+#else
     eel_background_expose (widget, event);
-
     gtk_container_propagate_expose (GTK_CONTAINER (widget),
                                     gtk_bin_get_child (GTK_BIN (widget)),
                                     event);
-
+#endif
     return TRUE;
 }
 
 static void
-eel_background_box_class_init (EelBackgroundBoxClass *klass)
+eel_background_box_init (EelBackgroundBox *box)
 {
-    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-    widget_class->expose_event = eel_background_box_expose_event;
 }
 
 static void
-eel_background_box_init (EelBackgroundBox *box)
+eel_background_box_class_init (EelBackgroundBoxClass *klass)
 {
+    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+    widget_class->draw = eel_background_box_draw;
+#else
+    widget_class->expose_event = eel_background_box_draw;
+#endif
 }
 
 GtkWidget*
diff --git a/eel/eel-background.c b/eel/eel-background.c
index 867ab2ee..80f0e90c 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -461,7 +461,7 @@ eel_background_expose (GtkWidget      *widget,
     widget_window = gtk_widget_get_window (widget);
 
 #if !GTK_CHECK_VERSION (3, 0, 0)
-    g_return_if_fail (event->window != widget_window);
+    g_return_if_fail (event->window == widget_window);
 #endif
 
     EelBackground *background = eel_get_widget_background (widget);