gtk3 3.2.9 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2edacb21e92f90dec7959cd5ea38ba4c912ebd92383666a6971c95d3edc3d32
-  data.tar.gz: fb92186efce8c10bbc3b3efe2d983b1f2e689fc7f724dd321b952f2349ce4599
+  metadata.gz: ed7ce36fe6005666b9e51ba0155dc822b29d49abc725e343705fefcb640db699
+  data.tar.gz: a341c695ba2e7f891347893b229433109783820b5d026c6655387affbfc71d75
 SHA512:
-  metadata.gz: 5d0027ad0fafd92c554a9f054cac9a91256aad574dffd007b8db5aa5dedbad56dd4674a9884c807d13c160df9b1e0937d8619b82dfaf6cff15d0b447983f691b
-  data.tar.gz: 64e8f365531f2ca503729d476fc44a50b0f65ae0ec0baf49e1f1cbae6c603c153fb967c3e32e14f1b1e693dab4fd43305c4333c42dd8af5dce22d9877d4a7369
+  metadata.gz: 7812aecaf900383c5c53eb015873b751ccec81fd21a7098b24ff9b9996db4f78681faad661151c7b0251a98ac9ec4af1310688b9738f624281a8b52d18f62eab
+  data.tar.gz: 2f09d6ecbc7d0c26d81b38555985dcee4951dadde10117b633d4c4f7a8d980fd89d8bf7d630d2d03256276b5c84d7a925d517d43a70dbd2b7fac4e9b781d4e92

data/ext/gtk3/rb-gtk3-widget.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015  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
@@ -20,6 +20,8 @@
 
 #include "rb-gtk3-private.h"
 
+#include <rb_cairo.h>
+
 #define RG_TARGET_NAMESPACE cWidget
 #define _SELF(self) (RVAL2GTKWIDGET(self))
 
@@ -58,6 +60,30 @@ rg_s_type_register(int argc, VALUE *argv, VALUE klass)
     return Qnil;
 }
 
+static void
+rb_gtk3_widget_draw(RGClosureCallData *data)
+{
+    VALUE rb_widget;
+    VALUE rb_cairo_context;
+    VALUE rb_args;
+    VALUE rb_stop_propagate;
+
+    rb_widget = GVAL2RVAL(&(data->param_values[0]));
+    rb_cairo_context = GVAL2RVAL(&(data->param_values[1]));
+    rb_args = rb_ary_new_from_args(2, rb_widget, rb_cairo_context);
+    if (!NIL_P(data->extra_args)) {
+        rb_ary_concat(rb_args, data->extra_args);
+    }
+    rb_stop_propagate = rb_apply(data->callback,
+                                 rb_intern("call"),
+                                 rb_args);
+    if (!RVAL2CBOOL(rb_funcall(rb_cairo_context, rb_intern("destroyed?"), 0))) {
+        rb_funcall(rb_cairo_context, rb_intern("destroy"), 0);
+    }
+    g_value_set_boolean(data->return_value,
+                        RVAL2CBOOL(rb_stop_propagate));
+}
+
 void
 rbgtk3_widget_init(void)
 {
@@ -68,4 +94,8 @@ rbgtk3_widget_init(void)
     RG_TARGET_NAMESPACE = rb_const_get(mGtk, rb_intern("Widget"));
 
     RG_DEF_SMETHOD(type_register, -1);
+
+    rbgobj_set_signal_call_func(RG_TARGET_NAMESPACE,
+                                "draw",
+                                rb_gtk3_widget_draw);
 }

data/lib/gtk3/list-store.rb

@@ -59,5 +59,13 @@ module Gtk
       setup_iter(iter)
       iter
     end
+
+    alias_method :set_column_types_raw, :set_column_types
+    def set_column_types(*types)
+      if types.size == 1 and types[0].is_a?(Array)
+        types = types[0]
+      end
+      set_column_types_raw(types)
+    end
   end
 end

data/test/fixture/simple_window.ui

@@ -10,6 +10,7 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">label</property>
         <property name="ellipsize">end</property>
+        <signal name="move-cursor" handler="on_move_cursor" swapped="no"/>
       </object>
     </child>
   </object>

data/test/test-gtk-list-store.rb

@@ -190,6 +190,34 @@ class TestGtkListStore < Test::Unit::TestCase
                  normalized_data)
   end
 
+  sub_test_case "#set_column_types" do
+    class SubListStore < Gtk::ListStore
+      type_register
+    end
+
+    def setup
+      @store = SubListStore.new
+    end
+
+    test "Array" do
+      @store.set_column_types([String, Integer])
+      iter = @store.append
+      iter[0] = "string"
+      iter[1] = 29
+      assert_equal(["string", 29],
+                   [iter[0], iter[1]])
+    end
+
+    test "String, Integer" do
+      @store.set_column_types(String, Integer)
+      iter = @store.append
+      iter[0] = "string"
+      iter[1] = 29
+      assert_equal(["string", 29],
+                   [iter[0], iter[1]])
+    end
+  end
+
   sub_test_case "GC" do
     test "iter" do
       GC.start

data/test/test-gtk-widget.rb

@@ -218,4 +218,32 @@ class TestGtkWidget < Test::Unit::TestCase
                    widget.get_template_child(widget_class, :label).class)
     end
   end
+
+  sub_test_case ".set_connect_func" do
+    setup do
+      only_gtk_version(3, 12, 0)
+      @resource_data = File.read(fixture_path("simple_window.ui"))
+    end
+
+    test "connect" do
+      data = @resource_data
+      handler_names = []
+      widget_class = Class.new(Gtk::Window) do
+        type_register "SetConnectFunc"
+
+        singleton_class.send(:define_method, :init) do
+          set_template(:data => data)
+          bind_template_child(:label)
+          set_connect_func do |handler_name|
+            handler_names << handler_name
+            lambda do
+              # Do nothing
+            end
+          end
+        end
+      end
+      widget_class.new
+      assert_equal(["on_move_cursor"], handler_names)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk3
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.3.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gio2
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: atk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: gdk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.3.0
 description: Ruby/GTK3 is a Ruby binding of GTK+-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []