Commit fd7eda15 authored by Søren Sandmann's avatar Søren Sandmann Committed by Søren Sandmann Pedersen

Check for NULL detail and NULL widget.

Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>

	* gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
	and NULL widget.

	* gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
	NULL widget.  (#164477, Michael Natterer)
parent 014a347f
Tue Jan 18 10:55:47 2005 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
and NULL widget.
* gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
NULL widget. (#164477, Michael Natterer)
2005-01-18 Matthias Clasen <mclasen@redhat.com>
Avoid X errors when running against servers which
......
Tue Jan 18 10:55:47 2005 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
and NULL widget.
* gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
NULL widget. (#164477, Michael Natterer)
2005-01-18 Matthias Clasen <mclasen@redhat.com>
Avoid X errors when running against servers which
......
Tue Jan 18 10:55:47 2005 Søren Sandmann <sandmann@redhat.com>
* gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
and NULL widget.
* gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
NULL widget. (#164477, Michael Natterer)
2005-01-18 Matthias Clasen <mclasen@redhat.com>
Avoid X errors when running against servers which
......
......@@ -3468,9 +3468,9 @@ gtk_default_draw_box (GtkStyle *style,
{
GdkGC *gc = style->bg_gc[state_type];
if (state_type == GTK_STATE_SELECTED && strcmp (detail, "paned") == 0)
if (state_type == GTK_STATE_SELECTED && detail && strcmp (detail, "paned") == 0)
{
if (!GTK_WIDGET_HAS_FOCUS (widget))
if (widget && !GTK_WIDGET_HAS_FOCUS (widget))
gc = style->base_gc[GTK_STATE_ACTIVE];
}
......@@ -4877,13 +4877,13 @@ gtk_default_draw_handle (GtkStyle *style,
detail, x, y, width, height);
if (!strcmp (detail, "paned"))
if (detail && !strcmp (detail, "paned"))
{
/* we want to ignore the shadow border in paned widgets */
xthick = 0;
ythick = 0;
if (state_type == GTK_STATE_SELECTED && !GTK_WIDGET_HAS_FOCUS (widget))
if (state_type == GTK_STATE_SELECTED && widget && !GTK_WIDGET_HAS_FOCUS (widget))
{
GdkColor unfocused_light;
......
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