gtk3 2.2.3-x86-mingw32 → 2.2.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42ff79bf8b5e0233f4befcbd0988d959370f6308
-  data.tar.gz: 80d528424c749ec1a4ddc1b187540a956277aa12
+  metadata.gz: ec3f85ab59452443d05b43dd5794ebc1faf18f8d
+  data.tar.gz: 3c6650aa7324948d7c1f77ce40aa8462bbc0bcf4
 SHA512:
-  metadata.gz: 899c2772f1ac8ab7a27485668de0e14c02c9105c72710d6507bc2b7fdf327108d0eaedbc544e05272b7487f643e8b3d3cdf3f20f71470e12f5e53a67682b5b86
-  data.tar.gz: 96d2f551b7fd330f5b722b331c0f2a292c102ed1a6b2dfd802d011713bfe307a17767823ec090f8d0c50d2990eedc98635f8a286a07dac7b2e6fd1acdd7f0afc
+  metadata.gz: 79f859689e58fd0fa69458686a8f86d2a4edeae60c666b3eb3da3951c47d210f978b9ca7ee6ddec1f7d8bbb3043d0a0f07d9fe2849bd3543cf8f6801a5a25bea
+  data.tar.gz: b19aaeb6dfc4e021ba24d3ee8d065315844e11ceff3e4fbeaf6ef75a6e7792e0518a4194dabf619ffa2fcaa985e46b148e76d4bfa69d204826eee35a9316695b

data/ext/gtk3/extconf.rb

@@ -43,24 +43,11 @@ have_func("rb_errinfo")
                      :target_build_dir => build_dir)
 end
 
-rcairo_options = {}
-rcairo_source_dir_names = ["rcairo"]
-if /mingw|cygwin|mswin/ =~ RUBY_PLATFORM
-  rcairo_source_dir_names.unshift("rcairo.win32")
-end
-rcairo_source_dir_names.each do |rcairo_source_dir_name|
-  rcairo_source_dir = top_dir.parent.expand_path + rcairo_source_dir_name
-  if rcairo_source_dir.exist?
-    rcairo_options[:rcairo_source_dir] = rcairo_source_dir.to_s
-    break
-  end
-end
-
-unless check_cairo(rcairo_options)
+unless check_cairo(:top_dir => top_dir)
   exit(false)
 end
 
-setup_win32(module_name, base_dir)
+setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package(package_id,
                                    :debian => "libgtk-3-dev",

data/ext/gtk3/rbgtk-about-dialog.c

@@ -74,7 +74,9 @@ rg_s_show(VALUE self, VALUE parent, VALUE props)
                    strlen(pd[i].name) == strlen("logo")){
             pd[i].value = g_object_ref(RVAL2GOBJ(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
         } else if (strncmp(pd[i].name, "wrap_license", strlen("wrap_license")) == 0){
-            pd[i].value = GINT_TO_POINTER(RVAL2CBOOL(RARRAY_PTR(ary)[i]));
+            pd[i].value = GINT_TO_POINTER(RVAL2CBOOL(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
+        } else if (strncmp(pd[i].name, "license_type", strlen("license_type")) == 0){
+            pd[i].value = GINT_TO_POINTER(RVAL2GTKLICENSE(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
         } else {
             pd[i].value = g_strdup(RVAL2CSTR(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
         }

data/ext/gtk3/rbgtk-action-bar.c

@@ -0,0 +1,73 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  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
+ */
+
+#include "rbgtk3private.h"
+
+#define RG_TARGET_NAMESPACE cActionBar
+#define _SELF(self) (RVAL2GTKACTIONBAR(self))
+
+#if GTK_CHECK_VERSION(3, 12, 0)
+static VALUE
+rg_initialize(VALUE self)
+{
+    RBGTK_INITIALIZE(self, gtk_action_bar_new());
+    return Qnil;
+}
+
+static VALUE
+rg_pack_start(VALUE self, VALUE child)
+{
+    gtk_action_bar_pack_start(_SELF(self), RVAL2GOBJ(child));
+    return self;
+}
+
+static VALUE
+rg_pack_end(VALUE self, VALUE child)
+{
+    gtk_action_bar_pack_end(_SELF(self), RVAL2GOBJ(child));
+    return self;
+}
+
+static VALUE
+rg_center_widget(VALUE self)
+{
+    return GOBJ2RVAL(gtk_action_bar_get_center_widget(_SELF(self)));
+}
+
+static VALUE
+rg_set_center_widget(VALUE self, VALUE child)
+{
+    gtk_action_bar_set_center_widget(_SELF(self), RVAL2GOBJ(child));
+    return self;
+}
+
+void
+Init_gtk_action_bar(VALUE mGtk)
+{
+    VALUE RG_TARGET_NAMESPACE =
+        G_DEF_CLASS(GTK_TYPE_ACTION_BAR, "ActionBar", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(pack_start, 1);
+    RG_DEF_METHOD(pack_end, 1);
+    RG_DEF_METHOD(center_widget, 0);
+    RG_DEF_METHOD(set_center_widget, 1);
+}
+#endif

data/ext/gtk3/rbgtk.c

@@ -564,6 +564,9 @@ Init_gtk(void)
     Init_gtk_accel_map(RG_TARGET_NAMESPACE);
     Init_gtk_accessible(RG_TARGET_NAMESPACE);
     Init_gtk_action(RG_TARGET_NAMESPACE);
+#if GTK_CHECK_VERSION(3, 12, 0)
+    Init_gtk_action_bar(RG_TARGET_NAMESPACE);
+#endif
     Init_gtk_actiongroup(RG_TARGET_NAMESPACE);
     Init_gtk_activatable(RG_TARGET_NAMESPACE);
     Init_gtk_adjustment(RG_TARGET_NAMESPACE);

data/ext/gtk3/rbgtk3conversions.h

@@ -26,6 +26,7 @@
 #define RVAL2GTKACCELLABEL(o)              (GTK_ACCEL_LABEL(RVAL2GOBJ(o)))
 #define RVAL2GTKACCESSIBLE(o)              (GTK_ACCESSIBLE(RVAL2GOBJ(o)))
 #define RVAL2GTKACTION(o)                  (GTK_ACTION(RVAL2GOBJ(o)))
+#define RVAL2GTKACTIONBAR(o)               (GTK_ACTION_BAR(RVAL2GOBJ(o)))
 #define RVAL2GTKACTIONGROUP(o)             (GTK_ACTION_GROUP(RVAL2GOBJ(o)))
 #define RVAL2GTKADJUSTMENT(o)              (GTK_ADJUSTMENT(RVAL2GOBJ(o)))
 #define RVAL2GTKALIGNMENT(o)               (GTK_ALIGNMENT(RVAL2GOBJ(o)))
@@ -330,6 +331,8 @@
 #define GTKWINDOWTYPE2RVAL(o)              (GENUM2RVAL(o, GTK_TYPE_WINDOW_TYPE))
 #define RVAL2GTKWRAPMODE(o)                (RVAL2GENUM(o, GTK_TYPE_WRAP_MODE))
 #define GTKWRAPMODE2RVAL(o)                (GENUM2RVAL(o, GTK_TYPE_WRAP_MODE))
+#define RVAL2GTKLICENSE(o)                 (RVAL2GENUM(o, GTK_TYPE_LICENSE))
+#define GTKLICENSE2RVAL(o)                 (GENUM2RVAL(o, GTK_TYPE_LICENSE))
 
 #define RVAL2GTKACCELFLAGS(o)              (RVAL2GFLAGS(o, GTK_TYPE_ACCEL_FLAGS))
 #define GTKACCELFLAGS2RVAL(o)              (GFLAGS2RVAL(o, GTK_TYPE_ACCEL_FLAGS))

data/ext/gtk3/rbgtk3private.h

@@ -79,6 +79,9 @@ G_GNUC_INTERNAL void Init_gtk_accel_label(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_accel_map(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_accessible(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_action(VALUE mGtk);
+#if GTK_CHECK_VERSION(3, 12, 0)
+    G_GNUC_INTERNAL void Init_gtk_action_bar(VALUE mGtk);
+#endif
 G_GNUC_INTERNAL void Init_gtk_actiongroup(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_activatable(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_adjustment(VALUE mGtk);

data/test/test_gtk_action_group.rb

@@ -0,0 +1,46 @@
+# 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
+
+class TestGtkActionBar < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def setup
+    @bar = Gtk::ActionBar.new
+  end
+
+  def test_pack_start
+    widget1 = Gtk::Box.new(:horizontal)
+    widget2 = Gtk::Box.new(:horizontal)
+    @bar.pack_start(widget1)
+    @bar.pack_start(widget2)
+    assert_equal([widget1, widget2], @bar.children)
+  end
+
+  def test_pack_end
+    widget1 = Gtk::Box.new(:horizontal)
+    widget2 = Gtk::Box.new(:horizontal)
+    @bar.pack_end(widget1)
+    @bar.pack_end(widget2)
+    assert_equal([widget2, widget1], @bar.children)
+  end
+
+  def test_center_widget
+    widget = Gtk::Box.new(:horizontal)
+    assert_nil(@bar.center_widget)
+    @bar.center_widget = widget
+    assert_equal(widget, @bar.center_widget)
+  end
+end

data/test/test_gtk_image.rb

@@ -2,7 +2,7 @@ class TestGtkImage < Test::Unit::TestCase
   include GtkTestUtils
 
   def test_stock
-    image = Gtk::Image.new(Gtk::Stock::GO_FORWARD, :dialog)
+    image = Gtk::Image.new(:stock => Gtk::Stock::GO_FORWARD, :size => :dialog)
     assert_equal(Gtk::Stock::GO_FORWARD.to_s, image.stock)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk3
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: x86-mingw32
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: gio2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: atk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: gdk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.2.4
 description: Ruby/GTK3 is a Ruby binding of GTK+-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -114,6 +114,7 @@ files:
 - ext/gtk3/rbgtk-accel-map.c
 - ext/gtk3/rbgtk-accelerator.c
 - ext/gtk3/rbgtk-accessible.c
+- ext/gtk3/rbgtk-action-bar.c
 - ext/gtk3/rbgtk-action-group.c
 - ext/gtk3/rbgtk-action.c
 - ext/gtk3/rbgtk-activatable.c
@@ -327,6 +328,7 @@ files:
 - extconf.rb
 - lib/2.0/gtk3.so
 - lib/2.1/gtk3.so
+- lib/2.2/gtk3.so
 - lib/gtk3.rb
 - lib/gtk3/base.rb
 - lib/gtk3/deprecated.rb
@@ -524,6 +526,7 @@ files:
 - test/test_gtk_accel_group_entry.rb
 - test/test_gtk_accel_key.rb
 - test/test_gtk_accessible.rb
+- test/test_gtk_action_group.rb
 - test/test_gtk_allocation.rb
 - test/test_gtk_border.rb
 - test/test_gtk_buildable.rb