[ruby-gnome2-devel-ja] =?iso-2022-jp?B?R2RrOjpEcmF3YWJsZSNkcmF3X2w=?= =?iso-2022-jp?B?YXlvdXQbJEIkTjB6P3QkSCQ3GyhC?= =?iso-2022-jp?B?GyRCJEYbKEJuaWwbJEIkcjV2JDckRiRbJDckJBsoQg==?=

[Kouhei S. <ko...@co...>]

須藤です．

Gdk::Drawable#draw_layoutのfg, bgとしてnilを渡した時は
gdk_draw_layout_with_colorsにNULLを渡すようにしてもよいです
か？

# 本当はRVAL2BOXEDを，nilを渡された時にNULLを返すようにした
# いけど，それだと影響が大きすぎるかしら．


Index: gtk/src/rbgdkdraw.c
===================================================================
RCS file: /cvsroot/ruby-gnome2/ruby-gnome2/gtk/src/rbgdkdraw.c,v
retrieving revision 1.22
diff -u -p -r1.22 rbgdkdraw.c
--- gtk/src/rbgdkdraw.c 7 Feb 2005 16:56:39 -0000       1.22
+++ gtk/src/rbgdkdraw.c 6 Jul 2005 03:16:53 -0000
@@ -328,8 +328,8 @@ gdkdraw_layout(argc, argv, self)
     } else if (argc == 6){
         gdk_draw_layout_with_colors( _SELF(self), GDK_GC(RVAL2GOBJ(gc)),
                                      NUM2INT(x), NUM2INT(y), PANGO_LAYOUT(RVAL2GOBJ(layout)),
-                                     (GdkColor*)RVAL2BOXED(fg, GDK_TYPE_COLOR),
-                                     (GdkColor*)RVAL2BOXED(bg, GDK_TYPE_COLOR));
+                                     NIL_P(fg) ? NULL : (GdkColor*)RVAL2BOXED(fg, GDK_TYPE_COLOR),
+                                     NIL_P(bg) ? NULL : (GdkColor*)RVAL2BOXED(bg, GDK_TYPE_COLOR));
     } else {
         rb_raise(rb_eArgError, "Wrong arguments");
     }