Handle gtk_window_get_geometry_info() returning NULL. (#107311, John

Thu Jun  5 20:12:51 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_get_default_size): Handle
        gtk_window_get_geometry_info() returning NULL.
        (#107311, John Finlay)
This commit is contained in:
Owen Taylor 2003-06-06 00:17:48 +00:00 committed by Owen Taylor
parent 27c08ab4b0
commit d4ed293db4
6 changed files with 32 additions and 2 deletions

View File

@ -1,3 +1,9 @@
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
gtk_window_get_geometry_info() returning NULL.
(#107311, John Finlay)
Thu Jun 5 19:24:33 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

View File

@ -1,3 +1,9 @@
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
gtk_window_get_geometry_info() returning NULL.
(#107311, John Finlay)
Thu Jun 5 19:24:33 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

View File

@ -1,3 +1,9 @@
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
gtk_window_get_geometry_info() returning NULL.
(#107311, John Finlay)
Thu Jun 5 19:24:33 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

View File

@ -1,3 +1,9 @@
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
gtk_window_get_geometry_info() returning NULL.
(#107311, John Finlay)
Thu Jun 5 19:24:33 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

View File

@ -1,3 +1,9 @@
Thu Jun 5 20:12:51 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_get_default_size): Handle
gtk_window_get_geometry_info() returning NULL.
(#107311, John Finlay)
Thu Jun 5 19:24:33 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtktoolbar.c (gtk_toolbar_expose): Subtract off

View File

@ -2953,10 +2953,10 @@ gtk_window_get_default_size (GtkWindow *window,
info = gtk_window_get_geometry_info (window, FALSE);
if (width)
*width = info->default_width;
*width = info ? info->default_width : -1;
if (height)
*height = info->default_height;
*height = info ? info->default_height : -1;
}
/**