gtk3 3.2.5-x86-mingw32 → 3.2.6-x86-mingw32

data/README.md

@@ -0,0 +1,34 @@
+# Ruby/GTK3
+
+Ruby/GTK3 is a Ruby binding of GTK+ 3.
+
+## Requirements
+
+* Ruby/GLib2, Ruby/ATK, Ruby/Pango, Ruby/GdkPixbuf2, Ruby/GIO2,
+  Ruby/GDK3, Ruby/GObjectIntrospection and Ruby/GTK3 in
+  [Ruby-GNOME2](https://ruby-gnome2.osdn.jp/)
+* [rcairo](https://github.com/rcairo/rcairo)
+* [GTK+](http://www.gtk.org/) 3.4.2 or later
+
+## Install
+
+    gem install gtk3
+
+## Tutorials, examples:
+
+* gtk3/sample/misc: a lot of simple examples.
+* gtk3/sample/gtk-demo: the ruby version of `gtk-demo`.
+* gtk3/sample/tutorial: the ruby version of the [offical Gtk3 tutorial "getting started"](https://developer.gnome.org/gtk3/stable/gtk-getting-started.html).
+* a well written tutorial [on how to create a todo application](http://iridakos.com/tutorials/2018/01/25/creating-a-gtk-todo-application-with-ruby)
+
+## License
+
+Copyright (c) 2002-2018 Ruby-GNOME2 Project Team
+
+This program is free software. You can distribute/modify this program
+under the terms of the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.
+
+## Project Websites
+
+* https://github.com/ruby-gnome2/ruby-gnome2
+* https://ruby-gnome2.osdn.jp/

data/Rakefile

@@ -1,11 +1,29 @@
 # -*- ruby -*-
+#
+# Copyright (C) 2018  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
+
 
 $LOAD_PATH.unshift("./../glib2/lib")
 require 'gnome2/rake/package-task'
 
-package_task = GNOME2::Rake::PackageTask.new do |package|
-  package.summary = "Ruby/GTK3 is a Ruby binding of GTK+-3.x."
-  package.description = "Ruby/GTK3 is a Ruby binding of GTK+-3.x."
+package_name = File.basename(__dir__)
+spec = Gem::Specification.load("#{package_name}.gemspec")
+
+GNOME2::Rake::PackageTask.define(spec, __dir__) do |package|
   package.dependency.gem.runtime = [
     "glib2",
     "gio2",
@@ -23,4 +41,3 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
     end
   end
 end
-package_task.define

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

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2018  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
@@ -21,6 +21,15 @@
 #ifndef RB_GTK3_PRIVATE_H
 #define RB_GTK3_PRIVATE_H
 
+/*
+ * CentOS 6: No GTK+ 3
+ * CentOS 7: GTK+ 3.22
+ * Ubuntu 14.04: GTK+ 3.10
+ * Ubuntu 16.04: GTK+ 3.18
+ * Ubuntu 18.04: GTK+ 3.22
+ */
+#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_10
+
 #include "rb-gtk3.h"
 
 G_GNUC_INTERNAL void rbgtk3_class_init_func(gpointer g_class, gpointer class_data);

data/ext/gtk3/rb-gtk3.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2018  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
@@ -58,7 +58,8 @@ rb_gtk3_callback_callback(GtkWidget *widget, gpointer user_data)
 {
     RBGICallbackData *callback_data = user_data;
 
-    rb_funcall(callback_data->rb_callback, id_call, 1,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
+               id_call, 1,
                GOBJ2RVAL(widget));
 }
 
@@ -79,7 +80,7 @@ rb_gtk3_cell_layout_data_func_callback(GtkCellLayout *cell_layout,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                4,
                GOBJ2RVAL(cell_layout),
@@ -95,30 +96,13 @@ rb_gtk3_clipboard_received_func_callback(GtkClipboard *clipboard,
 {
     RBGICallbackData *callback_data = user_data;
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                2,
                GOBJ2RVAL(clipboard),
                BOXED2RVAL(selection_data, GTK_TYPE_SELECTION_DATA));
 }
 
-static void
-rb_gtk3_clipboard_rich_text_received_func_callback(GtkClipboard *clipboard,
-                                                   GdkAtom format,
-                                                   const guint *text,
-                                                   G_GNUC_UNUSED gsize length,
-                                                   gpointer user_data)
-{
-    RBGICallbackData *callback_data = user_data;
-
-    rb_funcall(callback_data->rb_callback,
-               id_call,
-               3,
-               GOBJ2RVAL(clipboard),
-               Data_Wrap_Struct(cGdkAtom, NULL, NULL, format),
-               CSTR2RVAL((const gchar *)text));
-}
-
 static void
 rb_gtk3_clipboard_image_received_func_callback(GtkClipboard *clipboard,
                                                GdkPixbuf *pixbuf,
@@ -126,7 +110,7 @@ rb_gtk3_clipboard_image_received_func_callback(GtkClipboard *clipboard,
 {
     RBGICallbackData *callback_data = user_data;
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                2,
                GOBJ2RVAL(clipboard),
@@ -149,12 +133,12 @@ rb_gtk3_clipboard_targets_received_func_callback(GtkClipboard *clipboard,
         rb_atoms = rb_ary_new2(n_atoms);
         for (i = 0; i < n_atoms; i++) {
             VALUE rb_atom;
-            rb_atom = Data_Wrap_Struct(cGdkAtom, NULL, NULL, atoms[i]);
+            rb_atom = rb_gi_struct_new_raw(cGdkAtom, atoms[i], FALSE);
             rb_ary_push(rb_atoms, rb_atom);
         }
     }
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                2,
                GOBJ2RVAL(clipboard),
@@ -168,7 +152,7 @@ rb_gtk3_clipboard_text_received_func_callback(GtkClipboard *clipboard,
 {
     RBGICallbackData *callback_data = user_data;
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                2,
                GOBJ2RVAL(clipboard),
@@ -182,7 +166,7 @@ rb_gtk3_clipboard_uri_received_func_callback(GtkClipboard *clipboard,
 {
     RBGICallbackData *callback_data = user_data;
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                2,
                GOBJ2RVAL(clipboard),
@@ -209,7 +193,7 @@ rb_gtk3_entry_completion_match_func_callback(GtkEntryCompletion *completion,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    rb_match = rb_funcall(callback_data->rb_callback,
+    rb_match = rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                        id_call,
                        3,
                        GOBJ2RVAL(completion),
@@ -231,7 +215,7 @@ rb_gtk3_menu_position_func_callback(GtkMenu *menu,
     VALUE rb_result_raw;
     VALUE rb_result;
 
-    rb_result_raw = rb_funcall(callback_data->rb_callback,
+    rb_result_raw = rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                                id_call,
                                3,
                                GOBJ2RVAL(menu),
@@ -261,7 +245,7 @@ rb_gtk3_translate_func_callback(const gchar *path,
     RBGICallbackData *callback_data = user_data;
     VALUE rb_translated;
 
-    rb_translated = rb_funcall(callback_data->rb_callback,
+    rb_translated = rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                                id_call,
                                1,
                                CSTR2RVAL(path));
@@ -285,7 +269,7 @@ rb_gtk3_tree_cell_data_func_callback(GtkTreeViewColumn *column,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                4,
                GOBJ2RVAL(column),
@@ -316,7 +300,7 @@ rb_gtk3_tree_iter_compare_func_callback(GtkTreeModel *model,
     rb_iter2 = BOXED2RVAL(iter2, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter2, id_set_model, 1, rb_model);
 
-    rb_result = rb_funcall(callback_data->rb_callback,
+    rb_result = rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                            id_call,
                            3,
                            rb_model,
@@ -345,7 +329,7 @@ rb_gtk3_tree_model_filter_modify_func_callback(GtkTreeModel *model,
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
     rb_column = INT2NUM(column);
 
-    rb_value = rb_funcall(callback_data->rb_callback,
+    rb_value = rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                           id_call,
                           3,
                           rb_model,
@@ -371,7 +355,7 @@ rb_gtk3_tree_model_filter_visible_func_callback(GtkTreeModel *model,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    rb_visible = rb_funcall(callback_data->rb_callback,
+    rb_visible = rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                             id_call,
                             2,
                             rb_model,
@@ -398,7 +382,7 @@ rb_gtk3_tree_model_foreach_func_callback(GtkTreeModel *model,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                3,
                rb_model,
@@ -424,7 +408,7 @@ rb_gtk3_tree_selection_foreach_func_callback(GtkTreeModel *model,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                3,
                rb_model,
@@ -443,7 +427,7 @@ rb_gtk3_tree_selection_func_callback(GtkTreeSelection *selection,
     VALUE rb_selection_is_changeable;
 
     rb_selection_is_changeable =
-        rb_funcall(callback_data->rb_callback,
+        rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                    id_call,
                    4,
                    GOBJ2RVAL(selection),
@@ -460,7 +444,7 @@ rb_gtk3_tree_view_mapping_func_callback(GtkTreeView *tree_view,
 {
     RBGICallbackData *callback_data = user_data;
 
-    rb_funcall(callback_data->rb_callback,
+    rb_funcall(rb_gi_callback_data_get_rb_callback(callback_data),
                id_call,
                2,
                GOBJ2RVAL(tree_view),
@@ -476,8 +460,6 @@ rb_gtk3_callback_finder(GIArgInfo *info)
         return rb_gtk3_cell_layout_data_func_callback;
     } else if (name_equal(info, "ClipboardReceivedFunc")) {
         return rb_gtk3_clipboard_received_func_callback;
-    } else if (name_equal(info, "ClipboardRichTextReceivedFunc")) {
-        return rb_gtk3_clipboard_rich_text_received_func_callback;
     } else if (name_equal(info, "ClipboardImageReceivedFunc")) {
         return rb_gtk3_clipboard_image_received_func_callback;
     } else if (name_equal(info, "ClipboardTargetsReceivedFunc")) {

data/gtk3.gemspec

@@ -0,0 +1,44 @@
+# -*- ruby -*-
+#
+# Copyright (C) 2018  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
+
+require_relative "../glib2/version"
+
+Gem::Specification.new do |s|
+  s.name          = "gtk3"
+  s.summary       = "Ruby/GTK3 is a Ruby binding of GTK+-3.x."
+  s.description   = "Ruby/GTK3 is a Ruby binding of GTK+-3.x."
+  s.author        = "The Ruby-GNOME2 Project Team"
+  s.email         = "ruby-gnome2-devel-en@lists.sourceforge.net"
+  s.homepage      = "https://ruby-gnome2.osdn.jp/"
+  s.licenses      = ["LGPL-2.1+"]
+  s.version       = ruby_glib2_version
+  s.extensions    = ["ext/#{s.name}/extconf.rb"]
+  s.require_paths = ["lib"]
+  s.files = [
+    "COPYING.LIB",
+    "README.md",
+    "Rakefile",
+    "#{s.name}.gemspec",
+    "extconf.rb",
+    "ext/#{s.name}/depend",
+  ]
+  s.files += Dir.glob("lib/**/*.rb")
+  s.files += Dir.glob("ext/#{s.name}/*.{c,h,def,rb}")
+  s.files += Dir.glob("sample/**/*")
+  s.files += Dir.glob("test/**/*")
+end

data/lib/gtk3/application.rb

@@ -0,0 +1,35 @@
+# Copyright (C) 2018  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 Application
+    alias_method :initialize_raw, :initialize
+    def initialize(*args)
+      case args.size
+      when 0
+        initialize_raw(nil, :flags_none)
+      when 1
+        if args[0].is_a?(String)
+          initialize_raw(args[0], :flags_none)
+        else
+          initialize_raw(nil, args[0])
+        end
+      else
+        initialize_raw(*args)
+      end
+    end
+  end
+end

data/lib/gtk3/entry.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 2018  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 Entry
+    # TODO: It's workaround for a GTK+ problem:
+    # It should be removed when GTK+ fix the problem.
+    # https://github.com/ruby-gnome2/ruby-gnome2/issues/1176
+    alias_method :set_attributes_raw, :set_attributes
+    def set_attributes(attrs)
+      attrs ||= Pango::AttrList.new
+      set_attributes_raw(attrs)
+    end
+    remove_method :attributes=
+    alias_method :attributes=, :set_attributes
+  end
+end

data/lib/gtk3/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2018  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
@@ -83,6 +83,7 @@ module Gtk
       require "gtk3/about-dialog"
       require "gtk3/action"
       require "gtk3/action-group"
+      require "gtk3/application"
       require "gtk3/binding-set"
       require "gtk3/border"
       require "gtk3/box"
@@ -98,6 +99,7 @@ module Gtk
       require "gtk3/container"
       require "gtk3/css-provider"
       require "gtk3/dialog"
+      require "gtk3/entry"
       require "gtk3/entry-buffer"
       require "gtk3/file-chooser-dialog"
       require "gtk3/font-chooser-dialog"

data/lib/gtk3/text-buffer.rb

@@ -144,7 +144,13 @@ module Gtk
       if tags
         start_iter = get_iter_at(:offset => start_offset)
         tags.each do |tag|
-          tag = tag_table.lookup(tag) if tag.is_a?(String)
+          if tag.is_a?(String)
+            resolved_tag = tag_table.lookup(tag)
+            if resolved_tag.nil?
+              raise ArgumentError "unknown tag: #{tag.inspect}"
+            end
+            tag = resolved_tag
+          end
           apply_tag(tag, start_iter, iter)
         end
       end