[gtk+/native-layout] Don't use GTK_WIDGET_NO_WINDOW in GtkContainer
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout] Don't use GTK_WIDGET_NO_WINDOW in GtkContainer
- Date: Sun, 4 Apr 2010 02:14:49 +0000 (UTC)
commit bcb255593d5ca3f9055d1fb6858a06d678147fda
Author: Christian Dywan <christian twotoasts de>
Date: Mon Jan 4 08:26:50 2010 +0100
Don't use GTK_WIDGET_NO_WINDOW in GtkContainer
gtk/gtkcontainer.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 4c3af74..12737fd 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -2074,13 +2074,13 @@ gtk_container_focus_sort_up_down (GtkContainer *container,
}
else
{
- if (GTK_WIDGET_NO_WINDOW (widget))
+ if (!gtk_widget_get_has_window (widget))
compare.x = widget->allocation.x + widget->allocation.width / 2;
else
compare.x = widget->allocation.width / 2;
}
- if (GTK_WIDGET_NO_WINDOW (widget))
+ if (!gtk_widget_get_has_window (widget))
compare.y = (direction == GTK_DIR_DOWN) ? widget->allocation.y : widget->allocation.y + widget->allocation.height;
else
compare.y = (direction == GTK_DIR_DOWN) ? 0 : + widget->allocation.height;
@@ -2201,13 +2201,13 @@ gtk_container_focus_sort_left_right (GtkContainer *container,
}
else
{
- if (GTK_WIDGET_NO_WINDOW (widget))
+ if (!gtk_widget_get_has_window (widget))
compare.y = widget->allocation.y + widget->allocation.height / 2;
else
compare.y = widget->allocation.height / 2;
}
- if (GTK_WIDGET_NO_WINDOW (widget))
+ if (!gtk_widget_get_has_window (widget))
compare.x = (direction == GTK_DIR_RIGHT) ? widget->allocation.x : widget->allocation.x + widget->allocation.width;
else
compare.x = (direction == GTK_DIR_RIGHT) ? 0 : widget->allocation.width;
@@ -2670,7 +2670,7 @@ gtk_container_map (GtkWidget *widget)
gtk_container_map_child,
NULL);
- if (!GTK_WIDGET_NO_WINDOW (widget))
+ if (gtk_widget_get_has_window (widget))
gdk_window_show (widget->window);
}
@@ -2679,7 +2679,7 @@ gtk_container_unmap (GtkWidget *widget)
{
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
- if (!GTK_WIDGET_NO_WINDOW (widget))
+ if (gtk_widget_get_has_window (widget))
gdk_window_hide (widget->window);
else
gtk_container_forall (GTK_CONTAINER (widget),
@@ -2721,7 +2721,7 @@ gtk_container_propagate_expose (GtkContainer *container,
g_assert (child->parent == GTK_WIDGET (container));
if (GTK_WIDGET_DRAWABLE (child) &&
- GTK_WIDGET_NO_WINDOW (child) &&
+ !gtk_widget_get_has_window (child) &&
(child->window == event->window))
{
child_event = gdk_event_new (GDK_EXPOSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]