gtk3 2.2.5 → 3.0.1

data/lib/gtk3/builder.rb

@@ -0,0 +1,91 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class Builder
+    alias_method :initialize_raw, :initialize
+    def initialize(options={})
+      file      = options[:file]
+      resource  = options[:resource]
+      string    = options[:string]
+
+      if file
+        initialize_new_from_file(file)
+      elsif resource
+        initialize_new_from_resource(resource)
+      elsif string
+        initialize_new_from_string(string, string.bytesize)
+      else
+        initialize_raw
+      end
+    end
+
+    alias_method :[], :get_object
+
+    alias_method :add_from_string_raw, :add_from_string
+    def add_from_string(string)
+      add_from_string_raw(string, string.bytesize)
+    end
+
+    def add(target)
+      if target.respond_to?(:to_path)
+        add_from_file(target.to_path)
+      elsif target.start_with?("<") or target.start_with?(" ")
+        add_from_string(target)
+      elsif File.exist?(target)
+        add_from_file(target)
+      else
+        add_from_resource(target)
+      end
+    end
+
+    def <<(target)
+      add(target)
+      self
+    end
+
+    private
+    def normalize_handler_name(name)
+      name.gsub(/[-\s]+/, "_")
+    end
+
+    def __connect_signals__(connector, object, signal_name,
+                            handler_name, connect_object, flags)
+      handler_name = normalize_handler_name(handler_name)
+      if connect_object
+        handler = connect_object.method(handler_name)
+      else
+        handler = connector.call(handler_name)
+      end
+      unless handler
+        $stderr.puts("Undefined handler: #{handler_name}") if $DEBUG
+        return
+      end
+
+      if flags.after?
+        signal_connect_method = :signal_connect_after
+      else
+        signal_connect_method = :signal_connect
+      end
+
+      if handler.arity.zero?
+        object.send(signal_connect_method, signal_name) {handler.call}
+      else
+        object.send(signal_connect_method, signal_name, &handler)
+      end
+    end
+  end
+end

data/lib/gtk3/button.rb

@@ -0,0 +1,53 @@
+# Copyright (C) 2014  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class Button
+    alias_method :initialize_raw, :initialize
+    def initialize(options={})
+      label = options[:label]
+      use_underline = options[:use_underline]
+      if use_underline.nil?
+        mnemonic = options[:mnemonic]
+        if mnemonic
+          label = mnemonic
+          use_underline = true
+        end
+      end
+      stock = options[:stock_id]
+      icon_name = options[:icon_name]
+      icon_size = options[:icon_size] || :button
+
+      if label
+        if use_underline
+          initialize_new_with_mnemonic(label)
+        else
+          initialize_new_with_label(label)
+        end
+      elsif stock
+        initialize_new_from_stock(stock)
+      elsif icon_name
+        case icon_size
+        when Symbol, String
+          icon_size = IconSize.new(icon_size.to_s)
+        end
+        initialize_new_from_icon_name(icon_name, icon_size)
+      else
+        initialize_raw
+      end
+    end
+  end
+end

data/lib/gtk3/calendar.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class Calendar
+    alias_method :select_month_raw, :select_month
+    def select_month(month, year)
+      select_month_raw(month - 1, year)
+    end
+  end
+end

data/lib/gtk3/cell-layout.rb

@@ -0,0 +1,31 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  module CellLayout
+    def set_attributes(cell, attributes)
+      attributes.each do |key, value|
+        add_attribute(cell, key, value)
+      end
+    end
+
+    alias_method :add_attribute_raw, :add_attribute
+    def add_attribute(cell, name, value)
+      name = name.to_s if name.is_a?(Symbol)
+      add_attribute_raw(cell, name, value)
+    end
+  end
+end

data/{test/test_gtk_accel_group_entry.rb → lib/gtk3/clipboard.rb}

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,9 +14,12 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-class TestGtkAccelGroupEntry < Test::Unit::TestCase
-  def test_accel_path
-    entry = Gtk::AccelGroupEntry.new
-    assert_nil(entry.accel_path)
+module Gtk
+  class Clipboard
+    alias_method :set_text_raw, :set_text
+    def set_text(text)
+      set_text_raw(text, text.bytesize)
+    end
+    alias_method :text=, :set_text
   end
 end

data/lib/gtk3/color-chooser-dialog.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class ColorChooserDialog
+    alias_method :initialize_raw, :initialize
+    def initialize(options={})
+      title = options[:title]
+      parent = options[:parent]
+
+      initialize_raw(title, parent)
+    end
+  end
+end

data/lib/gtk3/combo-box-text.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class ComboBoxText
+    alias_method :initialize_raw, :initialize
+    def initialize(options={})
+      entry = options[:entry]
+
+      if entry
+        initialize_new_with_entry
+      else
+        initialize_new
+      end
+    end
+  end
+end

data/lib/gtk3/combo-box.rb

@@ -0,0 +1,55 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class ComboBox
+    alias_method :initialize_raw, :initialize
+    def initialize(options={})
+      entry = options[:entry]
+      model = options[:model]
+      area  = options[:area]
+
+      if entry
+        if model
+          initialize_new_with_model_and_entry(model)
+        elsif area
+          initialize_new_with_area_and_entry(area)
+        else
+          initialize_new_with_entry
+        end
+      else
+        if model
+          initialize_new_with_model(model)
+        elsif area
+          initialize_new_with_area(area)
+        else
+          initialize_new
+        end
+      end
+    end
+
+    alias_method :active_iter_raw, :active_iter
+    def active_iter
+      found, iter = active_iter_raw
+      if found
+        iter.model = model
+        iter
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/gtk3/container.rb

@@ -0,0 +1,51 @@
+# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class Container
+    class << self
+      alias_method :child_properties_raw, :child_properties
+      def child_properties
+        child_properties_raw[0]
+      end
+    end
+
+    include Enumerable
+
+    def <<(widget)
+      add(widget)
+      self
+    end
+
+    alias_method :focus_chain_raw, :focus_chain
+    def focus_chain
+      set_explicitly, widgets = focus_chain_raw
+      if set_explicitly
+        widgets
+      else
+        nil
+      end
+    end
+
+    alias_method :child_get_property_raw, :child_get_property
+    def child_get_property(child, name)
+      property = self.class.find_child_property(name)
+      value = GLib::Value.new(property.value_type)
+      child_get_property_raw(child, name, value)
+      value.value
+    end
+  end
+end

data/lib/gtk3/css-provider.rb

@@ -0,0 +1,38 @@
+# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class CssProvider
+    def load(options)
+      data = options[:data]
+      file = options[:file]
+      path = options[:path]
+      resource_path = options[:resource_path]
+      if data
+        load_from_data(data)
+      elsif file
+        load_from_file(file)
+      elsif path
+        load_from_path(path)
+      elsif resource_path
+        load_from_resource(resource_path)
+      else
+        message = "Must specify one of :data, :file, :path or :resource_path"
+        raise ArgumentError, "#{message}: #{options.inspect}"
+      end
+    end
+  end
+end

data/lib/gtk3/deprecated.rb

@@ -1,22 +1,32 @@
 module Gtk
   extend GLib::Deprecatable
-  define_deprecated_const :Combo,               :raise => "Use 'Gtk::ComboBoxText' instead."
-  define_deprecated_const :ComboBoxEntry,       :raise => "Use 'Gtk::ComboBox' instead."
-  define_deprecated_const :Curve,               :raise => "Don't use this widget anymore."
-  define_deprecated_const :FileSelection,       :raise => "Use 'Gtk::FileChooserDialog' instead."
-  define_deprecated_const :FontSelection,       :raise => "Use 'Gtk::FontChooserWidget' instead."
-  define_deprecated_const :FontSelectionDialog, :raise => "Use 'Gtk::FontChooserDialog' instead."
-  define_deprecated_const :GammaCurve,          :raise => "Don't use this widget anymore."
-  define_deprecated_const :HRuler,              :raise => "Don't use this widget anymore."
-  define_deprecated_const :InputDialog,         :raise => "Don't use this widget anymore."
-  define_deprecated_const :ItemFactory,         :raise => "Use 'Gtk::UIManager' instead."
-  define_deprecated_const :OptionMenu,          :raise => "Use 'Gtk::ComboBox' instead."
-  define_deprecated_const :RC,                  :raise => "Use 'Gtk::StyleContext' instead."
-  define_deprecated_const :RcStyle,             :raise => "Use 'Gtk::CssProvider' instead."
-  define_deprecated_const :Ruler,               :raise => "Don't use this widget anymore."
-  define_deprecated_const :Style,               :raise => "Use 'Gtk::StyleContext' instead."
-  define_deprecated_const :Tooltips,            :raise => "Use 'Gtk::Tooltip' API."
-  define_deprecated_const :VRuler,              :raise => "Don't use this widget anymore."
+  define_deprecated_const :Allocation, "Gdk::Rectangle"
+
+  define_deprecated_const :Combo,                  :raise => "Use 'Gtk::ComboBoxText' instead."
+  define_deprecated_const :ComboBoxEntry,          :raise => "Use 'Gtk::ComboBox' instead."
+  define_deprecated_const :Curve,                  :raise => "Don't use this widget anymore."
+  define_deprecated_const :FileSelection,          :raise => "Use 'Gtk::FileChooserDialog' instead."
+  define_deprecated_const :FontSelection,          :raise => "Use 'Gtk::FontChooserWidget' instead."
+  define_deprecated_const :FontSelectionDialog,    :raise => "Use 'Gtk::FontChooserDialog' instead."
+  remove_const(:ColorSelection)
+  define_deprecated_const :ColorSelection,         :raise => "Use 'Gtk::ColorChooserWidget' instead."
+  define_deprecated_const :ColorSelectionDialog,   :raise => "Use 'Gtk::ColorChooserDialog' instead."
+  define_deprecated_const :GammaCurve,             :raise => "Don't use this widget anymore."
+  define_deprecated_const :HRuler,                 :raise => "Don't use this widget anymore."
+  define_deprecated_const :InputDialog,            :raise => "Don't use this widget anymore."
+  define_deprecated_const :ItemFactory,            :raise => "Use 'Gtk::UIManager' instead."
+  define_deprecated_const :OptionMenu,             :raise => "Use 'Gtk::ComboBox' instead."
+  define_deprecated_const :PageSetupUnixDialog,    :raise => "Use 'Gtk::PrintOperation' instead."
+  define_deprecated_const :Printer,                :raise => "Use 'Gtk::PrintOperation' instead."
+  define_deprecated_const :PrintCapabilities,      :raise => "Use 'Gtk::PrintOperation' instead."
+  define_deprecated_const :PrintJob,               :raise => "Use 'Gtk::PrintOperation' instead."
+  define_deprecated_const :PrintUnixDialog,        :raise => "Use 'Gtk::PrintOperation' instead."
+  define_deprecated_const :RC,                     :raise => "Use 'Gtk::StyleContext' instead."
+  define_deprecated_const :RcStyle,                :raise => "Use 'Gtk::CssProvider' instead."
+  define_deprecated_const :Ruler,                  :raise => "Don't use this widget anymore."
+  define_deprecated_const :Style,                  :raise => "Use 'Gtk::StyleContext' instead."
+  define_deprecated_const :Tooltips,               :raise => "Use 'Gtk::Tooltip' API."
+  define_deprecated_const :VRuler,                 :raise => "Don't use this widget anymore."
   define_deprecated_flags :AccelFlags, 'ACCEL'
   define_deprecated_flags :AttachOptions
   define_deprecated_enums :CornerType, 'CORNER'
@@ -64,8 +74,8 @@ module Gtk
   define_deprecated_singleton_method :init_add, :warn => "Don't use this method."
   define_deprecated_singleton_method :quit_add, :warn => "Don't use this method."
   define_deprecated_singleton_method :quit_remove, :warn => "Don't use this method."
-  define_deprecated_singleton_method :get_event_widget, :warn => "Use 'Gdk::Event#event_widget'." do |_self, event|
-    event && event.event_widget
+  define_deprecated_singleton_method :get_event_widget, :warn => "Use 'Gdk::Event#widget'." do |_self, event|
+    event && event.widget
   end
   define_deprecated_singleton_method :timeout_add, :warn => "Use 'GLib::Timeout.add'." do |_self, interval, &block|
     GLib::Timeout.add(interval, &block)
@@ -110,7 +120,8 @@ module Gtk
 
   class Assistant
     extend GLib::Deprecatable
-    define_deprecated_enums :PageType, 'PAGE'
+    define_deprecated_const :PageType, "Gtk::AssistantPageType"
+    define_deprecated_enums :AssistantPageType, 'PAGE'
     define_deprecated_method :set_page_header_image, :warn => "Don't use this method."
     define_deprecated_method :get_page_header_image, :warn => "Don't use this method."
     define_deprecated_method :set_page_side_image, :warn => "Don't use this method."
@@ -119,7 +130,9 @@ module Gtk
 
   class BindingSet
     extend GLib::Deprecatable
-    define_deprecated_method :entry_clear, :entry_remove
+    define_deprecated_method :entry_clear, :remove
+    define_deprecated_method :entry_skip, :skip
+    define_deprecated_method :entry_add_signal, :add_signal
     define_deprecated_method :add_path, :raise => "Don't use this method."
   end
 
@@ -159,15 +172,11 @@ module Gtk
     define_deprecated_signal :released, :warn => "Use 'Gtk::Widget::button-release-event' signal."
     define_deprecated_method_by_hash_args :initialize,
         'label_or_stock_id, use_underline = nil',
-        ':label => nil, :mnemonic => nil, :stock_id => nil' do
+        ':label => nil, :use_underline => nil, :stock_id => nil' do
         |_self, label_or_stock_id, use_underline|
       case label_or_stock_id
       when String
-        if use_underline
-          [{:mnemonic => label_or_stock_id}]
-        else
-          [{:label => label_or_stock_id}]
-        end
+        [{:label => label_or_stock_id, :use_underline => use_underline}]
       when Symbol
         [{:stock_id => label_or_stock_id}]
       else
@@ -183,24 +192,27 @@ module Gtk
 
   class Calendar
     extend GLib::Deprecatable
-    define_deprecated_flags :DisplayOptions
+    define_deprecated_flags "Gtk::CalendarDisplayOptions"
     define_deprecated_method :freeze, :warn => "Don't use this method."
     define_deprecated_method :thaw, :warn => "Don't use this method."
   end
 
   class CellRenderer
     extend GLib::Deprecatable
-    define_deprecated_enums :Mode, 'MODE'
-    define_deprecated_flags :State
+    define_deprecated_const :Mode, "Gtk::CellRendererMode"
+    define_deprecated_enums :CellRendererMode, 'MODE'
+    define_deprecated_const :State, "Gtk::CellRendererState"
+    define_deprecated_flags :CellRendererState
     define_deprecated_method :editing_canceled, :warn => "Use '#{self}#stop_editing'." do |_self|
       _self.stop_editing(true)
     end
-    define_deprecated_method :get_size, :raise => "Use Gtk::Renderer#get_preferred_size."
+    define_deprecated_method :get_size, :raise => "Use Gtk::CellRenderer#get_preferred_size."
   end
 
   class CellRendererAccel
     extend GLib::Deprecatable
-    define_deprecated_enums :Mode, 'MODE'
+    define_deprecated_const :Mode, "Gtk::CellRendererAccelMode"
+    define_deprecated_enums :CellRendererAccelMode, 'MODE'
   end
 
   class CellView
@@ -208,7 +220,7 @@ module Gtk
     define_deprecated_method :cell_renderers, :warn => "Use 'Gtk::CellLayout#cells'." do |_self|
       _self.cells
     end
-    define_deprecated_method :get_size_of_row, :raise => "Use Gtk::Renderer#get_preferred_size."
+    define_deprecated_method :get_size_of_row, :raise => "Use Gtk::Widget#get_preferred_size."
   end
 
   class ColorSelectionDialog
@@ -238,9 +250,15 @@ module Gtk
     end
   end
 
+  class Container
+    extend GLib::Deprecatable
+    define_deprecated_singleton_method :child_property, :find_child_property
+  end
+
   class Dialog
     extend GLib::Deprecatable
-    define_deprecated_flags :Flags
+    define_deprecated_const :Flags, "Gtk::DialogFlags"
+    define_deprecated_flags :DialogFlags
     define_deprecated_const :ResponseType, 'Gtk::ResponseType'
     define_deprecated_enums 'Gtk::ResponseType', 'RESPONSE'
     define_deprecated_method :vbox, :child
@@ -254,10 +272,12 @@ module Gtk
 
   module Drag
     extend GLib::Deprecatable
-    define_deprecated_flags :DestDefaults, 'DEST_DEFAULT'
-    define_deprecated_flags :TargetFlags, 'TARGET'
+    define_deprecated_const :DestDefaults, "Gtk::DestDefaults"
+    define_deprecated_const :TargetFlags, "Gtk::TargetFlags"
     define_deprecated_singleton_method :finish, :warn => "Use 'Gdk::DragContext#finish'." do |_self, context, success, del, time|
-      context.finish(success, del, time)
+      context.finish(:success => success,
+                     :delete => delete,
+                     :time => time)
     end
     define_deprecated_singleton_method :set_icon_default, :warn => "Use 'Gdk::DragContext#set_icon_default'." do |_self, context|
       context.set_icon_default
@@ -384,8 +404,10 @@ module Gtk
 
   module FileChooser
     extend GLib::Deprecatable
-    define_deprecated_enums :Action, 'ACTION'
-    define_deprecated_enums :Confirmation, 'CONFIRMATION'
+    define_deprecated_const :Action, "Gtk::FileChooserAction"
+    define_deprecated_enums :FileChooserAction, 'ACTION'
+    define_deprecated_const :Confirmation, "Gtk::FileChooserConfirmation"
+    define_deprecated_enums :FileChooserConfirmation, 'CONFIRMATION'
   end
 
   class FileChooserDialog
@@ -394,19 +416,28 @@ module Gtk
         'title, parent, action, back, *buttons',
         ':title => nil, :parent => nil, :action => :open, :buttons => nil' do
         |_self, title, parent, action, back, *buttons|
-      [{:title => title, :parent => parent, :action => action, :buttons => buttons}]
+      options = {
+          :title => title,
+          :parent => parent,
+          :action => action,
+          :buttons => buttons,
+      }
+      [options]
     end
   end
 
   class FileFilter
     extend GLib::Deprecatable
-    define_deprecated_flags :Flags
+    define_deprecated_const :Flags, "Gtk::FileFilterFlags"
+    define_deprecated_flags :FileFilterFlags
   end
 
   class HBox
     extend GLib::Deprecatable
     define_deprecated_singleton_method :new, :warn => "Use 'Gtk::Box.new(:horizontal, spacing)'." do |_self, homogeneous, spacing|
-      Gtk::Box.new(:horizontal, spacing).set_homogeneous(homogeneous)
+      box = Gtk::Box.new(:horizontal, spacing)
+      box.set_homogeneous(homogeneous)
+      box
     end
   end
 
@@ -450,28 +481,30 @@ module Gtk
     define_deprecated_method :render_icon, :raise => "Use '#{self}#render_icon_pixbuf'."
   end
 
-  module IconSize
-    extend GLib::Deprecatable
-    define_deprecated_enums :IconSize
-  end
+  #module IconSize
+  #  extend GLib::Deprecatable
+  #  define_deprecated_enums :IconSize
+  #end
 
   class IconTheme
     extend GLib::Deprecatable
-    define_deprecated_flags :LookupFlags, 'LOOKUP'
+    define_deprecated_const :LookupFlags, "Gtk::IconLookupFlags"
+    define_deprecated_flags :IconLookupFlags, 'LOOKUP'
   end
 
   class IconView
     extend GLib::Deprecatable
-    define_deprecated_enums :Type
+    define_deprecated_enums :IconViewDropPosition
   end
 
   class Image
     extend GLib::Deprecatable
-    define_deprecated_enums :Type
+    define_deprecated_const :Type, "Gtk::ImageType"
+    define_deprecated_enums :ImageType
     define_deprecated_method :set, :warn => "Use '#{self}#set_stock', '#{self}#set_icon_name', '#{self}#set_icon_set', '#{self}#set_file', '#{self}#set_pixbuf' or '#{self}#set_pixbuf_animation'."
     define_deprecated_method_by_hash_args :initialize,
         'image, size = nil',
-        ':label => nil, :mnemonic => nil, :stock => nil, :size => nil' do
+        ':stock => nil, :icon_name => nil, :icon_set => nil, :icon => nil, :file => nil, :pixbuf => nil, :animation => nil, :surface => nil, :size => nil' do
         |_self, image, size|
       case image
       when String
@@ -484,6 +517,8 @@ module Gtk
         [{:stock => image, :size => size}]
       when Gtk::IconSet
         [{:icon_set => image, :size => size}]
+      when Gio::Icon
+        [{:icon => image, :size => size}]
       else
         [image]
       end
@@ -553,9 +588,9 @@ module Gtk
     define_deprecated_enums 'Gtk::MessageType'
     define_deprecated_method_by_hash_args :initialize,
         'parent, flags, type, buttons_type, message',
-        ':parent => nil, :flags => 0, :type => :info, :buttons_type => :ok, :message => ""' do
-        |_self, parent, flags, type, buttons_type, message|
-      [{:parent => parent, :flags => flags, :type => type, :buttons_type => buttons_type, :message => message}]
+        ':parent => nil, :flags => 0, :type => :info, :buttons => :ok, :message => ""' do
+        |_self, parent, flags, type, buttons, message|
+      [{:parent => parent, :flags => flags, :type => type, :buttons => buttons, :message => message}]
     end
   end
 
@@ -571,14 +606,6 @@ module Gtk
     end
   end
 
-  class PageSetupUnixDialog
-    extend GLib::Deprecatable
-    define_deprecated_method_by_hash_args :initialize,
-        'title, parent', ':title => nil, :parent => nil' do |_self, title, parent|
-      [{:title => title, :parent => parent}]
-    end
-  end
-
   class PaperSize
     extend GLib::Deprecatable
     define_deprecated_enums :Unit, 'UNIT'
@@ -586,9 +613,12 @@ module Gtk
 
   class PrintOperation
     extend GLib::Deprecatable
-    define_deprecated_enums :Action, 'ACTION'
-    define_deprecated_enums :Result, 'RESULT'
-    define_deprecated_enums :Status, 'STATUS'
+    define_deprecated_const :Action, "Gtk::PrintOperationAction"
+    define_deprecated_enums :PrintOperationAction, 'ACTION'
+    define_deprecated_const :Result, "Gtk::PrintOperationResult"
+    define_deprecated_enums :PrintOperationResult, 'RESULT'
+    define_deprecated_const :Status, "Gtk::PrintStatus"
+    define_deprecated_enums :PrintStatus, 'STATUS'
   end
 
   class PrintSettings
@@ -600,15 +630,6 @@ module Gtk
     define_deprecated_enums :PrintQuality, 'QUALITY'
   end
 
-  class PrintUnixDialog
-    extend GLib::Deprecatable
-    define_deprecated_flags :Capabilities, 'CAPABILITY'
-    define_deprecated_method_by_hash_args :initialize,
-        'title, parent', ':title => nil, :parent => nil' do |_self, title, parent|
-      [{:title => title, :parent => parent}]
-    end
-  end
-
   class Paned
     extend GLib::Deprecatable
     %w(child1 child2).product(%w(resize shrink)).each do |child, prop|
@@ -640,6 +661,27 @@ module Gtk
     end
   end
 
+  class RadioButton
+    extend GLib::Deprecatable
+    define_deprecated_method_by_hash_args :initialize,
+        'member_or_label, label_or_use_underline, use_underline',
+        ':label => label, :member => member, :use_underline => use_underline',
+        0 do |_self, member_or_label, label_or_use_underline, use_underline|
+      options = {}
+      if member_or_label.is_a?(Gtk::RadioButton)
+        options[:member] = member_or_label
+        if label_or_use_underline.is_a?(String)
+          options[:label] = label_or_use_underline
+          options[:use_underline] = use_underline
+        end
+      else
+        options[:label] = member_or_label
+        options[:use_underline] = label_or_use_underline
+      end
+      [options]
+    end
+  end
+
   class Range
     extend GLib::Deprecatable
     define_deprecated_enums :SensitivityType, 'SENSITIVITY'
@@ -650,8 +692,10 @@ module Gtk
 
   module RC
     extend GLib::Deprecatable
-    define_deprecated_flags :Flags
-    define_deprecated_enums :TokenType, 'TOKEN'
+    define_deprecated_const :Flags, "Gtk::RCFlags"
+    define_deprecated_flags :RCFlags
+    define_deprecated_const :TokenType, "Gtk::RCTokenType"
+    define_deprecated_enums :RCTokenType, 'TOKEN'
   end
 
   class RecentAction
@@ -678,16 +722,28 @@ module Gtk
     extend GLib::Deprecatable
     define_deprecated_method_by_hash_args :initialize,
         'title, parent, manager, *buttons',
-        ':title => nil, :parent => nil, :manager => nil, :buttons => nil' do
-        |_self, title, parent, *buttons|
-      manager = buttons.first.is_a?(RecentManager) ? buttons.shift : nil
-      [{:title => title, :parent => parent, :manager => manager, :buttons => buttons}]
+        ':title => nil, :parent => nil, ' +
+        ':recent_manager => nil, :buttons => nil' do |_self, title, parent, *buttons|
+      if buttons.first.is_a?(RecentManager)
+        recent_manager = buttons.shift
+      else
+        recent_manager = nil
+      end
+      [
+        {
+          :title          => title,
+          :parent         => parent,
+          :recent_manager => recent_manager,
+          :buttons        => buttons,
+        },
+      ]
     end
   end
 
   class RecentFilter
     extend GLib::Deprecatable
-    define_deprecated_flags :Flags
+    define_deprecated_const :Flags, "Gtk::RecentFilterFlags"
+    define_deprecated_flags :RecentFilterFlags
   end
 
   class RecentManager
@@ -725,13 +781,16 @@ module Gtk
 
   class SizeGroup
     extend GLib::Deprecatable
-    define_deprecated_enums :Mode
+    define_deprecated_const :Mode, "Gtk::SizeGroupMode"
+    define_deprecated_enums :SizeGroupMode
   end
 
   class SpinButton
     extend GLib::Deprecatable
-    define_deprecated_enums :Type
-    define_deprecated_enums :UpdatePolicy, 'UPDATE'
+    define_deprecated_const :Type, "Gtk::SpinType"
+    define_deprecated_enums :SpinType
+    define_deprecated_const :UpdatePolicy, "Gtk::SpinButtonUpdatePolicy"
+    define_deprecated_enums :SpinButtonUpdatePolicy, 'UPDATE'
   end
 
   class TextAttributes
@@ -776,7 +835,8 @@ module Gtk
 
   class TextIter
     extend GLib::Deprecatable
-    define_deprecated_flags :SearchFlags, 'SEARCH'
+    define_deprecated_const :SearchFlags, "Gtk::TextSearchFlags"
+    define_deprecated_flags :TextSearchFlags, 'SEARCH'
     define_deprecated_method :backword_visible_word_start, :backward_visible_word_start
   end
 
@@ -837,20 +897,29 @@ module Gtk
 
   module TreeModel
     extend GLib::Deprecatable
-    define_deprecated_flags :Flags
+    define_deprecated_const :Flags, "Gtk::TreeModelFlags"
+    define_deprecated_flags :TreeModelFlags
+  end
+
+  class TreeSelection
+    extend GLib::Deprecatable
+    define_deprecated_method :selected_each, :each
   end
 
   class TreeView
     extend GLib::Deprecatable
-    define_deprecated_enums :DropPosition, 'DROP'
-    define_deprecated_enums :GridLines, 'GRID_LINES'
+    define_deprecated_const :DropPosition, "Gtk::TreeViewDropPosition"
+    define_deprecated_enums :TreeViewDropPosition, 'DROP'
+    define_deprecated_const :GridLines, "Gtk::TreeViewGridLines"
+    define_deprecated_enums :TreeViewGridLines, 'GRID_LINES'
     define_deprecated_method :widget_to_tree_coords, :convert_widget_to_bin_window_coords
     define_deprecated_method :tree_to_widget_coords, :convert_bin_window_to_widget_coords
   end
 
   class TreeViewColumn
     extend GLib::Deprecatable
-    define_deprecated_enums :Sizing
+    define_deprecated_const :Sizing, "Gtk::TreeViewColumnSizing"
+    define_deprecated_enums :TreeViewColumnSizing
     define_deprecated_method :cell_renderers, :warn => "Use 'Gtk::CellLayout#cells'." do |_self|
       _self.cells
     end
@@ -858,13 +927,16 @@ module Gtk
 
   class UIManager
     extend GLib::Deprecatable
-    define_deprecated_flags :ItemType
+    define_deprecated_const :ItemType, "Gtk::UIManagerItemType"
+    define_deprecated_flags :UIManagerItemType
   end
 
   class VBox
     extend GLib::Deprecatable
     define_deprecated_singleton_method :new, :warn => "Use 'Gtk::Box.new(:vertical, spacing)'." do |_self, homogeneous, spacing|
-      Gtk::Box.new(:vertical, spacing).set_homogeneous(homogeneous)
+      box = Gtk::Box.new(:vertical, spacing)
+      box.set_homogeneous(homogeneous)
+      box
     end
   end
 
@@ -905,8 +977,10 @@ module Gtk
 
   class Widget
     extend GLib::Deprecatable
-    define_deprecated_enums :HelpType, 'HELP'
-    define_deprecated_enums :TextDirection, 'TEXT_DIR'
+    define_deprecated_const :HelpType, "Gtk::WidgetHelpType"
+    define_deprecated_enums :WidgetHelpType, 'HELP'
+    define_deprecated_const :TextDirection, "Gtk::TextDIrection"
+    define_deprecated_enums "Gtk::TextDirection", 'TEXT_DIR'
     define_deprecated_singleton_method :push_colormap, :warn => "Don't use this method."
     define_deprecated_singleton_method :pop_colormap, :warn => "Don't use this method."
     define_deprecated_singleton_method :set_default_colormap, :warn => "Don't use this method."
@@ -932,8 +1006,8 @@ module Gtk
     define_deprecated_method :colormap, :raise => "Use '#{self}#visual'."
     define_deprecated_method :set_colormap, :warn => "Use '#{self}#set_visual'."
     alias :colormap= :set_colormap
-    define_deprecated_method :shape_combine_mask, :warn => "Don't use this method."
-    define_deprecated_method :input_shape_combine_mask, :warn => "Don't use this method."
+    define_deprecated_method :shape_combine_mask, :warn => "Use '#{self}#shape_combine_region' instead."
+    define_deprecated_method :input_shape_combine_mask, :warn => "Use '#{self}#input_shape_combine_region' instead."
     define_deprecated_method :reset_shapes, :warn => "Don't use this method."
     define_deprecated_method :set_scroll_adjustments, :warn => "Use 'Gtk::Scrollable#set_hadjustment' and 'Gtk::Scrollable#set_vadjustment'." do |_self, hadj, vadj|
       _self.set_hadjustment(hadj)
@@ -944,9 +1018,6 @@ module Gtk
     define_deprecated_method :action, :warn => "Use 'Gtk::Activatable#related_action'." do |_self|
       _self.related_action
     end
-    define_deprecated_method :size_request, :warn => "Use '#{self}#preferred_size'." do |_self|
-      _self.preferred_size.last
-    end
     define_deprecated_method :child_requisition, :warn => "Use '#{self}#preferred_size'." do |_self|
       _self.preferred_size.last
     end
@@ -996,9 +1067,32 @@ module Gtk
 
   class Window
     extend GLib::Deprecatable
-    define_deprecated_enums :Position, 'POS'
-    define_deprecated_enums :Type
+    define_deprecated_const :Position, "Gtk::WindowPosition"
+    define_deprecated_enums "Gtk::WindowPosition", 'POS'
+    define_deprecated_const :Type, "Gtk::WindowType"
+    define_deprecated_enums "Gtk::WindowType"
     define_deprecated_method :active_focus, :activate_focus
     define_deprecated_method :active_default, :activate_default
   end
+
+  class RecentFilter
+    extend GLib::Deprecatable
+    define_deprecated_const :Flags, 'Gtk::RecentFilterFlags'
+  end
+end
+
+module Gdk
+  class DragContext
+    define_deprecated_method_by_hash_args :finish,
+        'success, delete, time',
+        ':success => true, :delete => false, :time => Gdk::CURRENT_TIME' do |_self, success, delete, time|
+      [{:success => success, :delete => delete, :time => time}]
+    end
+  end
+
+  class Event
+    define_deprecated_method :event_widget, :warn => "Use 'Gdk::Event#widget'." do |_self|
+      _self.widget
+    end
+  end
 end