gtk+ r20314 - in branches/gtk-2-12: . modules/engines/ms-windows

[tml svn gnome org]

Author: tml
Date: Wed Jun  4 21:52:46 2008
New Revision: 20314
URL: http://svn.gnome.org/viewvc/gtk+?rev=20314&view=rev

Log:
2008-06-05  Tor Lillqvist  <tml novell com>

	Merge from trunk:

	* modules/engines/ms-windows/msw_style.c (draw_box): Check that
	the widget is a GtkButton before casting.



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/modules/engines/ms-windows/msw_style.c

Modified: branches/gtk-2-12/modules/engines/ms-windows/msw_style.c
==============================================================================
--- branches/gtk-2-12/modules/engines/ms-windows/msw_style.c	(original)
+++ branches/gtk-2-12/modules/engines/ms-windows/msw_style.c	Wed Jun  4 21:52:46 2008
@@ -2016,8 +2016,8 @@
 	    }
 	}
       else if (is_toolbar_child (widget->parent)
-	       || (GTK_RELIEF_NONE ==
-		   gtk_button_get_relief (GTK_BUTTON (widget))))
+	       || (!GTK_IS_BUTTON (widget) ||
+		   (GTK_RELIEF_NONE == gtk_button_get_relief (GTK_BUTTON (widget)))))
 	{
 	  if (draw_tool_button (window, widget, style, x, y,
 				width, height, state_type, area))