gdk3 2.2.3-x86-mingw32 → 2.2.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9d831f6a80b426c95d76f0a4a150cd8e609d86
-  data.tar.gz: f538c17487a66176ab9b51b8044516464bb3e9a4
+  metadata.gz: 0c2de6b16406051cb2d2bae03a234c804d52ba7b
+  data.tar.gz: f474bf0d966622f7bec2e5776d1194ba8d8b8299
 SHA512:
-  metadata.gz: b8f7565af71a4182f248c4f7cb3f082fea41f343f1a4204f077df94acd77653790a2498c2a741b887373bd08a5e3427a981524781974c24b8421d2ec6600b57c
-  data.tar.gz: 3305c92efa377ea3c08cb9ca5ea982782b8a680ee8dc79b5926ca8bac78ba0194667d233c59d64a22aad5e723865936e139a185a52a27d47e43f006028057dd9
+  metadata.gz: 278d7d26eabf97c65fd59580c10fa18956f104f8f6fb3dab3549d537b2f71e2c115e0af231d0c75da13ff70f751225bd96159ec55e240c6684d0919bbc2922c8
+  data.tar.gz: 77d361c53e39bf31a2bbd35ae226ac92c35d9a49bf0b612f718addc2fee859d40dce8493adf383681466e12bd671d0e785e33115bfca4e7ed8963c7b6d70c183

data/Rakefile

@@ -47,7 +47,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gtk+",
       :download_site => :gnome,
       :label => "GTK+",
-      :version => "3.14.1",
+      :version => "3.14.6",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -60,14 +60,15 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       },
     },
     {
-      :name => "hicolor-icon-theme",
-      :download_base_url => "http://icon-theme.freedesktop.org/releases",
-      :label => "gtk-hi-color-icon-theme",
-      :version => "0.13",
+      :name => "adwaita-icon-theme",
+      :download_site => :gnome,
+      :label => "adwaita-icon-theme",
+      :version => "3.14.1",
+      :compression_method => "xz",
       :windows => {
         :configure_args => [],
         :build_concurrently => false,
-        :built_file => "share/icons/hicolor/index.theme",
+        :built_file => "share/icons/Adwaita/index.theme",
       }
     },
   ]

data/lib/gdk3/cairo.rb

@@ -36,11 +36,15 @@ module Cairo
 
     if method_defined?(:set_source_rgba)
       alias_method :set_source_not_gdk_rgba, :set_source_rgba
-      def set_source_rgba(rgba)
-        if rgba.is_a?(Gdk::RGBA)
+      def set_source_rgba(rgba, g=nil, b=nil, a=nil)
+        case rgba
+        when Gdk::RGBA
           set_source_gdk_rgba(rgba)
-        else
+        when Array
           set_source_not_gdk_rgba(rgba)
+        else
+          r = rgba
+          set_source_not_gdk_rgba([r, g, b, a])
         end
       end
     else

data/lib/gdk3/color.rb

@@ -16,6 +16,28 @@
 
 module Gdk
   class Color
+    class << self
+      alias_method :parse_raw, :parse
+      def parse(spec)
+        succeeded, color = parse_raw(spec)
+        unless succeeded
+          message = "Invalid color spec: <#{spec.inspect}>: "
+          message << "Color spec must be one of them: "
+          message << "\"\#rgb\", "
+          message << "\"\#rrggbb\", "
+          message << "\"\#rrggbb\", "
+          message << "\"\#rrrgggbbb\", "
+          message << "\"\#rrrrggggbbbb\", "
+          message << "\"\#fff\", "
+          message << "\"\#ffffff\", "
+          message << "\"\#fffffffff\", "
+          message << "\"\#fffffffffffff\""
+          raise ArgumentError, message
+        end
+        color
+      end
+    end
+
     alias_method :initialize_raw, :initialize
     def initialize(red, green, blue)
       initialize_raw

data/lib/gdk3/deprecated.rb

@@ -53,11 +53,8 @@ module Gdk
 
   class Event
     extend GLib::Deprecatable
-    define_deprecated_flags :Mask
-    define_deprecated_enums :Type
-    Gdk::EventMask.constants.each do |event_mask|
-      define_deprecated_const event_mask, ['Gdk::EventMask', event_mask].join('::')
-    end
+    define_deprecated_const :Mask, "Gdk::EventMask"
+    define_deprecated_const :Type, "Gdk::EventType"
   end
 
   class EventCrossing
@@ -134,17 +131,20 @@ module Gdk
 
   class Window
     extend GLib::Deprecatable
-    define_deprecated_flags :AttributesType, 'WA'
-    define_deprecated_enums :Edge, 'EDGE'
-    define_deprecated_enums :FilterReturn, 'FILTER'
-    define_deprecated_enums :Gravity, 'GRAVITY'
-    define_deprecated_flags :Hints, 'HINT'
-    define_deprecated_flags :ModifierType
-    define_deprecated_enums :Type
-    define_deprecated_enums :TypeHint, 'TYPE_HINT'
-    define_deprecated_const :WindowClass, 'Gdk::Window::Class'
-    define_deprecated_flags :WMDecoration, 'DECOR'
-    define_deprecated_flags :WMFunction, 'FUNC'
+
+    define_deprecated_const :Gravity, "Gdk::Gravity"
+    define_deprecated_const :AttributesType, "Gdk::WindowAttributesType"
+    define_deprecated_const :Edge, "Gdk::WindowEdge"
+    define_deprecated_const :FilterReturn, "Gdk::FilterReturn"
+    define_deprecated_const :Hints, "Gdk::WindowHints"
+    define_deprecated_const :ModifierType, "Gdk::ModifierType"
+    define_deprecated_const :Type, "Gdk::WindowType"
+    define_deprecated_const :TypeHint, "Gdk::WindowTypeHint"
+    define_deprecated_const :WindowClass, "Gdk::WindowWindowClass"
+    define_deprecated_const :Class, "Gdk::WindowWindowClass"
+    define_deprecated_const :WMDecoration, "Gdk::WMDecoration"
+    define_deprecated_const :WMFunction, "Gdk::WMFunction"
+    define_deprecated_const :PARENT_RELATIVE, "Gdk::PARENT_RELATIVE"
     define_deprecated_method :clear, :warn => "Don't use this method."
     define_deprecated_method :clear_area, :warn => "Don't use this method."
     define_deprecated_method :internal_paint_info, :raise => "Don't use this method."

data/lib/gdk3/loader.rb

@@ -218,6 +218,9 @@ module Gdk
         else
           define_method(info, Cairo::Context, name)
         end
+      when /\Akeyval_/
+        name = rubyish_method_name(info, :prefix => "keyval_")
+        define_module_function(@keyval_module, name, info)
       else
         super
       end
@@ -237,10 +240,6 @@ module Gdk
 
     def define_enum(info)
       case info.name
-      when /\AWindowWindow/
-        self.class.define_class(info.gtype, $POSTMATCH, window_class)
-      when /\AWindow/
-        self.class.define_class(info.gtype, $POSTMATCH, window_class)
       when "EventType"
         self.class.register_constant_rename_map("2BUTTON_PRESS",
                                                 "BUTTON2_PRESS")

data/test/test-gdk-cairo.rb

@@ -32,10 +32,40 @@ class TestGdkCairo < Test::Unit::TestCase
                  @context.source.color)
   end
 
-  def test_set_source_rgba
-    rgba = Gdk::RGBA.new(0.1, 0.2, 0.3, 0.4)
-    @context.source_rgba = rgba
-    assert_equal(Cairo::Color::RGB.new(0.1, 0.2, 0.3, 0.4),
-                 @context.source.color)
+  sub_test_case "#set_source_rgba" do
+    sub_test_case "RGBA" do
+      def test_rgba
+        rgba = Gdk::RGBA.new(0.1, 0.2, 0.3, 0.4)
+        @context.source_rgba = rgba
+        assert_equal(Cairo::Color::RGB.new(0.1, 0.2, 0.3, 0.4),
+                     @context.source.color)
+      end
+
+      def test_values
+        @context.set_source_rgba(0.1, 0.2, 0.3, 0.4)
+        assert_equal([0.1, 0.2, 0.3, 0.4],
+                     @context.source.rgba)
+      end
+
+      def test_array
+        @context.set_source_rgba([0.1, 0.2, 0.3, 0.4])
+        assert_equal([0.1, 0.2, 0.3, 0.4],
+                     @context.source.rgba)
+      end
+    end
+
+    sub_test_case "RGB" do
+      def test_values
+        @context.set_source_rgb(0.1, 0.2, 0.3)
+        assert_equal([0.1, 0.2, 0.3, 1.0],
+                    @context.source.rgba)
+      end
+
+      def test_array
+        @context.set_source_rgb([0.1, 0.2, 0.3])
+        assert_equal([0.1, 0.2, 0.3, 1.0],
+                    @context.source.rgba)
+      end
+    end
   end
 end

data/test/test-gdk-color.rb

@@ -17,6 +17,31 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestGdkColor < Test::Unit::TestCase
+  sub_test_case ".parse" do
+    def test_invalid_spec
+      spec = "fff"
+      message = "Invalid color spec: <#{spec.inspect}>: "
+      message << "Color spec must be one of them: "
+      message << "\"\#rgb\", "
+      message << "\"\#rrggbb\", "
+      message << "\"\#rrggbb\", "
+      message << "\"\#rrrgggbbb\", "
+      message << "\"\#rrrrggggbbbb\", "
+      message << "\"\#fff\", "
+      message << "\"\#ffffff\", "
+      message << "\"\#fffffffff\", "
+      message << "\"\#fffffffffffff\""
+      assert_raise(ArgumentError.new(message)) do
+        Gdk::Color.parse(spec)
+      end
+    end
+
+    def test_valid
+      color = Gdk::Color.parse("#abc")
+      assert_equal("#aaaabbbbcccc", color.to_s)
+    end
+  end
+
   def test_to_s
     color = Gdk::Color.new(0xffff, 0x1234, 0xabcd)
     assert_equal("#ffff1234abcd", color.to_s)

data/test/test-gdk-keyval.rb

@@ -18,4 +18,59 @@ class TestGdkKeyval < Test::Unit::TestCase
   def test_consntant_name
     assert_equal("a".unpack("c")[0], Gdk::Keyval::KEY_a)
   end
+
+  sub_test_case "#lower?" do
+    def test_lower
+      assert_true(Gdk::Keyval.lower?(Gdk::Keyval::KEY_a))
+    end
+
+    def test_upper
+      assert_false(Gdk::Keyval.lower?(Gdk::Keyval::KEY_A))
+    end
+  end
+
+  sub_test_case "#upper?" do
+    def test_lower
+      assert_false(Gdk::Keyval.upper?(Gdk::Keyval::KEY_a))
+    end
+
+    def test_upper
+      assert_true(Gdk::Keyval.upper?(Gdk::Keyval::KEY_A))
+    end
+  end
+
+  def test_name
+    assert_equal("A", Gdk::Keyval.name(Gdk::Keyval::KEY_A))
+  end
+
+  sub_test_case "#to_lower" do
+    def test_lower
+      assert_equal(Gdk::Keyval::KEY_a,
+                   Gdk::Keyval.to_lower(Gdk::Keyval::KEY_a))
+    end
+
+    def test_upper
+      assert_equal(Gdk::Keyval::KEY_a,
+                   Gdk::Keyval.to_lower(Gdk::Keyval::KEY_A))
+    end
+  end
+
+  sub_test_case "#to_upper" do
+    def test_lower
+      assert_equal(Gdk::Keyval::KEY_A,
+                   Gdk::Keyval.to_upper(Gdk::Keyval::KEY_a))
+    end
+
+    def test_upper
+      assert_equal(Gdk::Keyval::KEY_A,
+                   Gdk::Keyval.to_upper(Gdk::Keyval::KEY_A))
+    end
+  end
+
+  sub_test_case "#to_unicode" do
+    def test_to_unicode
+      assert_equal("\u02D8", # BREVE
+                   [Gdk::Keyval.to_unicode(Gdk::Keyval::KEY_breve)].pack("U"))
+    end
+  end
 end

data/test/test-gdk-window-attr.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-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
@@ -24,8 +24,8 @@ class TestGdkWindowAttr < Test::Unit::TestCase
     assert_equal([
                    100,
                    100,
-                   Gdk::Window::Class::INPUT_ONLY,
-                   Gdk::Window::Type::TEMP,
+                   Gdk::WindowWindowClass::INPUT_ONLY,
+                   Gdk::WindowType::TEMP,
                  ],
                  [attrs.width, attrs.height, attrs.wclass, attrs.window_type])
   end

data/vendor/local/include/gtk-3.0/gdk/gdkenumtypes.h

@@ -1,13 +1,13 @@
 
 /* Generated data (by glib-mkenums) */
 
+#ifndef __GDK_ENUM_TYPES_H__
+#define __GDK_ENUM_TYPES_H__
+
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#ifndef __GDK_ENUM_TYPES_H__
-#define __GDK_ENUM_TYPES_H__
-
 #include <glib-object.h>
 #include <gdk/gdkversionmacros.h>
 

data/vendor/local/include/gtk-3.0/gdk/gdkframeclock.h

@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GDK_FRAME_CLOCK_H__
+#define __GDK_FRAME_CLOCK_H__
+
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#ifndef __GDK_FRAME_CLOCK_H__
-#define __GDK_FRAME_CLOCK_H__
-
 #include <gdk/gdkframetimings.h>
 
 G_BEGIN_DECLS

data/vendor/local/include/gtk-3.0/gdk/gdkframetimings.h

@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GDK_FRAME_TIMINGS_H__
+#define __GDK_FRAME_TIMINGS_H__
+
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#ifndef __GDK_FRAME_TIMINGS_H__
-#define __GDK_FRAME_TIMINGS_H__
-
 #include <glib-object.h>
 #include <gdk/gdkversionmacros.h>
 

data/vendor/local/include/gtk-3.0/gdk/gdkversionmacros.h

@@ -26,7 +26,7 @@
 
 #define GDK_MAJOR_VERSION (3)
 #define GDK_MINOR_VERSION (14)
-#define GDK_MICRO_VERSION (1)
+#define GDK_MICRO_VERSION (6)
 
 #ifndef _GDK_EXTERN
 #define _GDK_EXTERN extern

data/vendor/local/include/gtk-3.0/gtk/gtkcssprovider.h

@@ -30,6 +30,11 @@ G_BEGIN_DECLS
 #define GTK_IS_CSS_PROVIDER_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE    ((c), GTK_TYPE_CSS_PROVIDER))
 #define GTK_CSS_PROVIDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS  ((o), GTK_TYPE_CSS_PROVIDER, GtkCssProviderClass))
 
+/**
+ * GTK_CSS_PROVIDER_ERROR:
+ *
+ * Domain for #GtkCssProvider errors.
+ */
 #define GTK_CSS_PROVIDER_ERROR (gtk_css_provider_error_quark ())
 
 /**
@@ -41,7 +46,7 @@ G_BEGIN_DECLS
  * @GTK_CSS_PROVIDER_ERROR_DEPRECATED: Deprecation error.
  * @GTK_CSS_PROVIDER_ERROR_UNKNOWN_VALUE: Unknown value.
  *
- * Deprecated.
+ * Error codes for %GTK_CSS_PROVIDER_ERROR.
  */
 typedef enum
 {

data/vendor/local/include/gtk-3.0/gtk/gtkplacessidebar.h

@@ -23,13 +23,14 @@
  *            Federico Mena Quintero <federico@gnome.org>
  *
  */
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
 
 #ifndef __GTK_PLACES_SIDEBAR_H__
 #define __GTK_PLACES_SIDEBAR_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS