diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-02-24 05:05:15 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-02-24 05:05:15 +0000 |
| commit | 23a249a04320a65fc5648330683914b3b2d3748e (patch) | |
| tree | fdd0a9c27af52240c69cdb94ea30114fcd7b0a1d /gtk/gtkwindow.c | |
| parent | c44a49fa0c5ff502d57d5cf43f78d0dafbc1aa7b (diff) | |
| download | gtk+-23a249a04320a65fc5648330683914b3b2d3748e.tar.gz | |
Sanity check default font family name and size.
Sat Feb 23 22:37:23 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_init): Sanity check default
font family name and size.
* gtk/gtkwindow.c (gtk_window_set_default_size): Remove
incorrect comment about the geometry widget.
* gtk/gtkwindow.c (gtk_window_move_resize): Unset the
gtk_window_resize)() information once we've set the size
once, to avoid it coming back next time we queue a resize.
(#72359)
* gtk/gtkwindow.c (gtk_window_move_resize): Remove
setthing of ->need_default_size from here, Havoc
says that it should correspond more or less exactly
to GTK_WIDGET_MAPPED (window).
Diffstat (limited to 'gtk/gtkwindow.c')
| -rw-r--r-- | gtk/gtkwindow.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 7f860fc587..dbfd9c69f7 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2405,11 +2405,6 @@ gtk_window_set_default_size_internal (GtkWindow *window, * For more control over a window's initial size and how resizing works, * investigate gtk_window_set_geometry_hints(). * - * A useful feature: if you set the "geometry widget" via - * gtk_window_set_geometry_hints(), the default size specified by - * gtk_window_set_default_size() will be the default size of that - * widget, not of the entire window. - * * For some uses, gtk_window_resize() is a more appropriate function. * gtk_window_resize() changes the current size of the window, rather * than the size to be used on initial display. gtk_window_resize() always @@ -2467,8 +2462,8 @@ gtk_window_get_default_size (GtkWindow *window, /** * gtk_window_resize: * @window: a #GtkWindow - * @width: width to resize the window to - * @height: height to resize the window to + * @width: width in pixels to resize the window to + * @height: height in pixels to resize the window to * * Resizes the window as if the user had done so, obeying geometry * constraints. The default geometry constraint is that windows may @@ -4384,8 +4379,9 @@ gtk_window_move_resize (GtkWindow *window) * GTK_RESIZE_IMMEDIATE containers) */ info->position_constraints_changed = FALSE; - window->need_default_position = FALSE; info->initial_pos_set = FALSE; + info->resize_width = -1; + info->resize_height = -1; /* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new * configure event in response to our resizing request. |