+Wed Jun 24 16:38:02 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtkbin.c (gtk_bin_remove): do not avoid to queue for a resize
+ if the container is not visible, we might be a toplevel! this holds
+ for all other base container implementations as well, that are
+ candidates to derive toplevels from. in general the resizing code will
+ care about visibility itself.
+ * gtk/gtkmenushell.c (gtk_menu_shell_remove): likewise.
+ * gtk/gtkbox.c (gtk_box_remove): likewise.
+
+ * gtk/gtkwindow.c (gtk_window_move_resize): save ->use_uposition around
+ gtk_window_set_hints(), since we haven't calculated the new position
+ yet.
+
+ * gdk/gdkwindow.c (gdk_window_get_pointer): take care that *x, *y and
+ *mask are alway initialized in a sane way, regardless of the return
+ value.
+
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
* more GtkType and macro fixups.
->>>>>>> 1.476
1998-06-16 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkhandlebox.c (draw_textured_frame): Now accepts an extra
+Wed Jun 24 16:38:02 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtkbin.c (gtk_bin_remove): do not avoid to queue for a resize
+ if the container is not visible, we might be a toplevel! this holds
+ for all other base container implementations as well, that are
+ candidates to derive toplevels from. in general the resizing code will
+ care about visibility itself.
+ * gtk/gtkmenushell.c (gtk_menu_shell_remove): likewise.
+ * gtk/gtkbox.c (gtk_box_remove): likewise.
+
+ * gtk/gtkwindow.c (gtk_window_move_resize): save ->use_uposition around
+ gtk_window_set_hints(), since we haven't calculated the new position
+ yet.
+
+ * gdk/gdkwindow.c (gdk_window_get_pointer): take care that *x, *y and
+ *mask are alway initialized in a sane way, regardless of the return
+ value.
+
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
* more GtkType and macro fixups.
->>>>>>> 1.476
1998-06-16 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkhandlebox.c (draw_textured_frame): Now accepts an extra
+Wed Jun 24 16:38:02 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtkbin.c (gtk_bin_remove): do not avoid to queue for a resize
+ if the container is not visible, we might be a toplevel! this holds
+ for all other base container implementations as well, that are
+ candidates to derive toplevels from. in general the resizing code will
+ care about visibility itself.
+ * gtk/gtkmenushell.c (gtk_menu_shell_remove): likewise.
+ * gtk/gtkbox.c (gtk_box_remove): likewise.
+
+ * gtk/gtkwindow.c (gtk_window_move_resize): save ->use_uposition around
+ gtk_window_set_hints(), since we haven't calculated the new position
+ yet.
+
+ * gdk/gdkwindow.c (gdk_window_get_pointer): take care that *x, *y and
+ *mask are alway initialized in a sane way, regardless of the return
+ value.
+
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
* more GtkType and macro fixups.
->>>>>>> 1.476
1998-06-16 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkhandlebox.c (draw_textured_frame): Now accepts an extra
+Wed Jun 24 16:38:02 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtkbin.c (gtk_bin_remove): do not avoid to queue for a resize
+ if the container is not visible, we might be a toplevel! this holds
+ for all other base container implementations as well, that are
+ candidates to derive toplevels from. in general the resizing code will
+ care about visibility itself.
+ * gtk/gtkmenushell.c (gtk_menu_shell_remove): likewise.
+ * gtk/gtkbox.c (gtk_box_remove): likewise.
+
+ * gtk/gtkwindow.c (gtk_window_move_resize): save ->use_uposition around
+ gtk_window_set_hints(), since we haven't calculated the new position
+ yet.
+
+ * gdk/gdkwindow.c (gdk_window_get_pointer): take care that *x, *y and
+ *mask are alway initialized in a sane way, regardless of the return
+ value.
+
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
* more GtkType and macro fixups.
->>>>>>> 1.476
1998-06-16 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkhandlebox.c (draw_textured_frame): Now accepts an extra
+Wed Jun 24 16:38:02 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtkbin.c (gtk_bin_remove): do not avoid to queue for a resize
+ if the container is not visible, we might be a toplevel! this holds
+ for all other base container implementations as well, that are
+ candidates to derive toplevels from. in general the resizing code will
+ care about visibility itself.
+ * gtk/gtkmenushell.c (gtk_menu_shell_remove): likewise.
+ * gtk/gtkbox.c (gtk_box_remove): likewise.
+
+ * gtk/gtkwindow.c (gtk_window_move_resize): save ->use_uposition around
+ gtk_window_set_hints(), since we haven't calculated the new position
+ yet.
+
+ * gdk/gdkwindow.c (gdk_window_get_pointer): take care that *x, *y and
+ *mask are alway initialized in a sane way, regardless of the return
+ value.
+
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
* more GtkType and macro fixups.
->>>>>>> 1.476
1998-06-16 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkhandlebox.c (draw_textured_frame): Now accepts an extra
+Wed Jun 24 16:38:02 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtkbin.c (gtk_bin_remove): do not avoid to queue for a resize
+ if the container is not visible, we might be a toplevel! this holds
+ for all other base container implementations as well, that are
+ candidates to derive toplevels from. in general the resizing code will
+ care about visibility itself.
+ * gtk/gtkmenushell.c (gtk_menu_shell_remove): likewise.
+ * gtk/gtkbox.c (gtk_box_remove): likewise.
+
+ * gtk/gtkwindow.c (gtk_window_move_resize): save ->use_uposition around
+ gtk_window_set_hints(), since we haven't calculated the new position
+ yet.
+
+ * gdk/gdkwindow.c (gdk_window_get_pointer): take care that *x, *y and
+ *mask are alway initialized in a sane way, regardless of the return
+ value.
+
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
* more GtkType and macro fixups.
->>>>>>> 1.476
1998-06-16 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkhandlebox.c (draw_textured_frame): Now accepts an extra
+Wed Jun 24 16:38:02 1998 Tim Janik <timj@gtk.org>
+
+ * gtk/gtkbin.c (gtk_bin_remove): do not avoid to queue for a resize
+ if the container is not visible, we might be a toplevel! this holds
+ for all other base container implementations as well, that are
+ candidates to derive toplevels from. in general the resizing code will
+ care about visibility itself.
+ * gtk/gtkmenushell.c (gtk_menu_shell_remove): likewise.
+ * gtk/gtkbox.c (gtk_box_remove): likewise.
+
+ * gtk/gtkwindow.c (gtk_window_move_resize): save ->use_uposition around
+ gtk_window_set_hints(), since we haven't calculated the new position
+ yet.
+
+ * gdk/gdkwindow.c (gdk_window_get_pointer): take care that *x, *y and
+ *mask are alway initialized in a sane way, regardless of the return
+ value.
+
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
* more GtkType and macro fixups.
->>>>>>> 1.476
1998-06-16 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkhandlebox.c (draw_textured_frame): Now accepts an extra
GdkWindowPrivate *private;
gint return_val;
Window child;
- gint tx, ty;
+ gint tx = 0;
+ gint ty = 0;
g_return_val_if_fail (window != NULL, 0);
0, 0, &tx, &ty,
&child);
- if (x)
- *x = tx;
- if (y)
- *y = ty;
}
else
return_val = 0;
+ if (x)
+ *x = tx;
+ if (y)
+ *y = ty;
+
return return_val;
}
Window root;
Window child;
int rootx, rooty;
- int winx, winy;
- unsigned int xmask;
+ int winx = 0;
+ int winy = 0;
+ unsigned int xmask = 0;
if (!window)
window = (GdkWindow*) &gdk_root_parent;
XQueryPointer (private->xdisplay, private->xwindow, &root, &child,
&rootx, &rooty, &winx, &winy, &xmask))
{
- if (x) *x = winx;
- if (y) *y = winy;
- if (mask) *mask = xmask;
-
if (child)
return_val = gdk_window_lookup (child);
}
+ if (x)
+ *x = winx;
+ if (y)
+ *y = winy;
+ if (mask)
+ *mask = xmask;
+
return return_val;
}
GdkWindowPrivate *private;
gint return_val;
Window child;
- gint tx, ty;
+ gint tx = 0;
+ gint ty = 0;
g_return_val_if_fail (window != NULL, 0);
0, 0, &tx, &ty,
&child);
- if (x)
- *x = tx;
- if (y)
- *y = ty;
}
else
return_val = 0;
+ if (x)
+ *x = tx;
+ if (y)
+ *y = ty;
+
return return_val;
}
Window root;
Window child;
int rootx, rooty;
- int winx, winy;
- unsigned int xmask;
+ int winx = 0;
+ int winy = 0;
+ unsigned int xmask = 0;
if (!window)
window = (GdkWindow*) &gdk_root_parent;
XQueryPointer (private->xdisplay, private->xwindow, &root, &child,
&rootx, &rooty, &winx, &winy, &xmask))
{
- if (x) *x = winx;
- if (y) *y = winy;
- if (mask) *mask = xmask;
-
if (child)
return_val = gdk_window_lookup (child);
}
+ if (x)
+ *x = winx;
+ if (y)
+ *y = winy;
+ if (mask)
+ *mask = xmask;
+
return return_val;
}
gtk_widget_unparent (widget);
bin->child = NULL;
- if (widget_was_visible && GTK_WIDGET_VISIBLE (container))
+ /* queue resize regardless of GTK_WIDGET_VISIBLE (container),
+ * since that's what is needed by toplevels, which derive from GtkBin.
+ */
+ if (widget_was_visible)
gtk_widget_queue_resize (GTK_WIDGET (container));
}
}
if (child->widget == widget)
{
- gint visible;
+ gboolean was_visible;
- visible = GTK_WIDGET_VISIBLE (widget);
+ was_visible = GTK_WIDGET_VISIBLE (widget);
gtk_widget_unparent (widget);
box->children = g_list_remove_link (box->children, children);
g_list_free (children);
g_free (child);
- if (visible && GTK_WIDGET_VISIBLE (container))
+ /* queue resize regardless of GTK_WIDGET_VISIBLE (container),
+ * since that's what is needed by toplevels.
+ */
+ if (was_visible)
gtk_widget_queue_resize (GTK_WIDGET (container));
break;
gtk_widget_unparent (widget);
- if (was_visible && GTK_WIDGET_VISIBLE (container))
+ /* queue resize regardless of GTK_WIDGET_VISIBLE (container),
+ * since that's what is needed by toplevels.
+ */
+ if (was_visible)
gtk_widget_queue_resize (GTK_WIDGET (container));
}
gtk_widget_set_style (widget, (GtkStyle*) GTK_VALUE_BOXED (*arg));
break;
case ARG_EVENTS:
- gtk_widget_set_events (widget, GTK_VALUE_FLAGS (*arg));
+ if (!GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_NO_WINDOW (widget))
+ gtk_widget_set_events (widget, GTK_VALUE_FLAGS (*arg));
break;
case ARG_EXTENSION_EVENTS:
gtk_widget_set_extension_events (widget, GTK_VALUE_FLAGS (*arg));
width = widget->requisition.width;
height = widget->requisition.height;
gtk_widget_size_request (widget, &widget->requisition);
-
+
if ((width != widget->requisition.width ||
height != widget->requisition.height))
- gtk_window_set_hints (widget, &widget->requisition);
+ {
+ gboolean saved_use_upos;
+
+ saved_use_upos = window->use_uposition;
+ gtk_window_set_hints (widget, &widget->requisition);
+ window->use_uposition = saved_use_upos;
+ }
x = -1;
y = -1;
projects / ~andy / gtk / commitdiff