[libegg] Ifdef GTK_WIDGET_DRAWABLE for compiling with -DGSEAL_ENABLE. See bug 615348.
- From: Andre Klapper <aklapper src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libegg] Ifdef GTK_WIDGET_DRAWABLE for compiling with -DGSEAL_ENABLE. See bug 615348.
- Date: Sat, 10 Apr 2010 12:47:46 +0000 (UTC)
commit bf20e6979e16a1afe17dac1f19a4a84dbdf749fb
Author: Andre Klapper <a9016009 gmx de>
Date: Sat Apr 10 14:47:31 2010 +0200
Ifdef GTK_WIDGET_DRAWABLE for compiling with -DGSEAL_ENABLE. See bug 615348.
libegg/dock/egg-dock-item.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/libegg/dock/egg-dock-item.c b/libegg/dock/egg-dock-item.c
index 36664f2..1c38675 100644
--- a/libegg/dock/egg-dock-item.c
+++ b/libegg/dock/egg-dock-item.c
@@ -860,7 +860,11 @@ egg_dock_item_style_set (GtkWidget *widget,
#endif
gtk_style_set_background (widget->style, widget->window,
widget->state);
+#if GTK_CHECK_VERSION(2,18,0)
+ if (gtk_widget_is_drawable (widget))
+#else
if (GTK_WIDGET_DRAWABLE (widget))
+#endif
gdk_window_clear (widget->window);
}
}
@@ -894,7 +898,11 @@ egg_dock_item_expose (GtkWidget *widget,
g_return_val_if_fail (EGG_IS_DOCK_ITEM (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
+#if GTK_CHECK_VERSION(2,18,0)
+ if (gtk_widget_is_drawable (widget) && event->window == widget->window) {
+#else
if (GTK_WIDGET_DRAWABLE (widget) && event->window == widget->window) {
+#endif
egg_dock_item_paint (widget, event);
EGG_CALL_PARENT (GTK_WIDGET_CLASS, expose_event, (widget, event));
}
@@ -1414,7 +1422,11 @@ egg_dock_item_real_set_orientation (EggDockItem *item,
{
item->orientation = orientation;
+#if GTK_CHECK_VERSION(2,18,0)
+ if (gtk_widget_is_drawable (item))
+#else
if (GTK_WIDGET_DRAWABLE (item))
+#endif
gtk_widget_queue_draw (GTK_WIDGET (item));
gtk_widget_queue_resize (GTK_WIDGET (item));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]