callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refixed merge conflicts for GTK_WIDGET_MAPPED/GTK_WIDGET_VISIBLE

Browse Source
This commit is contained in:
Tristan Van Berkom 2010-04-03 21:35:18 -04:00
parent 5d83f5eba5
commit ae2c0b02c3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkbox.c
View File

@ -478,7 +478,7 @@ gtk_box_size_allocate (GtkWidget *widget,
child = children->data; child = children->data;
children = children->next; children = children->next;
if (GTK_WIDGET_VISIBLE (child->widget)) if (gtk_widget_get_visible (child->widget))
{ {
if (private->orientation == GTK_ORIENTATION_HORIZONTAL) if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (child->widget), gtk_extended_layout_get_width_for_height (GTK_EXTENDED_LAYOUT (child->widget),

2
gtk/gtksocket-x11.c
View File

@ -141,7 +141,7 @@ _gtk_socket_windowing_get_natural_size (GtkSocket *socket)
priv->natural_width = 1; priv->natural_width = 1;
priv->natural_height = 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); display = gdk_drawable_get_display (socket->plug_window);
property = gdk_x11_get_xatom_by_name_for_display (display, "_GTK_NATURAL_SIZE"); property = gdk_x11_get_xatom_by_name_for_display (display, "_GTK_NATURAL_SIZE");