gtk3 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16dfde0f528438d40fe8dbb7373413aa1135750e
-  data.tar.gz: 34744163a0e0c9fc24287680d381b89ce222fd00
+  metadata.gz: 1b06613026f819b1f091dac318bb952d5e728ee4
+  data.tar.gz: daed1f67c7578c632d8aaf4b3513578e1b5649d2
 SHA512:
-  metadata.gz: 88dc3a757a30bab6951634ef24e875dca3ba2e25ae319198fe7467fa37ce1fc215b77a358fd92f425102cf04873b2ea184c802551e0d45d3e99e458d92d01d78
-  data.tar.gz: f4ece3d07fb0e0e8b5f0b4233ad734d6a5ec44136fec998017095b6e84e45dc51448e72040438f4a477d6a9577bd87148be3ffed7f85c6c07fb390233fc9f2b3
+  metadata.gz: d457cbb8203beb40bf9247885131cdb50d849256247f700ca11cab8b69adc3c5f24d356514cd7c11406aae6d410fb3e0e8fdf8784463d232e189ecb7545df98a
+  data.tar.gz: 79ad2db2be9f9f0b4d2aa1bd99cdeaad7d7d51673db361cc5dfb46107259352004b9a48b616f9fc515c91033525529573f8b5b24d0199899d365526f752dd77e

data/ext/gtk3/rb-gtk3-cell-layout.c

@@ -0,0 +1,42 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rb-gtk3-private.h"
+
+static void
+rb_gtk3_cell_layout_mark(gpointer object)
+{
+    GtkCellLayout *cell_layout = object;
+    GList *node;
+    GList *renderers;
+
+    renderers = gtk_cell_layout_get_cells(cell_layout);
+    for (node = renderers; node; node = g_list_next(node)) {
+        GtkCellRenderer *renderer = node->data;
+        rbgobj_gc_mark_instance(renderer);
+    }
+    g_list_free(renderers);
+}
+
+void
+rbgtk3_cell_layout_init(void)
+{
+    rbgobj_register_mark_func(GTK_TYPE_CELL_LAYOUT, rb_gtk3_cell_layout_mark);
+}

data/ext/gtk3/rb-gtk3-private.h

@@ -26,7 +26,10 @@
 G_GNUC_INTERNAL void rbgtk3_class_init_func(gpointer g_class, gpointer class_data);
 G_GNUC_INTERNAL void rbgtk3_initialize(VALUE self);
 
+G_GNUC_INTERNAL void rbgtk3_cell_layout_init(void);
 G_GNUC_INTERNAL void rbgtk3_container_init(void);
+G_GNUC_INTERNAL void rbgtk3_tree_model_init(void);
+G_GNUC_INTERNAL void rbgtk3_tree_view_init(void);
 G_GNUC_INTERNAL void rbgtk3_widget_init(void);
 
 #endif

data/ext/gtk3/rb-gtk3-tree-model.c

@@ -0,0 +1,77 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rb-gtk3-private.h"
+
+static gboolean
+rb_gtk3_tree_model_mark_callback(GtkTreeModel *model,
+                                 G_GNUC_UNUSED GtkTreePath *path,
+                                 GtkTreeIter *iter,
+                                 gpointer data)
+{
+    GArray *target_columns = data;
+    guint i, n;
+
+    n = target_columns->len;
+    for (i = 0; i < n; i++) {
+        gint nth_column;
+        GValue value = G_VALUE_INIT;
+
+        nth_column = g_array_index(target_columns, gint, i);
+        gtk_tree_model_get_value(model, iter, nth_column, &value);
+        rbgobj_gc_mark_gvalue(&value);
+        g_value_unset(&value);
+    }
+
+    return FALSE;
+}
+
+static void
+rb_gtk3_tree_model_mark(gpointer object)
+{
+    GtkTreeModel *tree_model;
+    GArray *target_columns;
+    gint i, n;
+
+    tree_model = GTK_TREE_MODEL(object);
+
+    target_columns = g_array_new(FALSE, FALSE, sizeof(gint));
+    n = gtk_tree_model_get_n_columns(tree_model);
+    for (i = 0; i < n; i++) {
+        GType column_type = gtk_tree_model_get_column_type(tree_model, i);
+
+        if (G_TYPE_FUNDAMENTAL(column_type) != G_TYPE_OBJECT)
+            continue;
+
+        g_array_append_val(target_columns, i);
+    }
+
+    gtk_tree_model_foreach(tree_model,
+                           rb_gtk3_tree_model_mark_callback,
+                           target_columns);
+
+    g_array_unref(target_columns);
+}
+
+void
+rbgtk3_tree_model_init(void)
+{
+    rbgobj_register_mark_func(GTK_TYPE_TREE_MODEL, rb_gtk3_tree_model_mark);
+}

data/ext/gtk3/rb-gtk3-tree-view.c

@@ -0,0 +1,42 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rb-gtk3-private.h"
+
+static void
+rb_gtk3_tree_view_mark(gpointer object)
+{
+    GtkTreeView *tree_view = object;
+    GList *node;
+    GList *columns;
+
+    columns = gtk_tree_view_get_columns(tree_view);
+    for (node = columns; node; node = g_list_next(node)) {
+        GtkTreeViewColumn *column = node->data;
+        rbgobj_gc_mark_instance(column);
+    }
+    g_list_free(columns);
+}
+
+void
+rbgtk3_tree_view_init(void)
+{
+    rbgobj_register_mark_func(GTK_TYPE_TREE_VIEW, rb_gtk3_tree_view_mark);
+}

data/ext/gtk3/rb-gtk3.c

@@ -98,6 +98,34 @@ rb_gtk3_builder_connect_func_callback(GtkBuilder *builder,
                GCONNECTFLAGS2RVAL(flags));
 }
 
+static void
+rb_gtk3_cell_layout_data_func_callback(GtkCellLayout *cell_layout,
+                                       GtkCellRenderer *cell,
+                                       GtkTreeModel *model,
+                                       GtkTreeIter *iter,
+                                       gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+    ID id_set_model;
+    ID id_call;
+    VALUE rb_model;
+    VALUE rb_iter;
+
+    CONST_ID(id_set_model, "model=");
+    rb_model = GOBJ2RVAL(model);
+    rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
+    rb_funcall(rb_iter, id_set_model, 1, rb_model);
+
+    CONST_ID(id_call, "call");
+    rb_funcall(callback_data->rb_callback,
+               id_call,
+               4,
+               GOBJ2RVAL(cell_layout),
+               GOBJ2RVAL(cell),
+               rb_model,
+               rb_iter);
+}
+
 static const gchar *
 rb_gtk3_translate_func_callback(const gchar *path,
                                 gpointer user_data)
@@ -282,6 +310,8 @@ rb_gtk3_callback_finder(GIArgInfo *info)
         return rb_gtk3_assistant_page_func_callback;
     } else if (name_equal(info, "BuilderConnectFunc")) {
         return rb_gtk3_builder_connect_func_callback;
+    } else if (name_equal(info, "CellLayoutDataFunc")) {
+        return rb_gtk3_cell_layout_data_func_callback;
     } else if (name_equal(info, "TranslateFunc")) {
         return rb_gtk3_translate_func_callback;
     } else if (name_equal(info, "TreeCellDataFunc")) {
@@ -400,7 +430,10 @@ Init_gtk3(void)
     rbgobj_register_mark_func(GTK_TYPE_UI_MANAGER, rb_gtk3_ui_manager_mark);
 #endif
 
+    rbgtk3_cell_layout_init();
     rbgtk3_container_init();
+    rbgtk3_tree_model_init();
+    rbgtk3_tree_view_init();
     rbgtk3_widget_init();
 
     rbgobj_boxed_not_copy_obj(GTK_TYPE_SELECTION_DATA);

data/lib/gtk3/builder.rb

@@ -18,12 +18,13 @@ module Gtk
   class Builder
     alias_method :initialize_raw, :initialize
     def initialize(options={})
-      file      = options[:file]
+      path      = options[:path] || options[:file]
       resource  = options[:resource]
       string    = options[:string]
 
-      if file
-        initialize_new_from_file(file)
+      if path
+        path = path.to_path if path.respond_to?(:to_path)
+        initialize_new_from_file(path)
       elsif resource
         initialize_new_from_resource(resource)
       elsif string
@@ -40,15 +41,57 @@ module Gtk
       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)
+    alias_method :add_objects_from_string_raw, :add_objects_from_string
+    def add_objects_from_string(string, object_ids)
+      add_objects_from_string_raw(string, string.bytesize, object_ids)
+    end
+
+    def add(target_or_options={})
+      if target_or_options.is_a?(Hash)
+        options = target_or_options
+      else
+        target = target_or_options
+        options = {}
+        if target.respond_to?(:to_path)
+          options[:path] = target.to_path
+        elsif target.start_with?("<") or target.start_with?(" ")
+          options[:string] = target
+        elsif File.exist?(target)
+          options[:path] = target
+        else
+          options[:resource] = target
+        end
+      end
+
+      string   = options[:string]
+      path     = options[:path] || options[:file]
+      resource = options[:resource]
+
+      object_ids = options[:object_ids]
+
+      if path
+        path = path.to_path if path.respond_to?(:to_path)
+        if object_ids
+          add_objects_from_file(path, object_ids)
+        else
+          add_from_file(path)
+        end
+      elsif resource
+        if object_ids
+          add_objects_from_resource(resource, object_ids)
+        else
+          add_from_resource(resource)
+        end
+      elsif string
+        if object_ids
+          add_objects_from_string(string, object_ids)
+        else
+          add_from_string(string)
+        end
       else
-        add_from_resource(target)
+        message = ":path (:file), :resource or :string " +
+          "must be specified: #{options.inspect}"
+        raise InvalidArgument, message
       end
     end
 

data/lib/gtk3/container.rb

@@ -25,6 +25,19 @@ module Gtk
 
     include Enumerable
 
+    alias_method :add_raw, :add
+    def add(child, properties={})
+      child.freeze_child_notify
+      begin
+        add_raw(child)
+        properties.each do |key, value|
+          child_set_property(child, key, value)
+        end
+      ensure
+        child.thaw_child_notify
+      end
+    end
+
     def <<(widget)
       add(widget)
       self

data/lib/gtk3/deprecated.rb

@@ -489,10 +489,10 @@ module Gtk
     define_deprecated_method :render_icon, :raise => "Use '#{self}#render_icon_pixbuf'."
   end
 
-  #module IconSize
-  #  extend GLib::Deprecatable
-  #  define_deprecated_enums :IconSize
-  #end
+  class IconSize
+   extend GLib::Deprecatable
+   define_deprecated_const :IconSize, "Gtk::IconSize"
+  end
 
   class IconTheme
     extend GLib::Deprecatable

data/lib/gtk3/loader.rb

@@ -129,8 +129,10 @@ module Gtk
       require "gtk3/search-bar"
       require "gtk3/selection-data"
       require "gtk3/spin-button"
+      require "gtk3/show-uri"
       require "gtk3/stack"
       require "gtk3/stock"
+      require "gtk3/stock-item"
       require "gtk3/style-context"
       require "gtk3/style-properties"
       require "gtk3/table"

data/lib/gtk3/show-uri.rb

@@ -0,0 +1,34 @@
+# 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 << self
+    alias_method :show_uri_raw, :show_uri
+    def show_uri(uri_or_options)
+      if uri_or_options.is_a?(String)
+        options = {:uri => uri_or_options}
+      else
+        options = uri_or_options
+      end
+
+      screen    = options[:screen]
+      uri       = options[:uri]
+      timestamp = options[:timestamp] || Gdk::CURRENT_TIME
+
+      show_uri_raw(screen, uri, timestamp)
+    end
+  end
+end

data/lib/gtk3/stock-item.rb

@@ -0,0 +1,36 @@
+# 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 StockItem
+    def [](*args)
+      warn("#{self.class}\##{__method__} is deprecated. " +
+           "Use \#stock_id, \#label, \#modifier, \#keyval and " +
+           "\#translation_domain instead.")
+      to_a[*args]
+    end
+
+    def to_a
+      [
+        stock_id,
+        label,
+        modifier,
+        keyval,
+        translation_domain,
+      ]
+    end
+  end
+end