diff options
author | Manish Singh <yosh@src.gnome.org> | 1998-11-08 05:58:41 +0000 |
---|---|---|
committer | Manish Singh <yosh@src.gnome.org> | 1998-11-08 05:58:41 +0000 |
commit | 3c07b7ebbd3d6ddb3dae9bdee185d14c6adaea56 (patch) | |
tree | 7f8cbb123b28b658a0530af5742ac4d000fa4d93 | |
parent | a77c4da512b1e3fedce9d9105d8961e47f6e5100 (diff) | |
download | gdk-pixbuf-3c07b7ebbd3d6ddb3dae9bdee185d14c6adaea56.tar.gz |
check if column[i].button is valid before calling gtk_widget_intersect on
* gtk/gtkclist.c: check if column[i].button is valid before calling
gtk_widget_intersect on it in gtk_clist_draw
* gtk/gtkdnd.c: removed unused variable empty_bits
* gtk/gtkrc.c: we should use gslist_* functions with GSLists...
* gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return
a boolean (thanks to Elrond for noticing this)
-Yosh
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 12 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 12 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 12 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 12 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 12 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 12 | ||||
-rw-r--r-- | gtk/gtkclist.c | 3 | ||||
-rw-r--r-- | gtk/gtkdnd.c | 5 | ||||
-rw-r--r-- | gtk/gtkrc.c | 2 | ||||
-rw-r--r-- | gtk/gtktypeutils.c | 2 | ||||
-rw-r--r-- | gtk/gtktypeutils.h | 2 | ||||
-rw-r--r-- | gtk/testgtk.c | 1 | ||||
-rw-r--r-- | tests/testgtk.c | 1 |
14 files changed, 89 insertions, 11 deletions
@@ -1,3 +1,15 @@ +Sat Nov 7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org> + + * gtk/gtkclist.c: check if column[i].button is valid before calling + gtk_widget_intersect on it in gtk_clist_draw + + * gtk/gtkdnd.c: removed unused variable empty_bits + + * gtk/gtkrc.c: we should use gslist_* functions with GSLists... + + * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return + a boolean (thanks to Elrond for noticing this) + 1998-11-07 Jay Cox <jaycox@earthlink.net> * gtk/gtkwindow.c: forward declaration for gtk_window_paint diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 52bae6155..c38c10422 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,15 @@ +Sat Nov 7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org> + + * gtk/gtkclist.c: check if column[i].button is valid before calling + gtk_widget_intersect on it in gtk_clist_draw + + * gtk/gtkdnd.c: removed unused variable empty_bits + + * gtk/gtkrc.c: we should use gslist_* functions with GSLists... + + * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return + a boolean (thanks to Elrond for noticing this) + 1998-11-07 Jay Cox <jaycox@earthlink.net> * gtk/gtkwindow.c: forward declaration for gtk_window_paint diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 52bae6155..c38c10422 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Sat Nov 7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org> + + * gtk/gtkclist.c: check if column[i].button is valid before calling + gtk_widget_intersect on it in gtk_clist_draw + + * gtk/gtkdnd.c: removed unused variable empty_bits + + * gtk/gtkrc.c: we should use gslist_* functions with GSLists... + + * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return + a boolean (thanks to Elrond for noticing this) + 1998-11-07 Jay Cox <jaycox@earthlink.net> * gtk/gtkwindow.c: forward declaration for gtk_window_paint diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 52bae6155..c38c10422 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,15 @@ +Sat Nov 7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org> + + * gtk/gtkclist.c: check if column[i].button is valid before calling + gtk_widget_intersect on it in gtk_clist_draw + + * gtk/gtkdnd.c: removed unused variable empty_bits + + * gtk/gtkrc.c: we should use gslist_* functions with GSLists... + + * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return + a boolean (thanks to Elrond for noticing this) + 1998-11-07 Jay Cox <jaycox@earthlink.net> * gtk/gtkwindow.c: forward declaration for gtk_window_paint diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 52bae6155..c38c10422 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Sat Nov 7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org> + + * gtk/gtkclist.c: check if column[i].button is valid before calling + gtk_widget_intersect on it in gtk_clist_draw + + * gtk/gtkdnd.c: removed unused variable empty_bits + + * gtk/gtkrc.c: we should use gslist_* functions with GSLists... + + * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return + a boolean (thanks to Elrond for noticing this) + 1998-11-07 Jay Cox <jaycox@earthlink.net> * gtk/gtkwindow.c: forward declaration for gtk_window_paint diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 52bae6155..c38c10422 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Sat Nov 7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org> + + * gtk/gtkclist.c: check if column[i].button is valid before calling + gtk_widget_intersect on it in gtk_clist_draw + + * gtk/gtkdnd.c: removed unused variable empty_bits + + * gtk/gtkrc.c: we should use gslist_* functions with GSLists... + + * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return + a boolean (thanks to Elrond for noticing this) + 1998-11-07 Jay Cox <jaycox@earthlink.net> * gtk/gtkwindow.c: forward declaration for gtk_window_paint diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 52bae6155..c38c10422 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Sat Nov 7 21:55:00 PST 1998 Manish Singh <yosh@gimp.org> + + * gtk/gtkclist.c: check if column[i].button is valid before calling + gtk_widget_intersect on it in gtk_clist_draw + + * gtk/gtkdnd.c: removed unused variable empty_bits + + * gtk/gtkrc.c: we should use gslist_* functions with GSLists... + + * gtk/gtktypeutils.[ch]: makes more send for gtk_type_is_a to return + a boolean (thanks to Elrond for noticing this) + 1998-11-07 Jay Cox <jaycox@earthlink.net> * gtk/gtkwindow.c: forward declaration for gtk_window_paint diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index f68e7ac93..de78722f5 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -4429,7 +4429,8 @@ gtk_clist_draw (GtkWidget *widget, { if (!clist->column[i].visible) continue; - if (gtk_widget_intersect(clist->column[i].button, area, &child_area)) + if (clist->column[i].button && + gtk_widget_intersect(clist->column[i].button, area, &child_area)) gtk_widget_draw (clist->column[i].button, &child_area); } } diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 151a5c0eb..04909165a 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -282,11 +282,6 @@ static char action_none_mask_bits[] = { 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x07, 0x00, }; -static char empty_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; - #define CURSOR_WIDTH 16 #define CURSOR_HEIGHT 16 diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 0f3767a03..fb006fb24 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -612,7 +612,7 @@ gtk_rc_get_style (GtkWidget *widget) rc_style_key_id); if (widget_rc_style) - rc_styles = g_list_prepend (rc_styles, widget_rc_style); + rc_styles = g_slist_prepend (rc_styles, widget_rc_style); if (gtk_rc_sets_widget) { diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c index 2f9261d8a..49074bc8e 100644 --- a/gtk/gtktypeutils.c +++ b/gtk/gtktypeutils.c @@ -463,7 +463,7 @@ gtk_type_describe_tree (GtkType type, } } -gint +gboolean gtk_type_is_a (GtkType type, GtkType is_a_type) { diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h index 0eecc000d..51dc06624 100644 --- a/gtk/gtktypeutils.h +++ b/gtk/gtktypeutils.h @@ -325,7 +325,7 @@ void gtk_type_free (GtkType type, void gtk_type_describe_heritage (GtkType type); void gtk_type_describe_tree (GtkType type, gboolean show_size); -gint gtk_type_is_a (GtkType type, +gboolean gtk_type_is_a (GtkType type, GtkType is_a_type); GtkTypeObject* gtk_type_check_object_cast (GtkTypeObject *type_object, GtkType cast_type); diff --git a/gtk/testgtk.c b/gtk/testgtk.c index cbecece68..4c571f93b 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -1843,7 +1843,6 @@ create_pixmap (void) GtkWidget *pixmapwid; GdkPixmap *pixmap; GdkBitmap *mask; - GtkStyle *style; if (!window) { diff --git a/tests/testgtk.c b/tests/testgtk.c index cbecece68..4c571f93b 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -1843,7 +1843,6 @@ create_pixmap (void) GtkWidget *pixmapwid; GdkPixmap *pixmap; GdkBitmap *mask; - GtkStyle *style; if (!window) { |