gtk2 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a158dded70518dab1031c92353de71d80a91f4a5
-  data.tar.gz: ffca946ad5e6118aa9010e8c9afdf9942b47b302
+  metadata.gz: 8766d633f9cf8ae10270d80c39614435d47731e8
+  data.tar.gz: 85951de288b05a4fddaea6bad2b7661d3e576a2b
 SHA512:
-  metadata.gz: 6e11302c8d5f3af2da72e54e81627d221656e57717343dfe757ee98eacbc913e762a672b6997b6f9de098132e6684ede718920bad6f3a77aa734a0cbe529b0bb
-  data.tar.gz: 650693daee67c4c045aa64b3e241505618b335edb56ac41ffe7a02e51472e18d8ac55737fbf93b71bf173f25b8ae0f3161bee01f7b1f79d2783f09581b3283bb
+  metadata.gz: a27385913d6caff16a69ad965126fcdff8e327ab3543a104abea1451653986cf1a1c0856b2b5fe42d65c39c184e82ad630426847464d6c0a425cea87eb9a5923
+  data.tar.gz: 57e13eedfa987015b4a18ee9db104e585da58b7b4aea1e1976044e75450c02591eaa5daa6cc54ca309f85d059cd6101d50882acb934a31e764707d4d6a678e61

data/Rakefile

@@ -20,10 +20,12 @@ package = GNOME2Package.new do |_package|
       :version => "2.24.22",
       :compression_method => "xz",
       :windows => {
-        :configure_args => [],
+        :configure_args => [
+          "--with-included-immodules",
+        ],
         :need_autoreconf => true,
         :patches => [
-          "gtk+-2.24.22-add-missing-exeext.diff",
+          "gtk+-2.24.22-add-missing-exeext-and-fix-directory.diff",
         ],
         :built_file => "bin/libgtk-win32-2.0-0.dll",
       },

data/ext/gtk2/rbgdkevent.c

@@ -987,6 +987,12 @@ Init_gtk_gdk_event(VALUE mGdk)
     rb_define_singleton_method(rb_cGdkEvent, "add_client_message_filter", gdkevent_s_add_client_message_filter, 1);
     rb_define_method(rb_cGdkEvent, "screen", gdkevent_screen, 0);
     rb_define_method(rb_cGdkEvent, "set_screen", gdkevent_set_screen, 1);
+
+    /* GdkEventAny fields */
+    DEFINE_ACCESSOR(rb_cGdkEvent, any, window);
+    rb_define_method(rb_cGdkEvent, "send_event?", gdkeventany_send_event, 0);
+    rb_define_method(rb_cGdkEvent, "set_send_event", gdkeventany_set_send_event, 1);
+
     G_DEF_SETTERS(rb_cGdkEvent);
 
     /*
@@ -1013,9 +1019,6 @@ Init_gtk_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);
-    rb_define_method(rb_cGdkEventAny, "send_event?", gdkeventany_send_event, 0);
-    rb_define_method(rb_cGdkEventAny, "set_send_event", gdkeventany_set_send_event, 1);
     G_DEF_SETTERS(rb_cGdkEventAny);
 
     /* GdkEventExpose */

data/ext/gtk2/rbgdkwindow.c

@@ -31,10 +31,10 @@ static VALUE
 rg_initialize(VALUE self, VALUE parent, VALUE attributes, VALUE attributes_mask)
 {
     GdkWindow* win;
-    win = gdk_window_new(NIL_P(parent) ? NULL : _SELF(parent), 
-                         (GdkWindowAttr*)RVAL2BOXED(attributes, 
-                                                    GDK_TYPE_WINDOW_ATTR), 
-                         RVAL2GFLAGS(attributes_mask, 
+    win = gdk_window_new(NIL_P(parent) ? NULL : _SELF(parent),
+                         (GdkWindowAttr*)RVAL2BOXED(attributes,
+                                                    GDK_TYPE_WINDOW_ATTR),
+                         RVAL2GFLAGS(attributes_mask,
                                     GDK_TYPE_WINDOW_ATTRIBUTES_TYPE));
     G_INITIALIZE(self, win);
 
@@ -304,7 +304,7 @@ rg_s_constrain_size(G_GNUC_UNUSED VALUE self, VALUE geometry, VALUE flags, VALUE
 
 #if GTK_CHECK_VERSION(2, 12, 0)
 static VALUE
-rg_beep(VALUE self) 
+rg_beep(VALUE self)
 {
     gdk_window_beep(_SELF(self));
     return self;
@@ -315,7 +315,7 @@ static VALUE
 rg_begin_paint(VALUE self, VALUE area)
 {
     if (rb_obj_is_kind_of(area, GTYPE2CLASS(GDK_TYPE_RECTANGLE))){
-        gdk_window_begin_paint_rect(_SELF(self), 
+        gdk_window_begin_paint_rect(_SELF(self),
                                     (GdkRectangle*)RVAL2BOXED(area, GDK_TYPE_RECTANGLE));
     } else {
         gdk_window_begin_paint_region(_SELF(self),
@@ -374,7 +374,7 @@ static VALUE
 rg_update_area(VALUE self)
 {
     GdkRegion* ret = gdk_window_get_update_area(_SELF(self));
-    return BOXED2RVAL(ret, GDK_TYPE_REGION); 
+    return BOXED2RVAL(ret, GDK_TYPE_REGION);
 }
 
 static VALUE
@@ -452,7 +452,7 @@ rg_set_user_data(VALUE self, VALUE user_data)
 static VALUE
 rg_set_override_redirect(VALUE self, VALUE override_redirect)
 {
-    gdk_window_set_override_redirect(_SELF(self), 
+    gdk_window_set_override_redirect(_SELF(self),
                                      RVAL2CBOOL(override_redirect));
     return self;
 }
@@ -486,8 +486,8 @@ rg_set_focus_on_map(VALUE self, VALUE focus_on_map)
 static VALUE
 rg_shape_combine_mask(VALUE self, VALUE shape_mask, VALUE offset_x, VALUE offset_y)
 {
-    gdk_window_shape_combine_mask(_SELF(self), 
-                                  GDK_BITMAP(RVAL2GOBJ(shape_mask)), 
+    gdk_window_shape_combine_mask(_SELF(self),
+                                  GDK_BITMAP(RVAL2GOBJ(shape_mask)),
                                   NUM2INT(offset_x), NUM2INT(offset_y));
     return self;
 }
@@ -513,7 +513,7 @@ rg_merge_child_shapes(VALUE self)
 {
     gdk_window_merge_child_shapes(_SELF(self));
     return self;
-}   
+}
 
 static VALUE
 rg_input_shape_combine_mask(VALUE self, VALUE mask, VALUE x, VALUE y)
@@ -582,6 +582,7 @@ rg_set_back_pixmap(VALUE self, VALUE pixmap, VALUE parent_relative)
     return self;
 }
 
+#if !GTK_CHECK_VERSION(2,18, 0)
 static VALUE
 rg_set_cursor(VALUE self, VALUE cursor)
 {
@@ -589,6 +590,7 @@ rg_set_cursor(VALUE self, VALUE cursor)
                           RVAL2BOXED(cursor, GDK_TYPE_CURSOR));
     return self;
 }
+#endif
 
 static VALUE
 rg_user_data(VALUE self)
@@ -610,7 +612,7 @@ rg_geometry(VALUE self)
 static VALUE
 rg_set_geometry_hints(VALUE self, VALUE geometry, VALUE geom_mask)
 {
-    gdk_window_set_geometry_hints(_SELF(self), 
+    gdk_window_set_geometry_hints(_SELF(self),
                                   NIL_P(geometry) ? (GdkGeometry*)NULL : (GdkGeometry*)RVAL2BOXED(geometry, GDK_TYPE_GEOMETRY),
                                   RVAL2GFLAGS(geom_mask, GDK_TYPE_WINDOW_HINTS));
     return self;
@@ -1005,7 +1007,9 @@ Init_gtk_gdk_window(VALUE mGdk)
     RG_DEF_METHOD(set_title, 1);
     RG_DEF_METHOD(set_background, 1);
     RG_DEF_METHOD(set_back_pixmap, 2);
+#if !GTK_CHECK_VERSION(2, 18, 0)
     RG_DEF_METHOD(set_cursor, 1);
+#endif
     RG_DEF_METHOD(user_data, 0);
     RG_DEF_METHOD(geometry, 0);
     RG_DEF_METHOD(set_geometry_hints, 2);
@@ -1092,7 +1096,7 @@ Init_gtk_gdk_window(VALUE mGdk)
     G_DEF_CLASS(GDK_TYPE_WM_FUNCTION, "WMFunction", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_WM_FUNCTION, "GDK_");
 
-    rb_define_const(RG_TARGET_NAMESPACE, "PARENT_RELATIVE", INT2FIX(GDK_PARENT_RELATIVE));   
+    rb_define_const(RG_TARGET_NAMESPACE, "PARENT_RELATIVE", INT2FIX(GDK_PARENT_RELATIVE));
 
 #ifdef GDK_WINDOWING_X11
     RG_DEF_METHOD(server_time, 0);

data/ext/gtk2/rbgtkinfobar.c

@@ -18,7 +18,7 @@
  *  MA  02110-1301  USA
  */
 
-#include "global.h" 
+#include "global.h"
 
 #if GTK_CHECK_VERSION(2,18,0)
 #define RG_TARGET_NAMESPACE cInfoBar
@@ -50,21 +50,6 @@ rg_get_content_area(VALUE self)
     return GOBJ2RVAL(gtk_info_bar_get_content_area(_SELF(self)));
 }
 
-static VALUE
-rg_get_message_type(VALUE self)
-{
-    return GENUM2RVAL(gtk_info_bar_get_message_type(_SELF(self)),
-                      GTK_TYPE_MESSAGE_TYPE);
-}
-
-static VALUE
-rg_set_message_type(VALUE self, VALUE type)
-{
-    gtk_info_bar_set_message_type(_SELF(self),
-                                  RVAL2GENUM(type, GTK_TYPE_MESSAGE_TYPE));
-    return self;
-}
-
 static VALUE
 rg_set_default_response(VALUE self, VALUE response_id)
 {
@@ -77,7 +62,7 @@ static VALUE
 rg_add_action_widget(VALUE self, VALUE widget, VALUE response_id)
 {
     gtk_info_bar_add_action_widget(_SELF(self),
-                                   GTK_WIDGET(RVAL2GOBJ(widget)), 
+                                   GTK_WIDGET(RVAL2GOBJ(widget)),
                                    RVAL2GENUM(response_id, GTK_TYPE_RESPONSE_TYPE));
     return self;
 }
@@ -91,7 +76,7 @@ rg_add_button(VALUE self, VALUE button_text, VALUE response_id)
     } else {
         name = RVAL2CSTR(button_text);
     }
-    return GOBJ2RVAL(gtk_info_bar_add_button(_SELF(self), name, 
+    return GOBJ2RVAL(gtk_info_bar_add_button(_SELF(self), name,
                                              RVAL2GENUM(response_id, GTK_TYPE_RESPONSE_TYPE)));
 }
 
@@ -119,7 +104,7 @@ rg_response(VALUE self, VALUE response_id)
 }
 #endif
 
-void 
+void
 Init_gtk_infobar(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,18,0)
@@ -130,10 +115,6 @@ Init_gtk_infobar(VALUE mGtk)
     RG_DEF_ALIAS("action_area", "get_action_area");
     RG_DEF_METHOD(get_content_area, 0);
     RG_DEF_ALIAS("content_area", "get_content_area");
-    RG_DEF_METHOD(get_message_type, 0);
-    RG_DEF_ALIAS("message_type", "get_message_type");
-    RG_DEF_METHOD(set_message_type, 1);
-    G_DEF_SETTER(RG_TARGET_NAMESPACE, "message_type");
     RG_DEF_METHOD(set_default_response, 1);
     RG_DEF_METHOD(add_action_widget, 2);
     RG_DEF_METHOD(add_button, 2);
@@ -144,4 +125,3 @@ Init_gtk_infobar(VALUE mGtk)
     RG_DEF_METHOD(response, 1);
 #endif
 }
-

data/ext/gtk2/rbgtkwidget.c

@@ -190,7 +190,7 @@ rg_remove_accelerator(VALUE self, VALUE accel, VALUE key, VALUE mod)
 static VALUE
 rg_set_accel_path(VALUE self, VALUE accel_path, VALUE accel_group)
 {
-    gtk_widget_set_accel_path(_SELF(self), RVAL2CSTR(accel_path), 
+    gtk_widget_set_accel_path(_SELF(self), RVAL2CSTR(accel_path),
                               GTK_ACCEL_GROUP(RVAL2GOBJ(accel_group)));
     return self;
 }
@@ -253,7 +253,7 @@ rg_set_state(VALUE self, VALUE state)
 static VALUE
 rg_set_parent_window(VALUE self, VALUE parent_window)
 {
-    gtk_widget_set_parent_window(_SELF(self), 
+    gtk_widget_set_parent_window(_SELF(self),
                                  GDK_WINDOW(RVAL2GOBJ(parent_window)));
     return self;
 }
@@ -526,7 +526,7 @@ rg_modify_base(VALUE self, VALUE state, VALUE color)
 static VALUE
 rg_modify_font(VALUE self, VALUE font_desc)
 {
-    gtk_widget_modify_font(_SELF(self), 
+    gtk_widget_modify_font(_SELF(self),
                            (PangoFontDescription*)RVAL2BOXED(font_desc, PANGO_TYPE_FONT_DESCRIPTION));
     return self;
 }
@@ -535,7 +535,7 @@ rg_modify_font(VALUE self, VALUE font_desc)
 static VALUE
 rg_modify_cursor(VALUE self, VALUE primary, VALUE seconday)
 {
-    gtk_widget_modify_cursor(_SELF(self), 
+    gtk_widget_modify_cursor(_SELF(self),
                              RVAL2BOXED(primary, GDK_TYPE_COLOR),
                              RVAL2BOXED(seconday, GDK_TYPE_COLOR));
     return self;
@@ -667,10 +667,10 @@ rg_s_install_style_property(VALUE self, VALUE spec)
     if (rb_block_given_p()){
         VALUE func = rb_block_proc();
         rb_hash_aset(style_prop_func_table, spec, func);
-        gtk_widget_class_install_style_property_parser(gclass, pspec, 
+        gtk_widget_class_install_style_property_parser(gclass, pspec,
                                                        (GtkRcPropertyParser)rc_property_parser);
     } else {
-        gtk_widget_class_install_style_property(gclass, pspec); 
+        gtk_widget_class_install_style_property(gclass, pspec);
     }
     return self;
 }
@@ -732,8 +732,8 @@ rg_s_style_properties(int argc, VALUE *argv, VALUE self)
 static VALUE
 rg_region_intersect(VALUE self, VALUE region)
 {
-    return BOXED2RVAL(gtk_widget_region_intersect(_SELF(self), 
-                                                  (GdkRegion*)RVAL2BOXED(region, GDK_TYPE_REGION)), 
+    return BOXED2RVAL(gtk_widget_region_intersect(_SELF(self),
+                                                  (GdkRegion*)RVAL2BOXED(region, GDK_TYPE_REGION)),
                       GDK_TYPE_REGION);
 }
 
@@ -949,11 +949,13 @@ rg_composited_p(VALUE self)
     return CBOOL2RVAL(gtk_widget_is_composited(_SELF(self)));
 }
 
+#if !GTK_CHECK_VERSION(2, 14, 0)
 static VALUE
 rg_window(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->window);
 }
+#endif
 
 static VALUE
 rg_set_window(VALUE self, VALUE window)
@@ -1013,7 +1015,7 @@ rg_set_requisition(VALUE self, VALUE w, VALUE h)
     GtkRequisition *r = &(_SELF(self)->requisition);
     r->width  = NUM2INT(w);
     r->height = NUM2INT(h);
-    return self;    
+    return self;
 }
 
 static VALUE
@@ -1032,7 +1034,7 @@ static VALUE
 widget_signal_size_request(G_GNUC_UNUSED guint num, const GValue *values)
 {
     GtkRequisition* req = (GtkRequisition*)g_value_get_boxed(&values[1]);
-    return rb_ary_new3(2, GVAL2RVAL(&values[0]), 
+    return rb_ary_new3(2, GVAL2RVAL(&values[0]),
                        rb_ary_new3(2, INT2NUM(req->width), INT2NUM(req->height)));
 }
 static VALUE
@@ -1042,7 +1044,7 @@ widget_signal_size_allocate(G_GNUC_UNUSED guint num, const GValue *values)
     return rb_ary_new3(2, GVAL2RVAL(&values[0]), BOXED2RVAL(alloc, GTK_TYPE_ALLOCATION));
 }
 
-void 
+void
 Init_gtk_widget(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_WIDGET, "Widget", mGtk);
@@ -1161,7 +1163,9 @@ Init_gtk_widget(VALUE mGtk)
 #endif
     RG_DEF_METHOD(action, 0);
     RG_DEF_METHOD_P(composited, 0);
+#if !GTK_CHECK_VERSION(2, 14, 0)
     RG_DEF_METHOD(window, 0);
+#endif
     RG_DEF_METHOD(set_window, 1);
     RG_DEF_METHOD(allocation, 0);
     RG_DEF_METHOD(set_allocation, 4);
@@ -1173,7 +1177,7 @@ Init_gtk_widget(VALUE mGtk)
     rb_define_method(RG_TARGET_NAMESPACE, "toplevel?",  widget_TOPLEVEL, 0);
     rb_define_method(RG_TARGET_NAMESPACE, "no_window?", widget_NO_WINDOW, 0);
     rb_define_method(RG_TARGET_NAMESPACE, "realized?",  widget_REALIZED, 0);
-    rb_define_method(RG_TARGET_NAMESPACE, "mapped?",    widget_MAPPED, 0); 
+    rb_define_method(RG_TARGET_NAMESPACE, "mapped?",    widget_MAPPED, 0);
     rb_define_method(RG_TARGET_NAMESPACE, "drawable?",  widget_DRAWABLE, 0);
     rb_define_method(RG_TARGET_NAMESPACE, "parent_sensitive?", widget_PARENT_SENSITIVE, 0);
     /* This method's name avoid to sensitive? of a property variables. */

data/test/test_gdk_event.rb

@@ -1,11 +1,23 @@
 class TestGdkEvent < Test::Unit::TestCase
   include GtkTestUtils
 
-  def test_motion_request
-    only_gtk_version(2, 12, 0)
-    motion = Gdk::EventMotion.new
-    assert_nothing_raised do
-      motion.request
+  class TestMotion < self
+    def test_request
+      only_gtk_version(2, 12, 0)
+      motion = Gdk::EventMotion.new
+      assert_nothing_raised do
+        motion.request
+      end
+    end
+  end
+
+  class TestButton < self
+    def setup
+      @button = Gdk::EventButton.new(:button_press)
+    end
+
+    def test_window
+      assert_nil(@button.window)
     end
   end
 end

data/test/test_gdk_window.rb

@@ -26,4 +26,12 @@ class TestGdkWindow < Test::Unit::TestCase
       @window.startup_id = nil
     end
   end
+
+  def test_cursor_accessors
+    only_gtk_version(2, 18, 0)
+    arrow_type = Gdk::Cursor::Type::ARROW
+    cursor = Gdk::Cursor.new(arrow_type)
+    @window.cursor = cursor
+    assert_kind_of(Gdk::Cursor, @window.cursor)
+  end
 end

data/test/test_gtk_infobar.rb

@@ -0,0 +1,29 @@
+# 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 TestGtkInfoBar < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def setup
+    @infobar = Gtk::InfoBar.new
+  end
+
+  def test_message_type_accessors
+    type_error = Gtk::MessageType::ERROR
+    @infobar.message_type = type_error
+    assert_equal(type_error, @infobar.message_type)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk2
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atk
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 description: Ruby/GTK2 is a Ruby binding of GTK+-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -523,6 +523,7 @@ files:
 - test/test_gtk_entry.rb
 - test/test_gtk_icon_theme.rb
 - test/test_gtk_image.rb
+- test/test_gtk_infobar.rb
 - test/test_gtk_list_store.rb
 - test/test_gtk_menu_item.rb
 - test/test_gtk_rc_style.rb