[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2 [master] Remove Gtk::Widget#render_icon

[<nu...@co...>]

Masaaki Aoyagi	2011-11-30 10:24:53 +0000 (Wed, 30 Nov 2011)

  New Revision: 6f54c0f7354b68d15f661de3b9566edde6a07cb3

  Merged dcdc522: Merge pull request #64 from masaakiaoyagi/master

  Log:
    Remove Gtk::Widget#render_icon

  Modified files:
    gtk3/ext/gtk3/rbgtkwidget.c
    gtk3/lib/gtk3/deprecated.rb

  Modified: gtk3/ext/gtk3/rbgtkwidget.c (+0 -11)
===================================================================
--- gtk3/ext/gtk3/rbgtkwidget.c    2011-11-30 10:24:08 +0000 (b3d9c03)
+++ gtk3/ext/gtk3/rbgtkwidget.c    2011-11-30 10:24:53 +0000 (c888a4e)
@@ -325,16 +325,6 @@ rg_create_pango_layout(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-rg_render_icon(int argc, VALUE *argv, VALUE self)
-{
-    VALUE stock_id, size, detail;
-    rb_scan_args(argc, argv, "21", &stock_id, &size, &detail);
-    return GOBJ2RVALU(gtk_widget_render_icon(_SELF(self), rb_id2name(SYM2ID(stock_id)),
-                                             RVAL2GENUM(size, GTK_TYPE_ICON_SIZE),
-                                             RVAL2CSTR_ACCEPT_NIL(detail)));
-}
-
-static VALUE
 rg_s_pop_composite_child(VALUE self)
 {
     gtk_widget_pop_composite_child();
@@ -1247,7 +1237,6 @@ Init_gtk_widget(VALUE mGtk)
     RG_DEF_METHOD(create_pango_context, 0);
     RG_DEF_METHOD(pango_context, 0);
     RG_DEF_METHOD(create_pango_layout, -1);
-    RG_DEF_METHOD(render_icon, -1);
     RG_DEF_METHOD(queue_draw_area, 4);
     RG_DEF_METHOD(set_redraw_on_allocate, 1);
     RG_DEF_METHOD(set_composite_name, 1);

  Modified: gtk3/lib/gtk3/deprecated.rb (+3 -0)
===================================================================
--- gtk3/lib/gtk3/deprecated.rb    2011-11-30 10:24:08 +0000 (cf5e525)
+++ gtk3/lib/gtk3/deprecated.rb    2011-11-30 10:24:53 +0000 (16722fa)
@@ -526,6 +526,9 @@ module Gtk
     define_deprecated_method :modify_base, :warn => "Use '#{self}#override_background_color'."
     define_deprecated_method :modify_font, :warn => "Use '#{self}#override_font'."
     define_deprecated_method :modify_cursor, :warn => "Use '#{self}#override_cursor'."
+    define_deprecated_method :render_icon, :warn => "Use '#{self}#render_icon_pixbuf'." do |_self, stock_id, size, detail|
+      _self.render_icon_pixbuf(stock_id, size)
+    end
 
     alias :__set_allocation__ :set_allocation
     private :__set_allocation__