gtk2 0.90.2-x86-mingw32 → 0.90.3-x86-mingw32

data/ChangeLog

@@ -1,3 +1,57 @@
+2010-10-17  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/rbgdkcairo.c: move GDK and cairo related code from
+	Ruby/GdkPixbuf2.
+	Patch by Andrea Dallera. Thanks!!!
+
+	* ext/gtk2/rbgtkitemfactory.c (ifact_initialize): Use NUM2ULONG()
+	instead of NUM2UINT() because GType is unsigned long.
+	"[ruby-gnome2-devel-en] Problem with rbgtkitemfactory.c on 64bit
+	platforms"
+	Reported by Steve Wills. Thanks!!!
+
+2010-10-12  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/gtk2/rbgtkitemfactory.c (ifact_initialize): fix wrong GType
+	conversion type.
+	"[ruby-gnome2-devel-en] Problem with rbgtkitemfactory.c on 64bit
+	platforms"
+	Reported by Grant McLean and Steve Wills. Thanks!!!
+
+	* ext/gtk2/extconf.rb: cleanup.
+
+	* ext/gtk2/extconf.rb: keep backward compatibility around GDK key
+	symbols introduced at GTK+ 2.20.
+	"[ruby-gnome2-devel-en] Constants names change in Gdk::KeyVal"
+	Patch by Vincent Carmona. Thanks!!!
+
+2010-10-08  Guillaume Cottenceau
+
+	* fix some uses of rb_str_new* and StringValuePtr to use
+	encoding-aware Strings
+
+2010-10-08  Guillaume Cottenceau
+
+	* RVAL2CSTR2 is deprecated, replace with RVAL2CSTR_ACCEPT_NIL
+
+	* CSTR2RVAL2 is deprecated, replace with CSTR2RVAL_FREE
+
+2010-10-07  Guillaume Cottenceau
+
+	* ext/gtk2/rbgtkfilechooser.c: move functions to handle filename
+	String to/from rg2 manipulations to glib2, to use them in any rg2
+	submodules
+
+2010-10-04  Guillaume Cottenceau
+
+	* ext/gtk2/rbgtkfilechooser.c: correctly handle filenames
+	to/from rg2 with ruby 1.9 String supporting encodings (in
+	particular, they are not necessarily specified in UTF-8)
+
+2010-09-29  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile: fix dependencies.
+
 2010-09-25  Kouhei Sutou  <kou@cozmixng.org>
 
 	* ext/gtk2/extconf.rb: ensure adding built source to targets.

data/Rakefile

@@ -39,9 +39,11 @@ spec = Gem::Specification.new do |s|
   s.version = version
   s.platform = Gem::Platform::RUBY
   s.add_dependency("cairo", ">= 1.10.0")
-  s.add_dependency("glib2", "= #{version}")
-  s.add_dependency("pango", "= #{version}")
-  s.add_dependency("atk", "= #{version}")
+  compatible_version = version.split(/\./)[0, 3].join(".")
+  s.add_dependency("glib2", ">= #{compatible_version}")
+  s.add_dependency("pango", ">= #{compatible_version}")
+  s.add_dependency("gdk_pixbuf2", ">= #{compatible_version}")
+  s.add_dependency("atk", "= #{compatible_version}")
   s.extensions = FileList["ext/#{package_name}/extconf.rb"]
   s.require_paths = ["lib"]
   s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
@@ -71,6 +73,10 @@ namespace :win32 do
   task :download do
     $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
     require 'gnome2-win32-binary-downloader'
-    GNOME2Win32BinaryDownloader.download(:packages => ["gtk"])
+    packages = ["glib", "atk", "gdk-pixbuf", "pango", "gtk+"]
+    dependencies = ["gettext-runtime", "zlib", "freetype", "expat",
+                    "fontconfig", "cairo", "libpng"]
+    GNOME2Win32BinaryDownloader.download(:packages => packages,
+                                         :dependencies => dependencies)
   end
 end

data/ext/gtk2/depend

@@ -6,5 +6,7 @@ install-so:
 	$(INSTALL_DATA) $(srcdir)/rbgtkmacros.h $(RUBYARCHDIR)
 
 install:
-	$(MAKEDIRS) $(libdir)/pkgconfig
-	$(INSTALL_DATA) ruby-gtk2.pc $(libdir)/pkgconfig
+	if test -n "$(pkgconfigdir)"; then			\
+	  $(MAKEDIRS) $(pkgconfigdir);				\
+	  $(INSTALL_DATA) ruby-gtk2.pc $(pkgconfigdir);		\
+	fi

data/ext/gtk2/extconf.rb

@@ -12,7 +12,7 @@ top_build_dir = Pathname(".").parent.parent.parent.expand_path
 mkmf_gnome2_dir = top_dir + "glib2" + 'lib'
 version_suffix = ""
 unless mkmf_gnome2_dir.exist?
-  if /(-\d+\.\d+\.\d+)\z/ =~ base_dir.basename.to_s
+  if /(-\d+\.\d+\.\d+)(?:\.\d+)?\z/ =~ base_dir.basename.to_s
     version_suffix = $1
     mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + 'lib'
   end
@@ -39,17 +39,17 @@ target = PKGConfig.variable(package_id, "target")
 $defs << "-DRUBY_GTK2_TARGET=\\\"#{target}\\\""
 STDOUT.print(target, "\n")
 
-gdkincl = nil
-tmpincl = $CFLAGS.gsub(/-D\w+/, '').split(/-I/) + ['/usr/include']
-tmpincl.each do |i|
-  i.strip!
+gdk_include_path = nil
+include_paths = $CFLAGS.gsub(/-D\w+/, '').split(/-I/) + ['/usr/include']
+include_paths.each do |path|
+  path.strip!
 
-  if FileTest.exist?(i + "/gdk/gdkkeysyms.h")
-    gdkincl = i + "/gdk"
+  if FileTest.exist?("#{path}/gdk/gdkkeysyms.h")
+    gdk_include_path = Pathname("#{path}/gdk")
     break
   end
 end
-raise "can't find gdkkeysyms.h" if gdkincl.nil?
+raise "can't find gdkkeysyms.h" if gdk_include_path.nil?
 
 gtk_header = "gtk/gtk.h"
 have_func('gtk_plug_get_type', gtk_header)
@@ -183,12 +183,17 @@ rbgtkinits_c_path.open("w") do |rbgtkinits_c|
 end
 
 rbgdkkeysyms_h_path = Pathname("rbgdkkeysyms.h")
+gdkkeysyms_h_paths = []
+gdkkeysyms_h_paths << gdk_include_path + "gdkkeysyms.h"
+gdkkeysyms_h_paths << gdk_include_path + "gdkkeysyms-compat.h"
 rbgdkkeysyms_h_path.open("w") do |rbgdkkeysyms_h|
-  gdkkeysyms_h_path = Pathname(gdkincl) + "gdkkeysyms.h"
-  gdkkeysyms_h_path.each_line do |line|
-    if /^#define\s+(GDK_\w+)\s+\d+/ =~ line
-      define_line = "rb_define_const(mGdkKeyval, \"#{$1}\", INT2FIX(#{$1}));"
-      rbgdkkeysyms_h.puts(define_line)
+  gdkkeysyms_h_paths.each do |path|
+    next unless path.exist?
+    path.each_line do |line|
+      if /^#define\s+(GDK_\w+)\s+\d+/ =~ line
+        define_line = "rb_define_const(mGdkKeyval, \"#{$1}\", INT2FIX(#{$1}));"
+        rbgdkkeysyms_h.puts(define_line)
+      end
     end
   end
 end

data/ext/gtk2/rbgdkatom.c

@@ -85,7 +85,7 @@ static VALUE
 gdkatom_name(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gdk_atom_name(_SELF(self)));
+    return CSTR2RVAL_FREE(gdk_atom_name(_SELF(self)));
 }
 
 static VALUE

data/ext/gtk2/rbgdkcairo.c

@@ -13,10 +13,12 @@
 
 #if GTK_CHECK_VERSION(2,8,0) && defined(HAVE_RB_CAIRO_H)
 #  define CAIRO_AVAILABLE 1
+#else
+#  define CAIRO_AVAILABLE 0
 #endif
 
-#ifdef CAIRO_AVAILABLE
-
+#if CAIRO_AVAILABLE
+#include <gdk/gdkcairo.h>
 #include <rb_cairo.h>
 
 #define _SELF(self) RVAL2CRCONTEXT(self)
@@ -30,13 +32,20 @@ gdkdraw_cairo_set_source_color(self, color)
     return self;
 }
 
-/* Move to gdkpixbuf/rbgdk-pixbuf.c
-void gdk_cairo_set_source_pixbuf (cairo_t      *cr,
-				  GdkPixbuf    *pixbuf,
-				  double        pixbuf_x,
-				  double        pixbuf_y);
-*/
+static VALUE
+gdkdraw_cairo_set_source_pixbuf(int argc, VALUE *argv, VALUE self)
+{
+    VALUE pixbuf, pixbuf_x, pixbuf_y;
 
+    rb_scan_args(argc, argv, "12", &pixbuf, &pixbuf_x, &pixbuf_y);
+
+    gdk_cairo_set_source_pixbuf(_SELF(self),
+                                GDK_PIXBUF(RVAL2GOBJ(pixbuf)),
+                                NIL_P(pixbuf_x) ? 0 : NUM2DBL(pixbuf_x),
+                                NIL_P(pixbuf_y) ? 0 : NUM2DBL(pixbuf_y));
+    rb_cairo_check_status(cairo_status(_SELF(self)));
+    return self;
+}
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
@@ -86,6 +95,8 @@ Init_gtk_gdk_cairo()
 #if CAIRO_AVAILABLE
     rb_define_method(rb_cCairo_Context, "set_source_gdk_color",
                      gdkdraw_cairo_set_source_color, 1);
+    rb_define_method(rb_cCairo_Context, "set_source_pixbuf",
+                     gdkdraw_cairo_set_source_pixbuf, -1);
 #if GTK_CHECK_VERSION(2,10,0)
     rb_define_method(rb_cCairo_Context, "set_source_pixmap", gdkdraw_cairo_set_source_pixmap, 3);
 #endif

data/ext/gtk2/rbgdkproperty.c

@@ -283,7 +283,7 @@ gdkprop_get(argc, argv, self)
     switch(rfmt){
       case 8:
       default:
-        ret = rb_str_new((const char*)rdat, rlen);
+        ret = RBG_STRING_SET_UTF8_ENCODING(rb_str_new((const char*)rdat, rlen));
         break;
         
       case 16:

data/ext/gtk2/rbgtkclipboard.c

@@ -182,7 +182,6 @@ clipboard_text_received_func(GtkClipboard *clipboard, const gchar *text,
     VALUE vtext = Qnil;
     if (text) {
         vtext = CSTR2RVAL(text);
-        RBG_STRING_SET_UTF8_ENCODING(vtext);
     }
 
     rb_funcall((VALUE)func, id_call, 2, CLIPBOARD2RVAL(clipboard), vtext);

data/ext/gtk2/rbgtkcombobox.c

@@ -153,7 +153,7 @@ static VALUE
 combobox_get_active_text(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_combo_box_get_active_text(_SELF(self)));
+    return CSTR2RVAL_FREE(gtk_combo_box_get_active_text(_SELF(self)));
 }
 
 static VALUE

data/ext/gtk2/rbgtkcontainer.c

@@ -220,8 +220,7 @@ cont_child_get_property(self, child, prop_name)
     if (SYMBOL_P(prop_name)) {
         name = rb_id2name(SYM2ID(prop_name));
     } else {
-        StringValue(prop_name);
-        name = StringValuePtr(prop_name);
+        name = RVAL2CSTR(prop_name);
     }
 
     pspec = gtk_container_class_find_child_property(
@@ -266,8 +265,7 @@ cont_child_set_property(self, child, prop_name, val)
     if (SYMBOL_P(prop_name)) {
         name = rb_id2name(SYM2ID(prop_name));
     } else {
-        StringValue(prop_name);
-        name = StringValuePtr(prop_name);
+        name = RVAL2CSTR(prop_name);
     }
 
     pspec = gtk_container_class_find_child_property(
@@ -410,8 +408,7 @@ cont_s_child_property(self, property_name)
     if (SYMBOL_P(property_name)) {
         name = rb_id2name(SYM2ID(property_name));
     } else {
-        StringValue(property_name);
-        name = StringValuePtr(property_name);
+        name = RVAL2CSTR(property_name);
     }
 
     oclass = g_type_class_ref(CLASS2GTYPE(self));

data/ext/gtk2/rbgtkeditable.c

@@ -61,7 +61,7 @@ static VALUE
 edit_get_chars(self, start, end)
     VALUE self, start, end;
 {
-    return CSTR2RVAL2(
+    return CSTR2RVAL_FREE(
     	gtk_editable_get_chars(GTK_EDITABLE(RVAL2GOBJ(self)),   /* check s */
 			       NUM2INT(start), NUM2INT(end)));  /* check start,end */
 }

data/ext/gtk2/rbgtkfilechooser.c

@@ -23,13 +23,12 @@
 #endif
 
 static VALUE
-gslist2ary_free(list)
-    GSList* list;
+gslist2ary_free(GSList* list)
 {
     GSList* l;
     VALUE ary = rb_ary_new();
     for (l = list; l != NULL; l = g_slist_next(l)) {
-        rb_ary_push(ary, CSTR2RVAL2(l->data));
+        rb_ary_push(ary, CSTR2RVAL_FREE(l->data));
     }
     g_slist_free(list);
     return ary;
@@ -71,6 +70,7 @@ static VALUE
 fcho_set_current_name(self, name)
     VALUE self, name;
 {
+    /* doc says the awaited string is UTF-8, so use RVAL2CSTR */
     gtk_file_chooser_set_current_name(_SELF(self), RVAL2CSTR(name));
     return self;
 }
@@ -79,14 +79,14 @@ static VALUE
 fcho_get_filename(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_file_chooser_get_filename(_SELF(self)));
+    return CSTRFILENAME2RVAL_FREE(gtk_file_chooser_get_filename(_SELF(self)));
 }
 
 static VALUE
 fcho_set_filename(self, name)
     VALUE self, name;
 {
-    gboolean ret = gtk_file_chooser_set_filename(_SELF(self), RVAL2CSTR(name));
+    gboolean ret = gtk_file_chooser_set_filename(_SELF(self), RVAL2CSTRFILENAME(name));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set filename");
     return self;
 }
@@ -95,14 +95,14 @@ static VALUE
 fcho_select_filename(self, filename)
     VALUE self, filename;
 {
-    return CBOOL2RVAL(gtk_file_chooser_select_filename(_SELF(self), RVAL2CSTR(filename)));
+    return CBOOL2RVAL(gtk_file_chooser_select_filename(_SELF(self), RVAL2CSTRFILENAME(filename)));
 }
 
 static VALUE
 fcho_unselect_filename(self, filename)
     VALUE self, filename;
 {
-    gtk_file_chooser_unselect_filename(_SELF(self), RVAL2CSTR(filename));
+    gtk_file_chooser_unselect_filename(_SELF(self), RVAL2CSTRFILENAME(filename));
     return self;
 }
 
@@ -126,7 +126,7 @@ static VALUE
 fcho_get_filenames(self)
     VALUE self;
 {
-    return gslist2ary_free(gtk_file_chooser_get_filenames(_SELF(self)));
+    return CSTRFILENAMEARRAY2RVAL_FREE(gtk_file_chooser_get_filenames(_SELF(self)));
 }
 
 static VALUE
@@ -142,14 +142,14 @@ static VALUE
 fcho_get_current_folder(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_file_chooser_get_current_folder(_SELF(self)));
+    return CSTR2RVAL_FREE(gtk_file_chooser_get_current_folder(_SELF(self)));
 }
 
 static VALUE
 fcho_get_uri(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_file_chooser_get_uri(_SELF(self)));
+    return CSTR2RVAL_FREE(gtk_file_chooser_get_uri(_SELF(self)));
 }
 
 static VALUE
@@ -196,7 +196,7 @@ static VALUE
 fcho_get_current_folder_uri(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_file_chooser_get_current_folder_uri(_SELF(self)));
+    return CSTR2RVAL_FREE(gtk_file_chooser_get_current_folder_uri(_SELF(self)));
 }
 
 /* They are defined as properties.
@@ -212,14 +212,14 @@ static VALUE
 fcho_get_preview_filename(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_file_chooser_get_preview_filename(_SELF(self)));
+    return CSTR2RVAL_FREE(gtk_file_chooser_get_preview_filename(_SELF(self)));
 }
 
 static VALUE
 fcho_get_preview_uri(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_file_chooser_get_preview_uri(_SELF(self)));
+    return CSTR2RVAL_FREE(gtk_file_chooser_get_preview_uri(_SELF(self)));
 }
 
 /* They are defined as properties.
@@ -261,7 +261,7 @@ fcho_add_shortcut_folder(self, folder)
     VALUE self, folder;
 {
     GError *error = NULL;
-    if (! gtk_file_chooser_add_shortcut_folder(_SELF(self), RVAL2CSTR(folder), &error))
+    if (! gtk_file_chooser_add_shortcut_folder(_SELF(self), RVAL2CSTRFILENAME(folder), &error))
         RAISE_GERROR(error);
     return self;
 }
@@ -271,7 +271,7 @@ fcho_remove_shortcut_folder(self, folder)
     VALUE self, folder;
 {
     GError *error = NULL;
-    if (! gtk_file_chooser_remove_shortcut_folder(_SELF(self), RVAL2CSTR(folder), &error))
+    if (! gtk_file_chooser_remove_shortcut_folder(_SELF(self), RVAL2CSTRFILENAME(folder), &error))
         RAISE_GERROR(error);
     return self;
 }
@@ -280,7 +280,7 @@ static VALUE
 fcho_list_shortcut_folders(self)
     VALUE self;
 {
-    return gslist2ary_free(gtk_file_chooser_list_shortcut_folders(_SELF(self)));
+    return CSTRFILENAMEARRAY2RVAL_FREE(gtk_file_chooser_list_shortcut_folders(_SELF(self)));
 }
 
 
@@ -323,6 +323,7 @@ gboolean    gtk_file_chooser_get_do_overwrite_confirmation
 void 
 Init_gtk_file_chooser()
 {
+
 #if GTK_CHECK_VERSION(2,4,0)
 
     VALUE gFileCho = G_DEF_INTERFACE(GTK_TYPE_FILE_CHOOSER, "FileChooser", mGtk);

data/ext/gtk2/rbgtkicontheme.c

@@ -183,7 +183,7 @@ static VALUE
 it_get_example_icon_name(self)
     VALUE self;
 {
-    return CSTR2RVAL2(gtk_icon_theme_get_example_icon_name(_SELF(self)));
+    return CSTR2RVAL_FREE(gtk_icon_theme_get_example_icon_name(_SELF(self)));
 }
 
 static VALUE

data/ext/gtk2/rbgtkitemfactory.c

@@ -29,7 +29,7 @@ ifact_initialize(self, type, path, accel)
 {
     VALUE obj = rb_eval_string("eval('self', binding)");
     G_RELATIVE(obj, self);
-    RBGTK_INITIALIZE(self, gtk_item_factory_new(FIX2INT(type), RVAL2CSTR(path),
+    RBGTK_INITIALIZE(self, gtk_item_factory_new(NUM2ULONG(type), RVAL2CSTR(path),
                                                 RVAL2ACCEL(accel)));
    
     return Qnil;

data/ext/gtk2/rbgtkpagesetupunixdialog.c

@@ -23,7 +23,7 @@ psud_initialize(int argc, VALUE *argv, VALUE self)
     VALUE title, parent;
 
     rb_scan_args(argc, argv, "02", &title, &parent);
-    dialog = gtk_page_setup_unix_dialog_new(RVAL2CSTR2(title), RVAL2GOBJ(parent));
+    dialog = gtk_page_setup_unix_dialog_new(RVAL2CSTR_ACCEPT_NIL(title), RVAL2GOBJ(parent));
 
     RBGTK_INITIALIZE(self, dialog);
     return Qnil;