[libegg] Ifdef GTK_WIDGET_REALIZED and GTK_WIDGET_NO_WINDOW 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_REALIZED and GTK_WIDGET_NO_WINDOW for compiling with -DGSEAL_ENABLE. See bug 615348
- Date: Sat, 10 Apr 2010 12:05:26 +0000 (UTC)
commit f5ac50da4d2a77b6a2d703fd0fa254bb3ea52293
Author: Andre Klapper <a9016009 gmx de>
Date: Sat Apr 10 14:04:28 2010 +0200
Ifdef GTK_WIDGET_REALIZED and GTK_WIDGET_NO_WINDOW for compiling with -DGSEAL_ENABLE. See bug 615348.
libegg/dock/egg-dock-item.c | 12 ++++++++++++
libegg/dock/egg-dock-tablabel.c | 4 ++++
libegg/dock/egg-dock.c | 8 ++++++++
libegg/iconchooser/eggiconchooserdialog.c | 8 ++++++++
libegg/toolpalette/eggtoolitemgroup.c | 8 ++++++++
5 files changed, 40 insertions(+), 0 deletions(-)
---
diff --git a/libegg/dock/egg-dock-item.c b/libegg/dock/egg-dock-item.c
index abe7b19..6632095 100644
--- a/libegg/dock/egg-dock-item.c
+++ b/libegg/dock/egg-dock-item.c
@@ -684,7 +684,11 @@ egg_dock_item_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_realized (widget))
+#else
if (GTK_WIDGET_REALIZED (widget))
+#endif
gdk_window_move_resize (widget->window,
widget->allocation.x,
widget->allocation.y,
@@ -822,7 +826,11 @@ egg_dock_item_style_set (GtkWidget *widget,
g_return_if_fail (EGG_IS_DOCK_ITEM (widget));
/* FIXME: maybe remove this method altogether and use the default implementation */
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_realized (widget) && !gtk_widget_get_has_window (widget)) {
+#else
if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_NO_WINDOW (widget)) {
+#endif
gtk_style_set_background (widget->style, widget->window,
widget->state);
if (GTK_WIDGET_DRAWABLE (widget))
@@ -1259,7 +1267,11 @@ egg_dock_item_drag_start (EggDockItem *item)
{
GdkCursor *fleur;
+#if GTK_CHECK_VERSION(2,20,0)
+ if (!gtk_widget_get_realized (item))
+#else
if (!GTK_WIDGET_REALIZED (item))
+#endif
gtk_widget_realize (GTK_WIDGET (item));
EGG_DOCK_ITEM_SET_FLAGS (item, EGG_DOCK_IN_DRAG);
diff --git a/libegg/dock/egg-dock-tablabel.c b/libegg/dock/egg-dock-tablabel.c
index 193447e..ee18533 100644
--- a/libegg/dock/egg-dock-tablabel.c
+++ b/libegg/dock/egg-dock-tablabel.c
@@ -327,7 +327,11 @@ egg_dock_tablabel_size_allocate (GtkWidget *widget,
widget->allocation = *allocation;
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_realized (widget))
+#else
if (GTK_WIDGET_REALIZED (widget))
+#endif
gdk_window_move_resize (tablabel->event_window,
allocation->x,
allocation->y,
diff --git a/libegg/dock/egg-dock.c b/libegg/dock/egg-dock.c
index fd6ff85..35eee61 100644
--- a/libegg/dock/egg-dock.c
+++ b/libegg/dock/egg-dock.c
@@ -918,7 +918,11 @@ egg_dock_dock (EggDockObject *object,
/* Realize the item (create its corresponding GdkWindow) when
EggDock has been realized. */
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_realized (dock))
+#else
if (GTK_WIDGET_REALIZED (dock))
+#endif
gtk_widget_realize (widget);
/* Map the widget if it's visible and the parent is visible and has
@@ -1168,7 +1172,11 @@ egg_dock_xor_rect (EggDock *dock,
widget = GTK_WIDGET (dock);
if (!dock->_priv->xor_gc) {
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_realized (widget)) {
+#else
if (GTK_WIDGET_REALIZED (widget)) {
+#endif
GdkGCValues values;
values.function = GDK_INVERT;
diff --git a/libegg/iconchooser/eggiconchooserdialog.c b/libegg/iconchooser/eggiconchooserdialog.c
index d484201..c4a17dc 100644
--- a/libegg/iconchooser/eggiconchooserdialog.c
+++ b/libegg/iconchooser/eggiconchooserdialog.c
@@ -334,7 +334,11 @@ clamp_to_screen (GtkWidget *widget,
int monitor_num;
GdkRectangle monitor;
+#if GTK_CHECK_VERSION(2,20,0)
+ g_return_if_fail (gtk_widget_get_realized (widget));
+#else
g_return_if_fail (GTK_WIDGET_REALIZED (widget));
+#endif
screen = gtk_widget_get_screen (widget);
monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
@@ -470,7 +474,11 @@ static void
widget_default_size_changed (GtkFileChooserEmbed *embed,
gpointer user_data)
{
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_realized (embed))
+#else
if (GTK_WIDGET_REALIZED (embed))
+#endif
widget_realized_default_size_changed (embed, user_data);
else
widget_unrealized_default_size_changed (embed, user_data);
diff --git a/libegg/toolpalette/eggtoolitemgroup.c b/libegg/toolpalette/eggtoolitemgroup.c
index fd4d48c..99d5c23 100644
--- a/libegg/toolpalette/eggtoolitemgroup.c
+++ b/libegg/toolpalette/eggtoolitemgroup.c
@@ -1658,7 +1658,11 @@ egg_tool_item_group_animation_cb (gpointer data)
group->priv->expander_style = GTK_EXPANDER_EXPANDED;
}
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_realized (group->priv->header))
+#else
if (GTK_WIDGET_REALIZED (group->priv->header))
+#endif
{
GtkWidget *alignment = egg_tool_item_group_get_alignment (group);
GdkRectangle area;
@@ -1673,7 +1677,11 @@ egg_tool_item_group_animation_cb (gpointer data)
gdk_window_invalidate_rect (group->priv->header->window, &area, TRUE);
}
+#if GTK_CHECK_VERSION(2,20,0)
+ if (gtk_widget_get_realized (group))
+#else
if (GTK_WIDGET_REALIZED (group))
+#endif
{
GtkWidget *widget = GTK_WIDGET (group);
GtkWidget *parent = gtk_widget_get_parent (widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]