Commit 3c07b7eb authored by Manish Singh's avatar Manish Singh

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
parent a77c4da5
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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);
}
}
......
......@@ -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
......
......@@ -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)
{
......
......@@ -463,7 +463,7 @@ gtk_type_describe_tree (GtkType type,
}
}
gint
gboolean
gtk_type_is_a (GtkType type,
GtkType is_a_type)
{
......
......@@ -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);
......
......@@ -1843,7 +1843,6 @@ create_pixmap (void)
GtkWidget *pixmapwid;
GdkPixmap *pixmap;
GdkBitmap *mask;
GtkStyle *style;
if (!window)
{
......
......@@ -1843,7 +1843,6 @@ create_pixmap (void)
GtkWidget *pixmapwid;
GdkPixmap *pixmap;
GdkBitmap *mask;
GtkStyle *style;
if (!window)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment