gtk2 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1783a7ac794f49ce1efb7192ddeaf54f4c6caad4
+  data.tar.gz: 139bc23e2a95289fb327f0e2af296e9a765e3b0b
+SHA512:
+  metadata.gz: fb2edfc129d3c155aee1965a1a48079b517244bcff272bd56cf38df10b62aff5422324722499d6f6c5d66e7422fd11e7b55c41a9da12d58dde3d1a504e094987
+  data.tar.gz: 1a60b2424ea1ead0144f56b04d0ab776882fbfe19530c946a1b608eeac0de11a0542b50f80821ce0ea95303fbe7a4f9aacf24f3f464e595633e35f4ab8d90828

data/README

@@ -1,6 +1,6 @@
 Ruby/GTK2
 =========
-Ruby/GTK2 is a Ruby binding of GTK+-2.0.x.
+Ruby/GTK2 is a Ruby binding of GTK+-2.10.x.
 
 Requirements
 ------------
@@ -12,7 +12,7 @@ Requirements
 
 Install
 -------
-   0. install ruby-1.6.x or later, GTK+-2.0.x, Ruby/GLib2, Ruby/Pango 
+   0. install ruby-1.9.x or later, GTK+-2.10.x, Ruby/GLib2, Ruby/Pango
       (and cairo/rcairo).
    1. ruby extconf.rb
       (To use rcairo on Win32, set CAIRO_PATH as a environment variable first)

data/Rakefile

@@ -17,24 +17,26 @@ package = GNOME2Package.new do |_package|
       :name => "gtk+",
       :download_site => :gnome,
       :label => "gtk+",
-      :version => "2.24.18",
+      :version => "2.24.22",
       :compression_method => "xz",
       :windows => {
         :configure_args => [],
         :need_autoreconf => true,
         :patches => [
-          "gtk+-2.24.14-add-missing-exeext.diff",
+          "gtk+-2.24.22-add-missing-exeext.diff",
         ],
+        :built_file => "bin/libgtk-win32-2.0-0.dll",
       },
     },
     {
       :name => "hicolor-icon-theme",
       :download_base_url => "http://icon-theme.freedesktop.org/releases",
       :label => "gtk-hi-color-icon-theme",
-      :version => "0.12",
+      :version => "0.13",
       :windows => {
         :configure_args => [],
         :build_concurrently => false,
+        :built_file => "share/icons/hicolor/index.theme",
       }
     },
   ]

data/ext/gtk2/extconf.rb

@@ -54,11 +54,14 @@ rcairo_source_dir_names.each do |rcairo_source_dir_name|
     break
   end
 end
-check_cairo(rcairo_options)
+
+unless check_cairo(rcairo_options)
+  exit(false)
+end
 
 setup_win32(module_name, base_dir)
 
-unless required_pkg_config_package(package_id,
+unless required_pkg_config_package([package_id, 2, 10, 0],
                                    :debian => "libgtk2.0-dev",
                                    :redhat => "gtk2-devel",
                                    :homebrew => "gtk+",

data/ext/gtk2/global.h

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2013 Ruby-GNOME2 Project Team
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
  *                          Hiroshi Igarashi
@@ -47,12 +46,6 @@
 #  define G_VALUE_INIT { 0, { { 0 } } }
 #endif
 
-#if GTK_CHECK_VERSION(2,8,0) && defined(HAVE_RB_CAIRO_H)
-#  define CAIRO_AVAILABLE 1
-#else
-#  define CAIRO_AVAILABLE 0
-#endif
-
 extern ID id_relative_callbacks;
 extern ID id_call;
 extern VALUE treeiter_set_value_table;

data/ext/gtk2/rbgdk.c

@@ -171,13 +171,11 @@ rbgdk_rval2gdkpixbufglist(VALUE value)
     return args.result;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_m_display_arg_name(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gdk_get_display_arg_name());
 }
-#endif
 
 static VALUE
 rg_m_set_locale(G_GNUC_UNUSED VALUE self)
@@ -192,7 +190,6 @@ rg_m_set_sm_client_id(VALUE self, VALUE id)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_m_notify_startup_complete(int argc, VALUE *argv, VALUE self)
 {
@@ -213,7 +210,6 @@ rg_m_notify_startup_complete(int argc, VALUE *argv, VALUE self)
     }
     return self;
 }
-#endif
 
 static VALUE
 rg_m_program_class(G_GNUC_UNUSED VALUE self)
@@ -262,11 +258,8 @@ rbgdk_x_io_error(Display *display)
     const gchar* disp;
     const gchar* error;
 
-#if GTK_CHECK_VERSION(2,2,0)
     disp = display ? DisplayString(display) : gdk_get_display_arg_name();
-#else
-    disp = DisplayString(display);
-#endif
+
     if (! disp)
         disp = "(none)";
 
@@ -462,11 +455,7 @@ rg_m_target(G_GNUC_UNUSED VALUE self)
 static VALUE
 rg_m_cairo_available_p(G_GNUC_UNUSED VALUE self)
 {
-#if CAIRO_AVAILABLE
     return Qtrue;
-#else
-    return Qfalse;
-#endif
 }
 
 void
@@ -474,14 +463,10 @@ Init_gtk_gdk(void)
 {
     RG_TARGET_NAMESPACE = rb_define_module("Gdk");
 
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_MODFUNC(display_arg_name, 0);
-#endif
     RG_DEF_MODFUNC(set_locale, 0);
     RG_DEF_MODFUNC(set_sm_client_id, 1);
-#if GTK_CHECK_VERSION(2, 2, 0)
     RG_DEF_MODFUNC(notify_startup_complete, -1);
-#endif
     RG_DEF_MODFUNC(program_class, 0);
     RG_DEF_MODFUNC(set_program_class, 1);
     RG_DEF_MODFUNC(display, 0);

data/ext/gtk2/rbgdkcairo.c

@@ -21,7 +21,6 @@
 
 #include "global.h"
 
-#if CAIRO_AVAILABLE
 #include <gdk/gdkcairo.h>
 #include <rb_cairo.h>
 
@@ -51,7 +50,6 @@ rg_set_source_pixbuf(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_set_source_pixmap(VALUE self, VALUE pixmap, VALUE pixmap_x, VALUE pixmap_y)
 {
@@ -60,7 +58,6 @@ rg_set_source_pixmap(VALUE self, VALUE pixmap, VALUE pixmap_x, VALUE pixmap_y)
     rb_cairo_check_status(cairo_status(_SELF(self)));
     return self;
 }
-#endif
 
 static VALUE
 rg_gdk_rectangle(VALUE self, VALUE rectangle)
@@ -78,20 +75,15 @@ rg_gdk_region(VALUE self, VALUE region)
     rb_cairo_check_status(cairo_status(_SELF(self)));
     return self;
 }
-#endif
 
 void
 Init_gtk_gdk_cairo(void)
 {
-#if CAIRO_AVAILABLE
     RG_DEF_METHOD(set_source_gdk_color, 1);
     RG_DEF_METHOD(set_source_pixbuf, -1);
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD(set_source_pixmap, 3);
-#endif
     RG_DEF_METHOD(gdk_rectangle, 1);
     RG_DEF_METHOD(gdk_region, 1);
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
-#endif
 }

data/ext/gtk2/rbgdkcolormap.c

@@ -86,13 +86,11 @@ rg_visual(VALUE self)
     return GOBJ2RVAL(gdk_colormap_get_visual(_SELF(self)));
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_screen(VALUE self)
 {
     return GOBJ2RVAL(gdk_colormap_get_screen(_SELF(self)));
 }
-#endif
 
 static VALUE
 rg_colors(VALUE self)
@@ -132,8 +130,6 @@ Init_gtk_gdk_colormap(VALUE mGdk)
     RG_DEF_METHOD(free_color, 1);
     RG_DEF_METHOD(query_color, 1);
     RG_DEF_METHOD(visual, 0);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(screen, 0);
-#endif
     RG_DEF_METHOD(colors, 0);
 }

data/ext/gtk2/rbgdkcursor.c

@@ -33,30 +33,20 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
         rb_scan_args(argc, argv, "10", &type);
         cursor = gdk_cursor_new(RVAL2GENUM(type, GDK_TYPE_CURSOR_TYPE));
     } else if (argc == 2) {
-#if GTK_CHECK_VERSION(2,2,0)
         VALUE display, type_or_name;
         rb_scan_args(argc, argv, "20", &display, &type_or_name);
-#if GTK_CHECK_VERSION(2,8,0)
         if (TYPE(type_or_name) == T_STRING)
             cursor = gdk_cursor_new_from_name(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
                                               RVAL2CSTR(type_or_name));
         else
-#endif
             cursor = gdk_cursor_new_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)), 
                                                 RVAL2GENUM(type_or_name, GDK_TYPE_CURSOR_TYPE));
-#else
-        rb_raise(rb_eRuntimeError, "Gdk::Cursor.new(display, cursor_type) has been supported since GTK+-2.2.");
-#endif
     } else if (argc == 4) {
-#if GTK_CHECK_VERSION(2,4,0)
         VALUE display, pixbuf, x, y;
         rb_scan_args(argc, argv, "40", &display, &pixbuf, &x, &y);
         cursor = gdk_cursor_new_from_pixbuf(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)), 
                                             GDK_PIXBUF(RVAL2GOBJ(pixbuf)), 
                                             NUM2INT(x), NUM2INT(y));
-#else
-        rb_raise(rb_eRuntimeError, "Gdk::Cursor.new(pixbuf) has been supported since GTK+-2.4.");
-#endif
     } else if (argc == 6) {
         VALUE pixmap, mask, fg, bg, x, y;
         rb_scan_args(argc, argv, "60", &pixmap, &mask, &fg, &bg, &x, &y);
@@ -71,13 +61,11 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
 static VALUE
 rg_display(VALUE self)
 {
     return GOBJ2RVAL(gdk_cursor_get_display((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR)));
 }
-#endif
 
 static VALUE
 rg_pixmap_p(VALUE self)
@@ -92,13 +80,11 @@ rg_cursor_type(VALUE self)
     return GENUM2RVAL(((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR))->type, GDK_TYPE_CURSOR_TYPE);
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_image(VALUE self)
 {
     return GOBJ2RVAL(gdk_cursor_get_image((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR)));
 }
-#endif
 
 void
 Init_gtk_gdk_cursor(VALUE mGdk)
@@ -106,14 +92,10 @@ Init_gtk_gdk_cursor(VALUE mGdk)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_CURSOR, "Cursor", mGdk);
 
     RG_DEF_METHOD(initialize, -1);
-#if GTK_CHECK_VERSION(2,2,0)
     RG_DEF_METHOD(display, 0);
-#endif
     RG_DEF_METHOD_P(pixmap, 0);
     RG_DEF_METHOD(cursor_type, 0);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(image, 0);
-#endif
 
     G_DEF_CLASS(GDK_TYPE_CURSOR_TYPE, "Type", RG_TARGET_NAMESPACE);
     G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_CURSOR_TYPE, "GDK_");

data/ext/gtk2/rbgdkdisplay.c

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2013 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
@@ -21,8 +20,6 @@
 
 #include "global.h"
 
-#if GTK_CHECK_VERSION(2,2,0)
-
 #define RG_TARGET_NAMESPACE cDisplay
 #define _SELF(i) GDK_DISPLAY_OBJECT(RVAL2GOBJ(i))
 
@@ -38,7 +35,7 @@ rg_s_open(G_GNUC_UNUSED VALUE self, VALUE display_name)
 {
     GdkDisplay* gdisplay = gdk_display_open(RVAL2CSTR(display_name));
     if (! gdisplay) {
-        rb_raise(rb_eRuntimeError, "The display `%s' could not be opened.", 
+        rb_raise(rb_eRuntimeError, "The display `%s' could not be opened.",
                  RVAL2CSTR(display_name));
     } else {
         VALUE display;
@@ -122,14 +119,12 @@ rg_sync(VALUE self)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_flush(VALUE self)
 {
     gdk_display_flush(_SELF(self));
     return self;
 }
-#endif
 
 static VALUE
 rg_devices(VALUE self)
@@ -160,8 +155,8 @@ rg_put_event(VALUE self, VALUE event)
 static GdkFilterReturn
 filter_func(GdkXEvent xevent, GdkEvent event, gpointer func)
 {
-    return GENUM2RVAL(rb_funcall((VALUE)func, id_call, 2, 
-                                 ????, GEV2RVAL(event)), 
+    return GENUM2RVAL(rb_funcall((VALUE)func, id_call, 2,
+                                 ????, GEV2RVAL(event)),
                       GDK_TYPE_FILTER_RETURN);
 }
 
@@ -219,7 +214,6 @@ rg_closed_p(VALUE self)
     return CBOOL2RVAL(_SELF(self)->closed);
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_button_x(VALUE self)
 {
@@ -248,7 +242,6 @@ rg_double_click_distance(VALUE self)
 {
     return UINT2NUM(_SELF(self)->double_click_distance);
 }
-#endif
 
 static VALUE
 rg_pointer(VALUE self)
@@ -278,7 +271,6 @@ GdkDisplayPointerHooks* gdk_display_set_pointer_hooks
                                              const GdkDisplayPointerHooks *new_hooks);
  */
 
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_supports_cursor_color_p(VALUE self)
 {
@@ -310,9 +302,7 @@ rg_default_group(VALUE self)
 {
     return GOBJ2RVAL(gdk_display_get_default_group(_SELF(self)));
 }
-#endif
 
-#if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 rg_supports_selection_notification_p(VALUE self)
 {
@@ -322,7 +312,7 @@ rg_supports_selection_notification_p(VALUE self)
 static VALUE
 rg_request_selection_notification_p(VALUE self, VALUE selection)
 {
-    return CBOOL2RVAL(gdk_display_request_selection_notification(_SELF(self), 
+    return CBOOL2RVAL(gdk_display_request_selection_notification(_SELF(self),
                                                                  RVAL2ATOM(selection)));
 }
 
@@ -347,7 +337,6 @@ rg_store_clipboard(VALUE self, VALUE rbclipboard_window, VALUE rbtime_, VALUE rb
 
     return self;
 }
-#endif
 
 static VALUE
 rg_core_pointer(VALUE self)
@@ -355,14 +344,12 @@ rg_core_pointer(VALUE self)
     return GOBJ2RVAL(gdk_display_get_core_pointer(_SELF(self)));
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 static VALUE
 rg_warp_pointer(VALUE self, VALUE screen, VALUE x, VALUE y)
 {
     gdk_display_warp_pointer(_SELF(self), RVAL2GOBJ(screen), NUM2INT(x), NUM2INT(y));
     return self;
 }
-#endif
 
 #ifdef GDK_WINDOWING_X11
 static VALUE
@@ -377,7 +364,6 @@ rg_ungrab(VALUE self)
     gdk_x11_display_ungrab(_SELF(self));
     return self;
 }
-#if GTK_CHECK_VERSION(2,4,0)
 static VALUE
 rg_register_standard_event_type(VALUE self, VALUE event_base, VALUE n_events)
 {
@@ -385,8 +371,7 @@ rg_register_standard_event_type(VALUE self, VALUE event_base, VALUE n_events)
                                          NUM2INT(event_base), NUM2INT(n_events));
     return self;
 }
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
+
 static VALUE
 rg_user_time(VALUE self)
 {
@@ -466,10 +451,6 @@ rg_startup_notification_id(VALUE self)
 }
 #  endif
 
-#endif
-#endif
-
-#if GTK_CHECK_VERSION(2,10,0)
 static VALUE
 rg_supports_shapes_p(VALUE self)
 {
@@ -481,7 +462,6 @@ rg_supports_input_shapes_p(VALUE self)
 {
     return CBOOL2RVAL(gdk_display_supports_input_shapes(_SELF(self)));
 }
-#endif
 
 #if GTK_CHECK_VERSION(2, 12, 0)
 static VALUE
@@ -498,10 +478,9 @@ rg_trigger_tooltip_query(VALUE self)
 }
 #endif
 
-void 
+void
 Init_gtk_gdk_display(VALUE mGdk)
 {
-#if GTK_CHECK_VERSION(2,2,0)
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_DISPLAY, "Display", mGdk);
 
     RG_DEF_SMETHOD(open, 1);
@@ -518,9 +497,7 @@ Init_gtk_gdk_display(VALUE mGdk)
 
     RG_DEF_METHOD(beep, 0);
     RG_DEF_METHOD(sync, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(flush, 0);
-#endif
     RG_DEF_METHOD(close, 0);
 
     RG_DEF_METHOD(devices, 0);
@@ -533,43 +510,31 @@ Init_gtk_gdk_display(VALUE mGdk)
     RG_DEF_METHOD(button_window, 0);
     RG_DEF_METHOD(button_number, 0);
     RG_DEF_METHOD_P(closed, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(button_x, 0);
     RG_DEF_METHOD(button_y, 0);
     RG_DEF_METHOD(set_double_click_distance, 1);
     RG_DEF_METHOD(double_click_distance, 0);
-#endif
     RG_DEF_METHOD(pointer, 0);
     RG_DEF_METHOD(window_at_pointer, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD_P(supports_cursor_color, 0);
     RG_DEF_METHOD_P(supports_cursor_alpha, 0);
     RG_DEF_METHOD(default_cursor_size, 0);
     RG_DEF_METHOD(maximal_cursor_size, 0);
     RG_DEF_METHOD(default_group, 0);
-#endif
-#if GTK_CHECK_VERSION(2,6,0)
     RG_DEF_METHOD_P(supports_selection_notification, 0);
     RG_DEF_METHOD_P(request_selection_notification, 1);
     RG_DEF_METHOD_P(supports_clipboard_persistence, 0);
     RG_DEF_METHOD(store_clipboard, 3);
-#endif
     RG_DEF_METHOD(core_pointer, 0);
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(warp_pointer, 3);
-#endif
 
     G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #ifdef GDK_WINDOWING_X11
     RG_DEF_METHOD(grab, 0);
     RG_DEF_METHOD(ungrab, 0);
-#if GTK_CHECK_VERSION(2,4,0)
     RG_DEF_METHOD(register_standard_event_type, 2);
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
     RG_DEF_METHOD(user_time, 0);
     RG_DEF_METHOD(set_cursor_theme, 2);
-#endif
 #  if GTK_CHECK_VERSION(2, 12, 0)
 /*
     RG_DEF_METHOD(broadcast_startup_message, -1);
@@ -578,12 +543,9 @@ Init_gtk_gdk_display(VALUE mGdk)
 #  endif
     G_DEF_CLASS3("GdkDisplayX11", "DisplayX11", mGdk);
 #endif
-#endif
 
-#if GTK_CHECK_VERSION(2,10,0)
     RG_DEF_METHOD_P(supports_shapes, 0);
     RG_DEF_METHOD_P(supports_input_shapes, 0);
-#endif
 #if GTK_CHECK_VERSION(2, 12, 0)
     RG_DEF_METHOD_P(supports_composite, 0);
     RG_DEF_METHOD(trigger_tooltip_query, 0);