diff options
Diffstat (limited to 'gtk')
| -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 |
6 files changed, 5 insertions, 10 deletions
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index f68e7ac93a..de78722f5b 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 151a5c0eb8..04909165af 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 0f3767a03a..fb006fb242 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 2f9261d8a5..49074bc8ea 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 0eecc000d0..51dc06624c 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 cbecece686..4c571f93b7 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) { |