From b0f026aecaaf94fac07a849282acddf12e0e6130 Mon Sep 17 00:00:00 2001 From: Bill Haneman Date: Mon, 1 Jul 2002 16:21:51 +0000 Subject: [PATCH] Fix for failure of gdk_pixbuf_xlib_get_from_drawable if source drawable is root window. --- ChangeLog | 6 +++++ ChangeLog.pre-2-10 | 6 +++++ ChangeLog.pre-2-2 | 6 +++++ ChangeLog.pre-2-4 | 6 +++++ ChangeLog.pre-2-6 | 6 +++++ ChangeLog.pre-2-8 | 6 +++++ .../gdk-pixbuf-xlib-drawable.c | 2 +- docs/reference/gtk/tmpl/gtkbutton.sgml | 4 ++-- docs/reference/gtk/tmpl/gtkcheckbutton.sgml | 10 ++++---- docs/reference/gtk/tmpl/gtkdialog.sgml | 4 ++-- docs/reference/gtk/tmpl/gtkoptionmenu.sgml | 10 ++++---- docs/reference/gtk/tmpl/gtkrange.sgml | 20 ++++++++-------- docs/reference/gtk/tmpl/gtkscrollbar.sgml | 24 +++++++++---------- docs/reference/gtk/tmpl/gtktoolbar.sgml | 12 +++++----- docs/reference/gtk/tmpl/gtktreeview.sgml | 10 ++++---- docs/reference/gtk/tmpl/gtkwidget.sgml | 22 ++++++++--------- 16 files changed, 95 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcf8781c9..d25662a94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 01 17:19:00 2002 Bill Haneman + + * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c + (xlib_window_is_viewable): + Fixed failure of assertion when drawable is root window. + Thu Jun 20 19:41:09 2002 Owen Taylor * gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fcf8781c9..d25662a94 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jul 01 17:19:00 2002 Bill Haneman + + * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c + (xlib_window_is_viewable): + Fixed failure of assertion when drawable is root window. + Thu Jun 20 19:41:09 2002 Owen Taylor * gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fcf8781c9..d25662a94 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Jul 01 17:19:00 2002 Bill Haneman + + * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c + (xlib_window_is_viewable): + Fixed failure of assertion when drawable is root window. + Thu Jun 20 19:41:09 2002 Owen Taylor * gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fcf8781c9..d25662a94 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Jul 01 17:19:00 2002 Bill Haneman + + * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c + (xlib_window_is_viewable): + Fixed failure of assertion when drawable is root window. + Thu Jun 20 19:41:09 2002 Owen Taylor * gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fcf8781c9..d25662a94 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jul 01 17:19:00 2002 Bill Haneman + + * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c + (xlib_window_is_viewable): + Fixed failure of assertion when drawable is root window. + Thu Jun 20 19:41:09 2002 Owen Taylor * gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fcf8781c9..d25662a94 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jul 01 17:19:00 2002 Bill Haneman + + * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c + (xlib_window_is_viewable): + Fixed failure of assertion when drawable is root window. + Thu Jun 20 19:41:09 2002 Owen Taylor * gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c index e84d97638..2c8de405a 100644 --- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c +++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c @@ -1145,7 +1145,7 @@ xlib_window_is_viewable (Window w) if (nchildren > 0) XFree (children); - if (parent == root) + if ((parent == root) || (w == root)) return TRUE; w = parent; diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index b67e1009b..606ca5da9 100644 --- a/docs/reference/gtk/tmpl/gtkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkbutton.sgml @@ -248,12 +248,12 @@ mouse cursor is. - + - + diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml index 9f985152d..7b5e72c6a 100644 --- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml @@ -66,13 +66,13 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it. @Returns: - - - - - + + + + + diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml index 978b05e4f..6a113643a 100644 --- a/docs/reference/gtk/tmpl/gtkdialog.sgml +++ b/docs/reference/gtk/tmpl/gtkdialog.sgml @@ -298,7 +298,7 @@ was clicked. - + @@ -308,7 +308,7 @@ was clicked. - + diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index 31debc57f..876a046a5 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -100,13 +100,13 @@ selected value for the option menu. - - - - - + + + + + diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index 94b907eb2..3ad1851a3 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -153,11 +153,6 @@ Emitted when the range value changes. - - - - - @@ -168,6 +163,16 @@ Emitted when the range value changes. + + + + + + + + + + @@ -178,8 +183,3 @@ Emitted when the range value changes. - - - - - diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml index fd755020d..65792a700 100644 --- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml +++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml @@ -54,17 +54,7 @@ The #GtkScrollbar struct does not contain any public data. - - - - - - - - - - - + @@ -79,7 +69,17 @@ The #GtkScrollbar struct does not contain any public data. - + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index c996d878e..71686ff36 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -391,7 +391,7 @@ Should be used if you wish to perform an action when ever the style of a toolbar - + @@ -401,13 +401,13 @@ Should be used if you wish to perform an action when ever the style of a toolbar + + + + + - - - - - diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index be1869394..e96163a6b 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -901,6 +901,11 @@ Function used for #gtk_tree_view_map_expanded_rows. + + + + + @@ -916,11 +921,6 @@ Function used for #gtk_tree_view_map_expanded_rows. - - - - - diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 42b6e26e3..7fde53364 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -2192,6 +2192,16 @@ a widget changes from un-anchored to anchored or vice-versa. + + + + + + + + + + @@ -2207,12 +2217,7 @@ a widget changes from un-anchored to anchored or vice-versa. - - - - - - + @@ -2222,8 +2227,3 @@ a widget changes from un-anchored to anchored or vice-versa. - - - - -