summaryrefslogtreecommitdiff
path: root/eel/eel-background-box.c
diff options
context:
space:
mode:
authorSteve Zesch <[email protected]>2012-11-20 19:23:06 -0800
committerSteve Zesch <[email protected]>2012-11-20 19:23:06 -0800
commit4f762cdecf92c6391b27930456e40a703ea880f8 (patch)
treec1ef23eb0a876eda9294ace5c93f6e2ddb184bfa /eel/eel-background-box.c
parent49c5ca823b2e18ac7524bb733f84c3549b8f359c (diff)
parent55f7b8caf97f3eb0da4dcc1a36e4c0ba0ed200d2 (diff)
downloadcaja-4f762cdecf92c6391b27930456e40a703ea880f8.tar.bz2
caja-4f762cdecf92c6391b27930456e40a703ea880f8.tar.xz
Merge pull request #50 from jasmineaura/develop
eel-bg and lc-p rendering-cleanup followups, eel-bg-box rendering-cleanup
Diffstat (limited to 'eel/eel-background-box.c')
-rw-r--r--eel/eel-background-box.c34
1 files changed, 22 insertions, 12 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*