diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-04-03 21:35:18 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-04-03 21:35:18 -0400 |
| commit | ae2c0b02c3a9023553540d4a07e6636a22ce17d6 (patch) | |
| tree | c77b0075a03b139fd916c8411f12d918b13a7d4f | |
| parent | 5d83f5eba58a7266949c5e47fb5f3fefec10c107 (diff) | |
| download | gdk-pixbuf-ae2c0b02c3a9023553540d4a07e6636a22ce17d6.tar.gz | |
Refixed merge conflicts for GTK_WIDGET_MAPPED/GTK_WIDGET_VISIBLE
| -rw-r--r-- | gtk/gtkbox.c | 2 | ||||
| -rw-r--r-- | gtk/gtksocket-x11.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index a0217f08b..61f237bc4 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -478,7 +478,7 @@ gtk_box_size_allocate (GtkWidget *widget, child = children->data; children = children->next; - if (GTK_WIDGET_VISIBLE (child->widget)) + if (gtk_widget_get_visible (child->widget)) { if (private->orientation == GTK_ORIENTATION_HORIZONTAL) gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (child->widget), diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c index c076f9d0d..c3f3b5b16 100644 --- a/gtk/gtksocket-x11.c +++ b/gtk/gtksocket-x11.c @@ -141,7 +141,7 @@ _gtk_socket_windowing_get_natural_size (GtkSocket *socket) priv->natural_width = 1; priv->natural_height = 1; - if (GTK_WIDGET_MAPPED (socket)) + if (gtk_widget_get_mapped (GTK_WIDGET (socket))) { display = gdk_drawable_get_display (socket->plug_window); property = gdk_x11_get_xatom_by_name_for_display (display, "_GTK_NATURAL_SIZE"); |