summaryrefslogtreecommitdiff
path: root/gtk/gtkwindow.c
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>1998-11-06 16:03:17 +0000
committerOwen Taylor <otaylor@src.gnome.org>1998-11-06 16:03:17 +0000
commit093032a4c1940919ef403556d4912f371c3bfc24 (patch)
tree78ec24e0d6ce2d84453f27ba496673f53206db8e /gtk/gtkwindow.c
parent4b0e615fc5e2ab8c996f08e5401ba459eca7f078 (diff)
downloadgtk+-themes-2.tar.gz
Queue a clear/redraw, not just a redraw, so the focus gets undrawnthemes-2
Thu Nov 5 12:06:16 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtkcheckbutton.c (gtk_check_button_draw_focus): Queue a clear/redraw, not just a redraw, so the focus gets undrawn properly. * gtk/gtktogglebutton.c (gtk_toggle_button_unrealize): Chain to gtk_widget_unrealize() instead of duplicating code. Wed Nov 4 14:34:51 1998 Owen Taylor <otaylor@redhat.com> * gdk/gdk.c gdk/gdkprivate.h gdk/gdkwindow.c: Removed last vestiges of old DND. Tue Nov 3 12:27:52 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c: Restored inner border to entries, erase cursors to background image. Fri Oct 30 12:09:21 1998 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c gtk/gtkstyle.[ch]: removed paint_entry() - it was identical to paint_flat_box(). * gtk/gtkstyle.c: Coding style fixups. * gtk/gtkwindow.c (gtk_window_move_resize): removed useless test. * gtk/gtkframe.c gtkstyle.[ch] gtknotebook.c: Change 'side' for paint_[box/shadow]_gap and paint_extension to be GtkPositionType instead of a random int. * gtk/gtkaspectframe.c (gtk_aspect_frame_paint): Use "frame" as detail - an aspectframe should draw identical to a frame. Tue Oct 27 09:58:11 1998 Owen Taylor <otaylor@redhat.com> * gdk/gdkwindow.c (gdk_window_merge_child_shapes): renamed from combine_child_shapes(). * gdk/gdkwindow.c: Merge propagate_shapes() and propagate_combine_shapes() to remove code duplication.
Diffstat (limited to 'gtk/gtkwindow.c')
-rw-r--r--gtk/gtkwindow.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 4d608b3cf0..97ec38c05c 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -624,7 +624,7 @@ gtk_window_realize (GtkWidget *widget)
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
- gtk_window_draw(widget, NULL);
+ gtk_window_paint (widget, NULL);
}
static void
@@ -1156,7 +1156,7 @@ gtk_window_move_resize (GtkWindow *window)
(height < widget->requisition.height))))
{
window->resize_count += 1;
- if ((x != -1) && (y != -1) && (window->position != GTK_WIN_POS_NONE))
+ if ((x != -1) && (y != -1))
gdk_window_move_resize (widget->window, x, y,
widget->requisition.width,
widget->requisition.height);
@@ -1171,21 +1171,21 @@ gtk_window_move_resize (GtkWindow *window)
* visible, so reallocate everything, since we didn't
* keep track of what changed
*/
- GtkAllocation allocation;
-
- allocation.x = 0;
- allocation.y = 0;
- allocation.width = widget->requisition.width;
- allocation.height = widget->requisition.height;
-
- gtk_widget_size_allocate (widget, &allocation);
+ GtkAllocation allocation;
+
+ allocation.x = 0;
+ allocation.y = 0;
+ allocation.width = widget->requisition.width;
+ allocation.height = widget->requisition.height;
+
+ gtk_widget_size_allocate (widget, &allocation);
}
else
{
- if ((x != -1) && (y != -1))
- gdk_window_move (widget->window, x, y);
-
- gtk_container_resize_children (GTK_CONTAINER (window));
+ if ((x != -1) && (y != -1))
+ gdk_window_move (widget->window, x, y);
+
+ gtk_container_resize_children (GTK_CONTAINER (window));
}
}