gtk3 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a7abe19144fd779ab738e2a2f755877575864b
-  data.tar.gz: d5f9ab206a3c583f0c12d1f3cd3b4504904a5dd5
+  metadata.gz: 4d288fbc5d8215a6e61a6bd89726a30b91c89a7a
+  data.tar.gz: b859fb2da75b82a16c3b2e7181bc838e4c9b6c9e
 SHA512:
-  metadata.gz: d435afe30b78995cc55bc8ee8b6b8f8c7502734d3eaf79dce00c36c8fe3b0e6dcbd62a43c4bb97fb7239dbd2314dda5d5286fc18aa4d59f39b18238146e3eda4
-  data.tar.gz: 602cc76363c40fd0bf51306edb00417f136be3b509dd098440767d6826f46dbdf4647dafdf6bae6b6c199272cdced2b099f55f6fd2f5b3becda590fe745733c9
+  metadata.gz: 318738e160832e2222910f24e724a300c099e4e300475b745333375539375b7db9fced23d69bdab500572eaf8997103c886f270a6495330f0b5ab99f065f7724
+  data.tar.gz: 4ba9754b4242b70d30962b7409cbf71b1132170a4c43c467133f3ea503a86680276bc8bdc47e6f8e387ec7d37cb51386695b07bb0d9370c6a17eaf57fd6385af

data/ext/gtk3/rb-gtk3.c

@@ -575,6 +575,21 @@ rb_gtk3_ui_manager_mark(gpointer object)
 }
 #endif
 
+static void
+rb_gtk3_text_tag_table_mark_body(GtkTextTag *tag, gpointer data)
+{
+    rbgobj_gc_mark_instance(tag);
+}
+
+static void
+rb_gtk3_text_tag_table_mark(gpointer object)
+{
+    GtkTextTagTable *table;
+
+    table = GTK_TEXT_TAG_TABLE(object);
+    gtk_text_tag_table_foreach(table, rb_gtk3_text_tag_table_mark_body, NULL);
+}
+
 void
 rbgtk3_class_init_func(gpointer g_class, G_GNUC_UNUSED gpointer class_data)
 {
@@ -614,6 +629,8 @@ Init_gtk3(void)
 #ifndef RB_GTK_UI_MANAGER_IS_DEPRECATED
     rbgobj_register_mark_func(GTK_TYPE_UI_MANAGER, rb_gtk3_ui_manager_mark);
 #endif
+    rbgobj_register_mark_func(GTK_TYPE_TEXT_TAG_TABLE,
+                              rb_gtk3_text_tag_table_mark);
 
     rbgtk3_cell_layout_init();
     rbgtk3_container_init();

data/lib/gtk3/container.rb

@@ -16,13 +16,6 @@
 
 module Gtk
   class Container
-    class << self
-      alias_method :child_properties_raw, :child_properties
-      def child_properties
-        child_properties_raw[0]
-      end
-    end
-
     include Enumerable
 
     alias_method :add_raw, :add

data/lib/gtk3/deprecated.rb

@@ -297,7 +297,7 @@ module Gtk
       case icon
       when Symbol
         context.set_icon(:stock_id => icon, :hot_x => hot_x, :hot_y => hot_y)
-      when Gdk::Pixbuf
+      when GdkPixbuf::Pixbuf
         context.set_icon(:pixbuf => icon, :hot_x => hot_x, :hot_y => hot_y)
       when Gtk::Widget
         context.set_icon(:widget => icon, :hot_x => hot_x, :hot_y => hot_y)
@@ -523,7 +523,7 @@ module Gtk
         end
       when Symbol
         [{:stock => image, :size => size}]
-      when Gdk::Pixbuf
+      when GdkPixbuf::Pixbuf
         [{:pixbuf => image}]
       when Gtk::IconSet
         [{:icon_set => image, :size => size}]
@@ -531,7 +531,7 @@ module Gtk
         [{:icon => image, :size => size}]
       else
         message =
-          "Image must be String, Symbol, Gdk::Pixbuf, Gtk::IconSet or " +
+          "Image must be String, Symbol, GdkPixbuf::Pixbuf, Gtk::IconSet or " +
           "Gio::Icon: #{image.inspect}"
         raise ArgumentError, message
       end

data/lib/gtk3/image.rb

@@ -21,7 +21,7 @@ module Gtk
     # given.
     #
     # @param Hash{Symbol => Gtk::Stock, String, Gtk::IconSet, Gio::Icon,
-    #                       Gdk::Pixbuf, Gdk::PixbufAnimation, Cairo::Surface,
+    #                       GdkPixbuf::Pixbuf, GdkPixbuf::PixbufAnimation, Cairo::Surface,
     #                       Fixnum}
     #
     # @example Create an empty image.
@@ -45,18 +45,18 @@ module Gtk
     #   icon = Gio::ThemedIcon.new 'gtk-open'
     #   image = Gtk::Image.new :icon => icon, :size => :dialog
     #
-    # @example Create an image from a Gdk::Pixbuf.
-    #   pixbuf = Gdk::Pixbuf.new 'path/to/the/image.png'
+    # @example Create an image from a GdkPixbuf::Pixbuf.
+    #   pixbuf = GdkPixbuf::Pixbuf.new(:file => 'path/to/the/image.png')
     #   image = Gtk::Image.new :pixbuf => pixbuf
     #
     # @example Create an image from an Gtk::IconSet, that itself is created
-    #          from a Gdk::Pixbuf.
-    #   pixbuf = Gdk::Pixbuf.new 'path/to/the/image.png'
+    #          from a GdkPixbuf::Pixbuf.
+    #   pixbuf = GdkPixbuf::Pixbuf.new(:file => 'path/to/the/image.png')
     #   iconSet = Gtk::IconSet.new pixbuf
     #   image = Gtk::Image.new :icon_set => iconSet, :size => :dialog
     #
-    # @example Create an image from a Gdk::PixbufAnimation
-    #   pixAnim = Gdk::PixbufAnimation.new 'anim.gif'
+    # @example Create an image from a GdkPixbuf::PixbufAnimation
+    #   pixAnim = GdkPixbuf::PixbufAnimation.new 'anim.gif'
     #   image = Gtk::Image.new :animation => pixAnim
     #
     # @example Create an image from a file in a resource file

data/lib/gtk3/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2016  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
@@ -142,6 +142,7 @@ module Gtk
       require "gtk3/text-buffer"
       require "gtk3/text-iter"
       require "gtk3/text-tag-table"
+      require "gtk3/text-view"
       require "gtk3/toggle-action"
       require "gtk3/toggle-button"
       require "gtk3/tool-button"
@@ -239,10 +240,15 @@ module Gtk
       end
     end
 
-    def enum_class_name(info)
-      case info.name
-      when /\ARc/
-        "RC#{$POSTMATCH}"
+    def rubyish_class_name(info)
+      case info
+      when GObjectIntrospection::EnumInfo
+        case info.name
+        when /\ARc/
+          "RC#{$POSTMATCH}"
+        else
+          super
+        end
       else
         super
       end

data/lib/gtk3/text-buffer.rb

@@ -29,6 +29,37 @@ module Gtk
       tag
     end
 
+    alias_method :add_mark_raw, :add_mark
+    def add_mark(mark, where)
+      @marks ||= {}
+      add_mark_raw(mark, where)
+      mark_name = mark.name
+      @marks[mark_name] = mark if mark_name
+    end
+
+    alias_method :create_mark_raw, :create_mark
+    def create_mark(name, where, options={})
+      if options == true or options == false
+        options = {:left_gravity => options}
+      end
+      left_gravity = options[:left_gravity]
+      left_gravity = true if left_gravity.nil?
+      @marks ||= {}
+      if name.nil?
+        create_mark_raw(name, where, left_gravity)
+      else
+        @marks[name] = create_mark_raw(name, where, left_gravity)
+      end
+    end
+
+    alias_method :delete_mark_raw, :delete_mark
+    def delete_mark(mark)
+      @marks ||= {}
+      mark_name = mark.name
+      delete_mark_raw(mark)
+      @marks.delete(mark_name) if mark_name
+    end
+
     # prevent collision with deprecated methods.
     alias_method :get_iter_at_line_offset_raw,  :get_iter_at_line_offset
     alias_method :get_iter_at_line_index_raw,   :get_iter_at_line_index
@@ -99,7 +130,7 @@ module Gtk
         insert_interactive(iter, target, default_editable)
       else
         case target
-        when Gdk::Pixbuf
+        when GdkPixbuf::Pixbuf
           insert_pixbuf_raw(iter, target)
         when TextChildAnchor
           insert_text_child_anchor_raw(iter, target)
@@ -148,19 +179,9 @@ module Gtk
       end
     end
 
-    alias_method :serialize_formats_raw, :serialize_formats
-    def serialize_formats
-      serialize_formats_raw[0]
-    end
-
-    alias_method :deserialize_formats_raw, :deserialize_formats
-    def deserialize_formats
-      deserialize_formats_raw[0]
-    end
-
     alias_method :serialize_raw, :serialize
     def serialize(*arguments)
-      serialize_raw(*arguments)[0].pack("C*")
+      serialize_raw(*arguments).pack("C*")
     end
 
     alias_method :selection_bounds_raw, :selection_bounds

data/lib/gtk3/text-view.rb

@@ -0,0 +1,53 @@
+# Copyright (C) 2016  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 TextView
+    def get_iter_at(options)
+      location = options[:location]
+      position = options[:position]
+
+      if location
+        get_iter_at_location(*location)
+      elsif position
+        get_iter_at_position(*position)
+      else
+        message = "must specify :location or :position: #{options.inspect}"
+        raise ArgumentError, message
+      end
+    end
+
+    alias_method :get_iter_at_location_raw, :get_iter_at_location
+    def get_iter_at_location(x, y)
+      found, iter = get_iter_at_location_raw(x, y)
+      if found
+        iter
+      else
+        nil
+      end
+    end
+
+    alias_method :get_iter_at_position_raw, :get_iter_at_position
+    def get_iter_at_position(x, y)
+      found, iter, trailing = get_iter_at_position_raw(x, y)
+      if found
+        [iter, trailing]
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/gtk3/tree-model.rb

@@ -100,6 +100,11 @@ module Gtk
       set(iter, columns, _values)
     end
 
+    alias_method :get_column_type_raw, :get_column_type
+    def get_column_type(index)
+      (@column_types ||= {})[index] ||= get_column_type_raw(index)
+    end
+
     private
     def setup_iter(iter)
       iter.model = self

data/lib/gtk3/tree-view.rb

@@ -61,5 +61,30 @@ module Gtk
         raise ArgumentError, "wrong number of arguments (#{args.size} for 2..4)"
       end
     end
+
+    alias_method :expand_row_raw, :expand_row
+    def expand_row(path, options={})
+      if options == true or options == false
+        open_all = options
+      else
+        open_all = options[:open_all]
+        open_all = true if open_all.nil?
+      end
+
+      expand_row_raw(path, open_all)
+    end
+
+    private
+    def create_signal_handler(signal_name, callback)
+      case signal_name
+      when "row-collapsed", "row-expanded"
+        lambda do |tree_view, iter, path, *extra_args|
+          iter.model = tree_view.model
+          callback.call(tree_view, iter, path, *extra_args)
+        end
+      else
+        super
+      end
+    end
   end
 end

data/lib/gtk3/widget.rb

@@ -50,11 +50,6 @@ module Gtk
         end
       end
 
-      alias_method :style_properties_raw, :style_properties
-      def style_properties
-        style_properties_raw[0]
-      end
-
       alias_method :set_connect_func_raw, :set_connect_func
       def set_connect_func(&block)
         set_connect_func_raw do |*args|

data/sample/gtk-demo/TODO

@@ -1,6 +1,10 @@
 # C version (3.19.1) versus Ruby version
 
-C version             Ruby version    Updated
+# Ruby version : is there already a ruby version of the demo
+# Updated 3.19 : if there is a ruby version is it udapted to 3.19
+# Changed? 3.20: does this demo has changed with version 3.20
+#
+C version             Ruby version    Updated 3.20
 application.c           no              no
 assistant.c             ok              ok
 builder.c               ok              ok
@@ -25,6 +29,7 @@ expander.c              ok              ok
 filtermodel.c           ok              ok
 flowbox.c               no              no
 font_features.c         ok              ok
+foreigndrawing          no              no
 gestures.c              no              no
 glarea.c                no              no
 headerbar.c             ok              ok
@@ -45,11 +50,11 @@ overlay.c               ok              ok
 overlay2.c              ok              ok
 panes.c                 ok              ok
 pickers.c               ok              ok
-pixbufs.c               ok              no
+pixbufs.c               ok              ok
 popover.c               ok              ok
 printing.c              ok              ok
 revealer.c              ok              ok
-rotated_text.c          ok              no
+rotated_text.c          ok              ok
 scale.c                 ok              ok
 search_entry.c          no              no
 search_entry2.c         ok              ok
@@ -60,11 +65,11 @@ spinbutton.c            no              no
 spinner.c               ok              ok
 stack.c                 ok              ok
 textmask.c              ok              ok
-textscroll.c            no              no
+textscroll.c            ok              ok
 textview.c              ok              no
 theming_style_classes.c ok              ok
 toolpalette.c           no              no
-transparent.c           no              no
+transparent.c           ok              ok
 tree_store.c            ok              no
 
 # Ruby version
@@ -72,4 +77,3 @@ Check all the ruby demos that doesn't correspond to a C version.
 
 # Demo that are not to be done
 pagesetup.c
-

data/sample/gtk-demo/application.ui

@@ -1,100 +1,123 @@
 <?xml version="1.0"?>
 <interface>
-  <object class="GtkGrid" id="grid">
+  <template class="DemoApplicationWindow" parent="GtkApplicationWindow">
+    <property name="title" translatable="yes">Application Class</property>
+    <property name="default-width">200</property>
+    <property name="default-height">200</property>
+    <property name="icon-name">document-open</property>
     <child>
-      <object class="GtkToolbar" id="toolbar">
-        <property name="hexpand">1</property>
-        <style>
-          <class name="primary-toolbar"/>
-        </style>
-        <child>
-          <object class="GtkMenuToolButton" id="menutool">
-            <property name="icon-name">document-open</property>
-          </object>
-        </child>
+      <object class="GtkGrid">
+        <property name="visible">1</property>
         <child>
-          <object class="GtkToolButton" id="quit">
-            <property name="icon-name">application-exit</property>
-            <property name="action-name">app.quit</property>
+          <object class="GtkToolbar">
+            <property name="visible">1</property>
+            <property name="hexpand">1</property>
+            <style>
+              <class name="primary-toolbar"/>
+            </style>
+            <child>
+              <object class="GtkMenuToolButton" id="menutool">
+                <property name="visible">1</property>
+                <property name="icon-name">document-open</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolButton">
+                <property name="visible">1</property>
+                <property name="icon-name">application-exit</property>
+                <property name="action-name">app.quit</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem">
+                <property name="visible">1</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolButton">
+                <property name="visible">1</property>
+                <property name="icon-name">applications-other</property>
+                <property name="action-name">win.logo</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
         </child>
         <child>
-          <object class="GtkSeparatorToolItem" id="sep"/>
-        </child>
-        <child>
-          <object class="GtkToolButton" id="logo">
-            <property name="icon-name">applications-other</property>
-            <property name="action-name">win.logo</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkInfoBar" id="infobar">
-        <property name="no-show-all">1</property>
-        <property name="hexpand">1</property>
-        <child internal-child="content_area">
-          <object class="GtkBox" id="content_area">
-            <child>
-              <object class="GtkLabel" id="message">
-                <property name="visible">1</property>
-                <property name="hexpand">1</property>
+          <object class="GtkInfoBar" id="infobar">
+            <property name="no-show-all">1</property>
+            <property name="hexpand">1</property>
+            <child internal-child="content_area">
+              <object class="GtkBox" id="content_area">
+                <child>
+                  <object class="GtkLabel" id="message">
+                    <property name="visible">1</property>
+                    <property name="hexpand">1</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child internal-child="action_area">
+              <object class="GtkBox">
+                <child>
+                  <object class="GtkButton">
+                    <property name="visible">1</property>
+                    <property name="valign">center</property>
+                    <property name="label" translatable="yes">_OK</property>
+                    <property name="use_underline">1</property>
+                    <signal name="clicked" handler="clicked_cb"/>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkBox" id="action_area">
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="visible">1</property>
+            <property name="shadow-type">in</property>
             <child>
-              <object class="GtkButton" id="button">
+              <object class="GtkTextView">
                 <property name="visible">1</property>
-                <property name="valign">center</property>
-                <property name="label" translatable="yes">_OK</property>
-                <property name="use_underline">1</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="buffer">buffer</property>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
         </child>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkScrolledWindow" id="sw">
-        <property name="shadow-type">in</property>
         <child>
-          <object class="GtkTextView" id="contents">
+          <object class="GtkStatusbar" id="status">
             <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
+            <property name="visible">1</property>
           </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+          </packing>
         </child>
       </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">2</property>
-      </packing>
     </child>
-    <child>
-      <object class="GtkStatusbar" id="status">
-        <property name="hexpand">1</property>
-        <property name="visible">1</property>
-      </object>
-      <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">3</property>
-      </packing>
-    </child>
-  </object>
+  </template>
   <menu id="toolmenu">
     <item>
       <attribute name="label">File1</attribute>
       <attribute name="action">win.file1</attribute>
     </item>
   </menu>
+  <object class="GtkTextBuffer" id="buffer">
+    <signal name="changed" handler="update_statusbar"/>
+    <signal name="mark-set" handler="mark_set_callback"/>
+  </object>
 </interface>