gtk2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/gtk2/rbgtkcheckbutton.c

@@ -1,21 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcheckbutton.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cCheckButton
+
 static VALUE
-cbtn_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline;
     GtkWidget *widget;
@@ -44,9 +56,9 @@ cbtn_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 void 
-Init_gtk_check_button()
+Init_gtk_check_button(VALUE mGtk)
 {
-    VALUE gCButton = G_DEF_CLASS(GTK_TYPE_CHECK_BUTTON, "CheckButton", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CHECK_BUTTON, "CheckButton", mGtk);
 
-    rb_define_method(gCButton, "initialize", cbtn_initialize, -1);
+    RG_DEF_METHOD(initialize, -1);
 }

data/ext/gtk2/rbgtkcheckmenuitem.c

@@ -1,21 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcheckmenuitem.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cCheckMenuItem
+
 static VALUE
-cmitem_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline;
     GtkWidget *widget = NULL;
@@ -28,7 +40,7 @@ cmitem_initialize(int argc, VALUE *argv, VALUE self)
         }
     }
     else {
-	widget = gtk_check_menu_item_new();
+        widget = gtk_check_menu_item_new();
     }
 
     RBGTK_INITIALIZE(self, widget);
@@ -36,17 +48,17 @@ cmitem_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-cmitem_toggled(VALUE self)
+rg_toggled(VALUE self)
 {
     gtk_check_menu_item_toggled(GTK_CHECK_MENU_ITEM(RVAL2GOBJ(self)));
     return self;
 }
 
 void 
-Init_gtk_check_menu_item()
+Init_gtk_check_menu_item(VALUE mGtk)
 {
-    VALUE gCMenuItem = G_DEF_CLASS(GTK_TYPE_CHECK_MENU_ITEM, "CheckMenuItem", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CHECK_MENU_ITEM, "CheckMenuItem", mGtk);
 
-    rb_define_method(gCMenuItem, "initialize", cmitem_initialize, -1);
-    rb_define_method(gCMenuItem, "toggled", cmitem_toggled, 0);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(toggled, 0);
 }

data/ext/gtk2/rbgtkclipboard.c

@@ -1,16 +1,28 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkclipboard.c -
- 
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:09 $
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004,2006 Ruby-GNOME2 Project
+ *  Copyright (C) 2002,2003 OGASAWARA, Takeshi
+ *
+ *  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
+ */
 
-  Copyright (C) 2004,2006 Ruby-GNOME2 Project
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cClipboard
 #define _SELF(s) RVAL2CLIPBOARD(s)
 
 #ifndef GTK_TYPE_CLIPBOARD
@@ -46,7 +58,7 @@ rbgtk_make_clipboard(GtkClipboard *gobj)
 #endif
 
 static VALUE
-clipboard_get(int argc, VALUE *argv, VALUE self)
+rg_s_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     GtkClipboard *clipboard;
 
@@ -68,35 +80,68 @@ clipboard_get(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-clipboard_get_display(VALUE self)
+rg_display(VALUE self)
 {
 #if GTK_CHECK_VERSION(2,2,0)
     return GOBJ2RVAL(gtk_clipboard_get_display(_SELF(self)));
 #else
-	 return Qnil;
+    return Qnil;
 #endif
 }
 
 static void
-clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer func)
+clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, G_GNUC_UNUSED guint info, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 2, CLIPBOARD2RVAL(clipboard),
                BOXED2RVAL(selection_data, GTK_TYPE_SELECTION_DATA));
 }
 
+struct clipboard_set_args {
+    VALUE self;
+    VALUE targets;
+    VALUE func;
+};
+
 static VALUE
-clipboard_set(VALUE self, VALUE targets)
-{
-    const GtkTargetEntry* gtargets = (const GtkTargetEntry*)rbgtk_get_target_entry(targets);
-    VALUE func = rb_block_proc();
-    G_RELATIVE(self, func);
-    return CBOOL2RVAL(gtk_clipboard_set_with_data(_SELF(self), 
-                                                  gtargets,
-                                                  RARRAY_LEN(targets),
+clipboard_set_body(VALUE value)
+{
+    struct clipboard_set_args *args = (struct clipboard_set_args *)value;
+    GtkClipboard *clipboard = _SELF(args->self);
+    long n;
+    GtkTargetEntry *targets = RVAL2GTKTARGETENTRIES(args->targets, &n);
+    gboolean result = gtk_clipboard_set_with_data(clipboard,
+                                                  targets,
+                                                  n,
                                                   (GtkClipboardGetFunc)clipboard_get_func,
                                                   (GtkClipboardClearFunc)NULL,
-                                                  (gpointer)func));
+                                                  (gpointer)args->func);
+
+    g_free(targets);
+
+    return CBOOL2RVAL(result);
 }
+
+static G_GNUC_NORETURN VALUE
+clipboard_set_rescue(VALUE value)
+{
+    struct clipboard_set_args *args = (struct clipboard_set_args *)value;
+
+    G_CHILD_REMOVE(args->self, args->func);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static VALUE
+rg_set(VALUE self, VALUE targets)
+{
+    struct clipboard_set_args args = { self, targets, rb_block_proc() };
+
+    G_CHILD_ADD(self, args.func);
+
+    return rb_rescue(clipboard_set_body, (VALUE)&args,
+                     clipboard_set_rescue, (VALUE)&args);
+}
+
 /*
 Do not implement this. Use Gtk::Clipboard#set_with_data instead.
 gboolean    gtk_clipboard_set_with_owner    (GtkClipboard *clipboard,
@@ -107,7 +152,7 @@ gboolean    gtk_clipboard_set_with_owner    (GtkClipboard *clipboard,
                                              GObject *owner);
 
 static VALUE
-clipboard_get_owner(VALUE self)
+rg_owner(VALUE self)
 {
     GObject *gobj;
     gobj = gtk_clipboard_get_owner(_SELF(self));
@@ -116,14 +161,14 @@ clipboard_get_owner(VALUE self)
 */
 
 static VALUE
-clipboard_clear(VALUE self)
+rg_clear(VALUE self)
 {
     gtk_clipboard_clear(_SELF(self));
     return self;
 }
 
 static VALUE
-clipboard_set_text(VALUE self, VALUE text)
+rg_set_text(VALUE self, VALUE text)
 {
     StringValue(text);
     gtk_clipboard_set_text(_SELF(self), RVAL2CSTR(text), RSTRING_LEN(text));
@@ -132,7 +177,7 @@ clipboard_set_text(VALUE self, VALUE text)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-clipboard_set_image(VALUE self, VALUE pixbuf)
+rg_set_image(VALUE self, VALUE pixbuf)
 {
     gtk_clipboard_set_image(_SELF(self), GDK_PIXBUF(RVAL2GOBJ(pixbuf)));
     return self;
@@ -147,7 +192,7 @@ clipboard_received_func(GtkClipboard *clipboard, GtkSelectionData *selection_dat
 }
 
 static VALUE
-clipboard_request_contents(VALUE self, VALUE target)
+rg_request_contents(VALUE self, VALUE target)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -170,7 +215,7 @@ clipboard_text_received_func(GtkClipboard *clipboard, const gchar *text,
 }
 
 static VALUE
-clipboard_request_text(VALUE self)
+rg_request_text(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -189,7 +234,7 @@ clipboard_image_received_func(GtkClipboard *clipboard, GdkPixbuf *pixbuf, gpoint
 }
 
 static VALUE
-clipboard_request_image(VALUE self)
+rg_request_image(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -209,12 +254,12 @@ clipboard_target_received_func(GtkClipboard *clipboard, GdkAtom *atoms, gint n_a
     for (i = 0; i < n_atoms; i++){
         rb_ary_push(ary, BOXED2RVAL(atoms[i], GDK_TYPE_ATOM));
     }
-        
+
     rb_funcall((VALUE)func, id_call, 2, CLIPBOARD2RVAL(clipboard), ary);
 }
 
 static VALUE
-clipboard_request_targets(VALUE self)
+rg_request_targets(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -235,7 +280,7 @@ clipboard_rich_text_received_func(GtkClipboard *clipboard, GdkAtom format, const
 }
 
 static VALUE
-clipboard_request_rich_text(VALUE self, VALUE buffer)
+rg_request_rich_text(VALUE self, VALUE buffer)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -248,7 +293,7 @@ clipboard_request_rich_text(VALUE self, VALUE buffer)
 #endif
 
 static VALUE
-clipboard_wait_for_contents(VALUE self, VALUE target)
+rg_wait_for_contents(VALUE self, VALUE target)
 {
     return BOXED2RVAL(gtk_clipboard_wait_for_contents(
                           _SELF(self), 
@@ -257,7 +302,7 @@ clipboard_wait_for_contents(VALUE self, VALUE target)
 }
 
 static VALUE
-clipboard_wait_for_text(VALUE self)
+rg_wait_for_text(VALUE self)
 {
     gchar *str;
     str = gtk_clipboard_wait_for_text(_SELF(self));
@@ -266,7 +311,7 @@ clipboard_wait_for_text(VALUE self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-clipboard_wait_for_image(VALUE self)
+rg_wait_for_image(VALUE self)
 {
     GdkPixbuf* pixbuf = gtk_clipboard_wait_for_image(_SELF(self));
     return GOBJ2RVAL(pixbuf);
@@ -275,7 +320,7 @@ clipboard_wait_for_image(VALUE self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-clipboard_wait_for_rich_text(VALUE self, VALUE buffer)
+rg_wait_for_rich_text(VALUE self, VALUE buffer)
 {
     GdkAtom format;
     gsize length;
@@ -289,19 +334,19 @@ clipboard_wait_for_rich_text(VALUE self, VALUE buffer)
     } else {
         return rb_assoc_new(Qnil, BOXED2RVAL(format, GDK_TYPE_ATOM));
     }
-    
+
 }
 #endif
 
 static VALUE
-clipboard_wait_is_text_available(VALUE self)
+rg_wait_is_text_available_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_text_available(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-clipboard_wait_is_image_available(VALUE self)
+rg_wait_is_image_available_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_image_available(_SELF(self)));
 }
@@ -309,7 +354,7 @@ clipboard_wait_is_image_available(VALUE self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-clipboard_wait_is_rich_text_available(VALUE self, VALUE buffer)
+rg_wait_is_rich_text_available_p(VALUE self, VALUE buffer)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_rich_text_available(_SELF(self), GTK_TEXT_BUFFER(RVAL2GOBJ(buffer))));
 }
@@ -317,7 +362,7 @@ clipboard_wait_is_rich_text_available(VALUE self, VALUE buffer)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-clipboard_wait_for_targets(VALUE self)
+rg_wait_for_targets(VALUE self)
 {
     gint i;
     VALUE ary = Qnil;
@@ -345,83 +390,84 @@ clipboard_wait_for_targets(VALUE self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-clipboard_wait_is_target_available(VALUE self, VALUE target)
+rg_wait_is_target_available_p(VALUE self, VALUE target)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_target_available(_SELF(self), RVAL2ATOM(target)));
 }
 
 static VALUE
-clipboard_set_can_store(VALUE self, VALUE targets)
+rg_set_can_store(VALUE self, VALUE rbtargets)
 {
-    gint n_targets = 0;
-    GtkTargetEntry* entries = (GtkTargetEntry*)NULL;
+    GtkClipboard *clipboard = _SELF(self);
+    long n = 0;
+    GtkTargetEntry *targets = RVAL2GTKTARGETENTRIES_ACCEPT_NIL(rbtargets, &n);
+
+    gtk_clipboard_set_can_store(clipboard, targets, n);
+
+    g_free(targets);
 
-    if (!NIL_P(targets)){
-        n_targets = RARRAY_LEN(targets);
-        entries = rbgtk_get_target_entry(targets);
-    }
-    gtk_clipboard_set_can_store(_SELF(self), entries, n_targets);
     return self;
 }
 
 static VALUE
-clipboard_store(VALUE self)
+rg_store(VALUE self)
 {
     gtk_clipboard_store(_SELF(self));
+
     return self;
 }
 #endif
 
 void 
-Init_gtk_clipboard()
+Init_gtk_clipboard(VALUE mGtk)
 {
-    VALUE gClipboard = G_DEF_CLASS(GTK_TYPE_CLIPBOARD, "Clipboard", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CLIPBOARD, "Clipboard", mGtk);
 
-    rb_define_singleton_method(gClipboard, "get", clipboard_get, -1);
-    rb_define_method(gClipboard, "display", clipboard_get_display, 0);
-    rb_define_method(gClipboard, "set", clipboard_set, 1);
+    RG_DEF_SMETHOD(get, -1);
+    RG_DEF_METHOD(display, 0);
+    RG_DEF_METHOD(set, 1);
 /*
-  rb_define_method(gClipboard, "owner", clipboard_get_owner, 0);
+  RG_DEF_METHOD(owner, 0);
 */
-    rb_define_method(gClipboard, "clear", clipboard_clear, 0);
-    rb_define_method(gClipboard, "set_text", clipboard_set_text, 1);
+    RG_DEF_METHOD(clear, 0);
+    RG_DEF_METHOD(set_text, 1);
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gClipboard, "set_image", clipboard_set_image, 1);
+    RG_DEF_METHOD(set_image, 1);
 #endif
-    rb_define_method(gClipboard, "request_contents", clipboard_request_contents, 1);
-    rb_define_method(gClipboard, "request_text", clipboard_request_text, 0);
+    RG_DEF_METHOD(request_contents, 1);
+    RG_DEF_METHOD(request_text, 0);
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gClipboard, "request_image", clipboard_request_image, 0);
+    RG_DEF_METHOD(request_image, 0);
 #endif
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gClipboard, "request_targets", clipboard_request_targets, 0);
+    RG_DEF_METHOD(request_targets, 0);
 #endif
 #if GTK_CHECK_VERSION(2,10,0)
-    rb_define_method(gClipboard, "request_rich_text", clipboard_request_rich_text, 1);
+    RG_DEF_METHOD(request_rich_text, 1);
 #endif
-    rb_define_method(gClipboard, "wait_for_contents", clipboard_wait_for_contents, 1);
-    rb_define_method(gClipboard, "wait_for_text", clipboard_wait_for_text, 0);
+    RG_DEF_METHOD(wait_for_contents, 1);
+    RG_DEF_METHOD(wait_for_text, 0);
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gClipboard, "wait_for_image", clipboard_wait_for_image, 0);
+    RG_DEF_METHOD(wait_for_image, 0);
 #endif
 #if GTK_CHECK_VERSION(2,10,0)
-    rb_define_method(gClipboard, "wait_for_rich_text", clipboard_wait_for_rich_text, 1);
+    RG_DEF_METHOD(wait_for_rich_text, 1);
 #endif
-    rb_define_method(gClipboard, "wait_is_text_available?", clipboard_wait_is_text_available, 0);
+    RG_DEF_METHOD_P(wait_is_text_available, 0);
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gClipboard, "wait_is_image_available?", clipboard_wait_is_image_available, 0);
+    RG_DEF_METHOD_P(wait_is_image_available, 0);
 #endif
 #if GTK_CHECK_VERSION(2,10,0)
-    rb_define_method(gClipboard, "wait_is_rich_text_available?", clipboard_wait_is_rich_text_available, 1);
+    RG_DEF_METHOD_P(wait_is_rich_text_available, 1);
 #endif
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gClipboard, "wait_for_targets", clipboard_wait_for_targets, 0);
+    RG_DEF_METHOD(wait_for_targets, 0);
 #endif
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gClipboard, "wait_is_target_available?", clipboard_wait_is_target_available, 1);
-    rb_define_method(gClipboard, "set_can_store", clipboard_set_can_store, 1);
-    rb_define_method(gClipboard, "store", clipboard_store, 0);
+    RG_DEF_METHOD_P(wait_is_target_available, 1);
+    RG_DEF_METHOD(set_can_store, 1);
+    RG_DEF_METHOD(store, 0);
 #endif
 
-    G_DEF_SETTERS(gClipboard);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }