gdk3 2.1.0-x86-mingw32 → 2.2.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f33425a4af9cbe611186550b67c0d39da0180bc
-  data.tar.gz: f1650bbf882aed7dec4a1ed08e3a41f19d567d5e
+  metadata.gz: 0f3c5493972febc6b6042e59d8f3550a87bbcf01
+  data.tar.gz: 8663b90432a95dcc4576413b347cf20265a87fb9
 SHA512:
-  metadata.gz: 9117f3cc438b91fa45da8321e8efeff2c4878495bed4dd01870c2e46cc284b58a901480b1a8e1556a9717766edd821af9c117623232cfaedf2b630a57fe90aff
-  data.tar.gz: c489ed8d80ba57e22db18d370ba90e21f6886f787cfc9f26c92aca312a4266807f8b9610db0d5b09682e4131ace0c1968ac8fb442055a932d4c664ff0863e339
+  metadata.gz: d066a7c552159c08e5874f0251005427983902757c7951ae8b11c06ffb5eb80c043ee63de417956169d89ea61db11da25a78237d93231de89b2cb38719d3a858
+  data.tar.gz: 4a4c03f3b400671a4567f227efc8f45d0dcbcf660a0bbbe74b5fce5459f70db76e159ed5afb38dfa6086693d1da4c7e215d53b24653091b1296a1443ee1ee396

data/Rakefile

@@ -26,16 +26,18 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gtk+",
       :download_site => :gnome,
       :label => "GTK+",
-      :version => "3.10.6",
+      :version => "3.10.7",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--enable-introspection",
+          "--with-included-immodules",
         ],
         :patches => [
           "gdk+-3.10.6-remove-def-use.diff",
         ],
         :need_autoreconf => true,
+        :build_concurrently => false,
         :built_file => "bin/libgdk-3-0.dll",
       },
     },

data/ext/gdk3/rbgdkcursor.c

@@ -39,20 +39,20 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
             cursor = gdk_cursor_new_from_name(RVAL2GDKDISPLAYOBJECT(display),
                                               RVAL2CSTR(type_or_name));
         else
-            cursor = gdk_cursor_new_for_display(RVAL2GDKDISPLAYOBJECT(display), 
+            cursor = gdk_cursor_new_for_display(RVAL2GDKDISPLAYOBJECT(display),
                                                 RVAL2GDKCURSORTYPE(type_or_name));
     } else if (argc == 4) {
         VALUE display, pixbuf, x, y;
         rb_scan_args(argc, argv, "40", &display, &pixbuf, &x, &y);
-        cursor = gdk_cursor_new_from_pixbuf(RVAL2GDKDISPLAYOBJECT(display), 
-                                            RVAL2GDKPIXBUF(pixbuf), 
+        cursor = gdk_cursor_new_from_pixbuf(RVAL2GDKDISPLAYOBJECT(display),
+                                            RVAL2GDKPIXBUF(pixbuf),
                                             NUM2INT(x), NUM2INT(y));
 /* deprecated
     } else if (argc == 6) {
         VALUE pixmap, mask, fg, bg, x, y;
         rb_scan_args(argc, argv, "60", &pixmap, &mask, &fg, &bg, &x, &y);
-        cursor = gdk_cursor_new_from_pixmap(RVAL2GDKPIXMAP(pixmap), 
-                                            NIL_P(mask)?NULL:RVAL2GDKPIXMAP(mask), 
+        cursor = gdk_cursor_new_from_pixmap(RVAL2GDKPIXMAP(pixmap),
+                                            NIL_P(mask)?NULL:RVAL2GDKPIXMAP(mask),
                                             RVAL2GDKCOLOR(fg),
                                             RVAL2GDKCOLOR(bg),
                                             NUM2INT(x), NUM2INT(y));
@@ -63,12 +63,6 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-static VALUE
-rg_display(VALUE self)
-{
-    return GOBJ2RVAL(gdk_cursor_get_display(RVAL2GDKCURSOR(self)));
-}
-
 /* TODO
 static VALUE
 rg_cursor_type(VALUE self)
@@ -89,7 +83,6 @@ Init_gdk_cursor(VALUE mGdk)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_CURSOR, "Cursor", mGdk);
 
     RG_DEF_METHOD(initialize, -1);
-    RG_DEF_METHOD(display, 0);
 /* TODO
     RG_DEF_METHOD(cursor_type, 0);
 */

data/ext/gdk3/rbgdkdevicemanager.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  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
@@ -33,7 +33,7 @@ rg_devices(VALUE self)
 void
 Init_gdk_device_manager(VALUE mGdk)
 {
-    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_DISPLAY_MANAGER, "DeviceManager", mGdk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_DEVICE_MANAGER, "DeviceManager", mGdk);
 
     RG_DEF_METHOD(devices, 0);
 }

data/ext/gdk3/rbgdkdisplay.c

@@ -86,6 +86,12 @@ rg_default_screen(VALUE self)
     return GOBJ2RVAL(gdk_display_get_default_screen(_SELF(self)));
 }
 
+static VALUE
+rg_device_manager(VALUE self)
+{
+    return GOBJ2RVAL(gdk_display_get_device_manager(_SELF(self)));
+}
+
 static VALUE
 rg_device_is_grabbed_p(VALUE self, VALUE device)
 {
@@ -382,6 +388,7 @@ Init_gdk_display(VALUE mGdk)
     RG_DEF_METHOD(get_screen, 1);
     RG_DEF_ALIAS("[]", "get_screen");
     RG_DEF_METHOD(default_screen, 0);
+    RG_DEF_METHOD(device_manager, 0);
 
     RG_DEF_METHOD_P(device_is_grabbed, 1);
 

data/ext/gdk3/rbgdkevent.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2002-2013 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2014 Ruby-GNOME2 Project Team
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
  *                          Hiroshi Igarashi
@@ -721,8 +721,6 @@ ATTR_FLOAT(button, x_root);
 ATTR_FLOAT(button, y_root);
 
 /* GdkEventTouch */
-ATTR_GOBJ(touch, window);
-ATTR_BOOL(touch, send_event);
 ATTR_UINT(touch, time);
 ATTR_FLOAT(touch, x);
 ATTR_FLOAT(touch, y);
@@ -902,10 +900,17 @@ Init_gdk_event(VALUE mGdk)
     rbg_define_method(rb_cGdkEvent, "screen", gdkevent_screen, 0);
     rbg_define_method(rb_cGdkEvent, "set_screen", gdkevent_set_screen, 1);
 
+    /* GdkEventAny's fields */
+    DEFINE_ACCESSOR(rb_cGdkEvent, any, window);
+    rbg_define_method(rb_cGdkEvent, "send_event?", gdkeventany_send_event, 0);
+    rbg_define_method(rb_cGdkEvent, "set_send_event", gdkeventany_set_send_event, 1);
+
     /*
      * GdkEvent's Constants
      */
     rb_define_const(rb_cGdkEvent, "CURRENT_TIME", INT2FIX(GDK_CURRENT_TIME));
+    rb_define_const(rb_cGdkEvent, "PROPAGATE", CBOOL2RVAL(GDK_EVENT_PROPAGATE));
+    rb_define_const(rb_cGdkEvent, "STOP", CBOOL2RVAL(GDK_EVENT_STOP));
     rb_define_const(rb_cGdkEvent, "PRIORITY_EVENTS", INT2FIX(GDK_PRIORITY_EVENTS));
     rb_define_const(rb_cGdkEvent, "PRIORITY_REDRAW", INT2FIX(GDK_PRIORITY_REDRAW));
 
@@ -926,9 +931,6 @@ Init_gdk_event(VALUE mGdk)
     rb_cGdkEventAny =
         G_DEF_CLASS_WITH_PARENT(GDK_TYPE_EVENT_ANY, "EventAny",
                                 mGdk, rb_cGdkEvent);
-    DEFINE_ACCESSOR(rb_cGdkEventAny, any, window);
-    rbg_define_method(rb_cGdkEventAny, "send_event?", gdkeventany_send_event, 0);
-    rbg_define_method(rb_cGdkEventAny, "set_send_event", gdkeventany_set_send_event, 1);
 
     /* GdkEventExpose */
     rb_cGdkEventExpose =
@@ -988,9 +990,6 @@ Init_gdk_event(VALUE mGdk)
     rb_cGdkEventTouch =
         G_DEF_CLASS_WITH_PARENT(GDK_TYPE_EVENT_TOUCH, "EventTouch",
                                 mGdk, rb_cGdkEvent);
-    DEFINE_ACCESSOR(rb_cGdkEventTouch, touch, window);
-    rbg_define_method(rb_cGdkEventTouch, "send_event?", gdkeventtouch_send_event, 0);
-    rbg_define_method(rb_cGdkEventTouch, "set_send_event", gdkeventtouch_set_send_event, 1);
     DEFINE_ACCESSOR(rb_cGdkEventTouch, touch, time);
     DEFINE_ACCESSOR(rb_cGdkEventTouch, touch, x);
     DEFINE_ACCESSOR(rb_cGdkEventTouch, touch, y);

data/ext/gdk3/rbgdkwindow.c

@@ -55,6 +55,12 @@ rg_window_type(VALUE self)
     return GDKWINDOWTYPE2RVAL(gdk_window_get_window_type(_SELF(self)));
 }
 
+static VALUE
+rg_display(VALUE self)
+{
+    return GOBJ2RVAL(gdk_window_get_display(_SELF(self)));
+}
+
 static VALUE
 rg_show(VALUE self)
 {
@@ -930,6 +936,7 @@ Init_gdk_window(VALUE mGdk)
     RG_DEF_METHOD(initialize, 3);
     RG_DEF_METHOD(destroy, 0);
     RG_DEF_METHOD(window_type, 0);
+    RG_DEF_METHOD(display, 0);
     RG_DEF_SMETHOD(constrain_size, 4);
     RG_DEF_SMETHOD(process_all_updates, 0);
     RG_DEF_SMETHOD(set_debug_updates, 1);

data/test/test-gdk-event.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
@@ -17,11 +17,37 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestGdkEvent < Test::Unit::TestCase
+  class TestConstant < self
+    def test_propagate
+      assert_false(Gdk::Event::PROPAGATE)
+    end
+
+    def test_stop
+      assert_true(Gdk::Event::STOP)
+    end
+  end
+
+  module TestAnyMethods
+    def test_window
+      assert_nil(event.window)
+    end
+
+    def test_send_event
+      assert_false(event.send_event?)
+    end
+  end
+
   class TestAny < self
+    include TestAnyMethods
+
     def setup
       @event = Gdk::EventAny.new(:delete)
     end
 
+    def event
+      @event
+    end
+
     def test_delete
       assert_equal("GDK_DELETE",
                    Gdk::EventAny.new(:delete).event_type.name)
@@ -31,23 +57,19 @@ class TestGdkEvent < Test::Unit::TestCase
       assert_equal("GDK_DESTROY",
                    Gdk::EventAny.new(:destroy).event_type.name)
     end
-
-    def test_window
-      assert_nothing_raised do
-        @event.window
-      end
-    end
-
-    def test_send_event
-      assert_false(@event.send_event?)
-    end
   end
 
   class TestKey < self
+    include TestAnyMethods
+
     def setup
       @key = Gdk::EventKey.new(:key_press)
     end
 
+    def event
+      @key
+    end
+
     def test_key_press
       assert_equal("GDK_KEY_PRESS",
                    Gdk::EventKey.new(:key_press).event_type.name)
@@ -72,10 +94,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestButton < self
+    include TestAnyMethods
+
     def setup
       @button = Gdk::EventButton.new(:button_press)
     end
 
+    def event
+      @button
+    end
+
     def test_button_press
       assert_equal("GDK_BUTTON_PRESS",
                    Gdk::EventButton.new(:button_press).event_type.name)
@@ -126,18 +154,14 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestTouch < self
+    include TestAnyMethods
+
     def setup
       @touch = Gdk::EventTouch.new(:touch_begin)
     end
 
-    def test_window
-      assert_nothing_raised do
-        @touch.window
-      end
-    end
-
-    def test_send_event
-      assert_false(@touch.send_event?)
+    def event
+      @touch
     end
 
     def test_time
@@ -204,10 +228,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestScroll < self
+    include TestAnyMethods
+
     def setup
       @scroll = Gdk::EventScroll.new
     end
 
+    def event
+      @scroll
+    end
+
     def test_time
       assert_kind_of(Integer, @scroll.time)
     end
@@ -238,10 +268,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestMotion < self
+    include TestAnyMethods
+
     def setup
       @motion = Gdk::EventMotion.new
     end
 
+    def event
+      @motion
+    end
+
     def test_time
       assert_kind_of(Integer, @motion.time)
     end
@@ -274,20 +310,32 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestVisibility < self
+    include TestAnyMethods
+
     def setup
       @visibility = Gdk::EventVisibility.new(:visibility_notify)
     end
 
+    def event
+      @visibility
+    end
+
     def test_state
       assert_kind_of(Gdk::EventVisibility::State, @visibility.state)
     end
   end
 
   class TestCrossing < self
+    include TestAnyMethods
+
     def setup
       @crossing = Gdk::EventCrossing.new(:enter_notify)
     end
 
+    def event
+      @crossing
+    end
+
     def test_enter_notify
       assert_equal("GDK_ENTER_NOTIFY",
                    Gdk::EventCrossing.new(:enter_notify).event_type.name)
@@ -334,20 +382,32 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestFocus < self
+    include TestAnyMethods
+
     def setup
       @focus = Gdk::EventFocus.new
     end
 
+    def event
+      @focus
+    end
+
     def test_in
       assert_false(@focus.in?)
     end
   end
 
   class TestConfigure < self
+    include TestAnyMethods
+
     def setup
       @configure = Gdk::EventConfigure.new
     end
 
+    def event
+      @configure
+    end
+
     def test_x
       assert_kind_of(Integer, @configure.x)
     end
@@ -366,10 +426,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestProperty < self
+    include TestAnyMethods
+
     def setup
       @property = Gdk::EventProperty.new
     end
 
+    def event
+      @property
+    end
+
     def test_atom
       assert_nothing_raised do
         @property.atom
@@ -381,15 +447,21 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_state
-      assert_not_nil(Integer, @property.state)
+      assert_equal(Gdk::EventProperty::State::NEW_VALUE, @property.state)
     end
   end
 
   class TestSelection < self
+    include TestAnyMethods
+
     def setup
       @selection = Gdk::EventSelection.new(:selection_clear)
     end
 
+    def event
+      @selection
+    end
+
     def test_selection_clear
       assert_equal("GDK_SELECTION_CLEAR",
                    Gdk::EventSelection.new(:selection_clear).event_type.name)
@@ -429,10 +501,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestDND < self
+    include TestAnyMethods
+
     def setup
       @dnd = Gdk::EventDND.new(:drag_enter)
     end
 
+    def event
+      @dnd
+    end
+
     def test_drag_enter
       assert_equal("GDK_DRAG_ENTER",
                    Gdk::EventDND.new(:drag_enter).event_type.name)
@@ -483,10 +561,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestProximity < self
+    include TestAnyMethods
+
     def setup
       @proximity = Gdk::EventProximity.new(:proximity_in)
     end
 
+    def event
+      @proximity
+    end
+
     def test_proximity_in
       assert_equal("GDK_PROXIMITY_IN",
                    Gdk::EventProximity.new(:proximity_in).event_type.name)
@@ -509,10 +593,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestWindowState < self
+    include TestAnyMethods
+
     def setup
       @window_state = Gdk::EventWindowState.new
     end
 
+    def event
+      @window_state
+    end
+
     def test_changed_mask
       assert_nothing_raised do
         @window_state.changed_mask
@@ -527,10 +617,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestSetting < self
+    include TestAnyMethods
+
     def setup
       @setting = Gdk::EventSetting.new
     end
 
+    def event
+      @setting
+    end
+
     def test_action
       assert_nothing_raised do
         @setting.action
@@ -549,6 +645,10 @@ class TestGdkEvent < Test::Unit::TestCase
       @owner_change = Gdk::EventOwnerChange.new
     end
 
+    def event
+      @owner_change
+    end
+
     def test_owner
       assert_nothing_raised do
         @owner_change.owner
@@ -577,10 +677,16 @@ class TestGdkEvent < Test::Unit::TestCase
   end
 
   class TestGrabBroken < self
+    include TestAnyMethods
+
     def setup
       @grab_broken = Gdk::EventGrabBroken.new
     end
 
+    def event
+      @grab_broken
+    end
+
     def test_keyboard
       assert_boolean(@grab_broken.keyboard?)
     end