gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkitem.c

@@ -1,48 +1,60 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkitem.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:46:23 $
-
-  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 cItem
+
 /*
  * Item
  */
 static VALUE
-item_select(VALUE self)
+rg_select(VALUE self)
 {
     gtk_item_select(GTK_ITEM(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-item_deselect(VALUE self)
+rg_deselect(VALUE self)
 {
     gtk_item_deselect(GTK_ITEM(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-item_toggle(VALUE self)
+rg_toggle(VALUE self)
 {
     gtk_item_toggle(GTK_ITEM(RVAL2GOBJ(self)));
     return self;
 }
 
 void 
-Init_gtk_item()
+Init_gtk_item(VALUE mGtk)
 {
-    VALUE gItem = G_DEF_CLASS(GTK_TYPE_ITEM, "Item", mGtk);
-    rb_define_method(gItem, "select", item_select, 0);
-    rb_define_method(gItem, "deselect", item_deselect, 0);
-    rb_define_method(gItem, "toggle", item_toggle, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ITEM, "Item", mGtk);
+    RG_DEF_METHOD(select, 0);
+    RG_DEF_METHOD(deselect, 0);
+    RG_DEF_METHOD(toggle, 0);
 }

data/ext/gtk2/rbgtkitemfactory.c

@@ -1,20 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkitemfactory.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:00:49 $
-
-  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Hiroshi Igarashi,
-                          dellin,
-                          MUTOH Masao
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Hiroshi Igarashi,
+ *                          dellin,
+ *                          MUTOH Masao
+ *
+ *  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"
 #include <gdk-pixbuf/gdk-pixdata.h>
 
+#define RG_TARGET_NAMESPACE cItemFactory
 #define _SELF(self) (GTK_ITEM_FACTORY(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 #define RVAL2ACCEL(a)  (GTK_ACCEL_GROUP(RVAL2GOBJ(a)))
@@ -23,18 +34,18 @@ static VALUE action_table;
 static guint action_id = 0;
 
 static VALUE
-ifact_initialize(VALUE self, VALUE type, VALUE path, VALUE accel)
+rg_initialize(VALUE self, VALUE type, VALUE path, VALUE accel)
 {
     VALUE obj = rb_eval_string("eval('self', binding)");
     G_RELATIVE(obj, self);
     RBGTK_INITIALIZE(self, gtk_item_factory_new(NUM2ULONG(type), RVAL2CSTR(path),
                                                 RVAL2ACCEL(accel)));
-   
+
     return Qnil;
 }
 
 static VALUE
-ifact_construct(int argc, VALUE *argv, VALUE self)
+rg_construct(int argc, VALUE *argv, VALUE self)
 {
     VALUE type, path, accel;
     GtkItemFactory* ifact = _SELF(self);
@@ -45,9 +56,9 @@ ifact_construct(int argc, VALUE *argv, VALUE self)
                                RVAL2CSTR(path), RVAL2ACCEL(accel));
     return self;
 }
- 
+
 static VALUE
-ifact_s_from_widget(VALUE self, VALUE widget)
+rg_s_from_widget(VALUE self, VALUE widget)
 {
     VALUE obj = GOBJ2RVAL(gtk_item_factory_from_widget(RVAL2WIDGET(widget)));
     G_RELATIVE(obj, self);
@@ -55,13 +66,13 @@ ifact_s_from_widget(VALUE self, VALUE widget)
 }
 
 static VALUE
-ifact_s_path_from_widget(VALUE self, VALUE widget)
+rg_s_path_from_widget(G_GNUC_UNUSED VALUE self, VALUE widget)
 {
     return CSTR2RVAL(gtk_item_factory_path_from_widget(RVAL2WIDGET(widget)));
 }
 
 static VALUE
-ifact_get_item(VALUE self, VALUE path)
+rg_get_item(VALUE self, VALUE path)
 {
     VALUE obj = Qnil;
     GtkWidget* widget = gtk_item_factory_get_item(_SELF(self), RVAL2CSTR(path));
@@ -73,7 +84,7 @@ ifact_get_item(VALUE self, VALUE path)
 }
 
 static VALUE
-ifact_get_widget(VALUE self, VALUE path)
+rg_get_widget(VALUE self, VALUE path)
 {
     VALUE obj = Qnil;
     GtkWidget* widget = gtk_item_factory_get_widget(_SELF(self), RVAL2CSTR(path));
@@ -105,7 +116,7 @@ menuitem_type_check(char *item_type)
 }
 
 static void
-items_exec_callback_wrap(VALUE callback_data, guint action_id, GtkWidget *widget)
+items_exec_callback_wrap(G_GNUC_UNUSED VALUE callback_data, guint action_id, GtkWidget *widget)
 {
     VALUE iter, data;
     VALUE action = rb_hash_aref(action_table, UINT2NUM(action_id));
@@ -125,7 +136,7 @@ create_factory_entry(GtkItemFactoryEntry *entry, VALUE self, VALUE path, VALUE i
     entry->path = (gchar *)(NIL_P(path) ? NULL : RVAL2CSTR(path));
     entry->item_type = (gchar *)(NIL_P(item_type) ? "<Branch>" : RVAL2CSTR(item_type));
     entry->accelerator = (gchar *)(NIL_P(accel) ? NULL : RVAL2CSTR(accel));
-        
+
     if (menuitem_type_check(entry->item_type) == 0) {
         entry->callback = NULL;
     } else {
@@ -158,7 +169,7 @@ create_factory_entry(GtkItemFactoryEntry *entry, VALUE self, VALUE path, VALUE i
 }  
 
 static VALUE
-ifact_create_item(int argc, VALUE *argv, VALUE self)
+rg_create_item(int argc, VALUE *argv, VALUE self)
 {
     VALUE path, type, accel, extdata, data, func;
     GtkItemFactoryEntry *entry;
@@ -169,14 +180,14 @@ ifact_create_item(int argc, VALUE *argv, VALUE self)
     func = rb_rescue((VALUE(*)())rb_block_proc, 0, NULL, 0);
 
     create_factory_entry(entry, self, path, type, accel, extdata, func, data);
-    
+
     gtk_item_factory_create_item(_SELF(self), entry, (gpointer)self, 1);
     g_free(entry);
     return self;
 }
 
 static VALUE
-ifact_create_items(VALUE self, VALUE ary)
+rg_create_items(VALUE self, VALUE ary)
 {
     VALUE entry, path, accel, type, func, data, extdata;
     GtkItemFactoryEntry *entries;
@@ -205,9 +216,8 @@ ifact_create_items(VALUE self, VALUE ary)
     return self;
 }
 
-
 static VALUE
-ifact_delete_item(VALUE self, VALUE path)
+rg_delete_item(VALUE self, VALUE path)
 {
     gtk_item_factory_delete_item(_SELF(self), RVAL2CSTR(path));
     return self;
@@ -223,7 +233,7 @@ void        gtk_item_factory_delete_entries (GtkItemFactory *ifactory,
 */
 
 static VALUE
-ifact_popup(VALUE self, VALUE x, VALUE y, VALUE mouse_button, VALUE time)
+rg_popup(VALUE self, VALUE x, VALUE y, VALUE mouse_button, VALUE time)
 {
     gtk_item_factory_popup(_SELF(self), NUM2UINT(x), NUM2UINT(y), NUM2UINT(mouse_button),
                            NUM2UINT(time));
@@ -250,42 +260,40 @@ void        gtk_item_factory_set_translate_func
                                              GtkDestroyNotify notify);
 */
 
-
 void 
-Init_gtk_itemfactory()
+Init_gtk_itemfactory(VALUE mGtk)
 {
-    VALUE gItemFactory = G_DEF_CLASS(GTK_TYPE_ITEM_FACTORY, "ItemFactory", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ITEM_FACTORY, "ItemFactory", mGtk);
 
-    rb_define_singleton_method(gItemFactory, "from_widget", ifact_s_from_widget, 1);
-    rb_define_singleton_method(gItemFactory, "path_from_widget", ifact_s_path_from_widget, 1);
+    RG_DEF_SMETHOD(from_widget, 1);
+    RG_DEF_SMETHOD(path_from_widget, 1);
 
-    rb_define_method(gItemFactory, "initialize", ifact_initialize, 3);
-    rb_define_method(gItemFactory, "construct", ifact_construct, -1);
-    rb_define_method(gItemFactory, "get_item", ifact_get_item, 1);
-    rb_define_method(gItemFactory, "get_widget", ifact_get_widget, 1);
-    rb_define_method(gItemFactory, "create_item", ifact_create_item, -1);
-    rb_define_method(gItemFactory, "create_items", ifact_create_items, 1);
-    rb_define_method(gItemFactory, "delete_item", ifact_delete_item, 1);
-    rb_define_method(gItemFactory, "popup", ifact_popup, 4);
+    RG_DEF_METHOD(initialize, 3);
+    RG_DEF_METHOD(construct, -1);
+    RG_DEF_METHOD(get_item, 1);
+    RG_DEF_METHOD(get_widget, 1);
+    RG_DEF_METHOD(create_item, -1);
+    RG_DEF_METHOD(create_items, 1);
+    RG_DEF_METHOD(delete_item, 1);
+    RG_DEF_METHOD(popup, 4);
 
     /* Ruby/GTK Original constants */
-    rb_define_const(gItemFactory, "TYPE_MENU_BAR", INT2FIX(GTK_TYPE_MENU_BAR));
-    rb_define_const(gItemFactory, "TYPE_MENU", INT2FIX(GTK_TYPE_MENU));
-    rb_define_const(gItemFactory, "TYPE_OPTION_MENU", INT2FIX(GTK_TYPE_OPTION_MENU));
-
-    rb_define_const(gItemFactory, "TITLE", CSTR2RVAL("<Title>"));
-    rb_define_const(gItemFactory, "ITEM", CSTR2RVAL("<Item>"));
-    rb_define_const(gItemFactory, "CHECK_ITEM", CSTR2RVAL("<CheckItem>"));
-    rb_define_const(gItemFactory, "TOGGLE_ITEM", CSTR2RVAL("<ToggleItem>"));
-    rb_define_const(gItemFactory, "RADIO_ITEM", CSTR2RVAL("<RadioItem>"));
-    rb_define_const(gItemFactory, "IMAGE_ITEM", CSTR2RVAL("<ImageItem>"));
-    rb_define_const(gItemFactory, "STOCK_ITEM", CSTR2RVAL("<StockItem>"));
-    rb_define_const(gItemFactory, "SEPARATOR", CSTR2RVAL("<Separator>"));
-    rb_define_const(gItemFactory, "BRANCH", CSTR2RVAL("<Branch>"));
-    rb_define_const(gItemFactory, "LAST_BRANCH", CSTR2RVAL("<LastBranch>"));
-    rb_define_const(gItemFactory, "TEAROFF", CSTR2RVAL("<Tearoff>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_MENU_BAR", INT2FIX(GTK_TYPE_MENU_BAR));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_MENU", INT2FIX(GTK_TYPE_MENU));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_OPTION_MENU", INT2FIX(GTK_TYPE_OPTION_MENU));
+
+    rb_define_const(RG_TARGET_NAMESPACE, "TITLE", CSTR2RVAL("<Title>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "ITEM", CSTR2RVAL("<Item>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "CHECK_ITEM", CSTR2RVAL("<CheckItem>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "TOGGLE_ITEM", CSTR2RVAL("<ToggleItem>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "RADIO_ITEM", CSTR2RVAL("<RadioItem>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "IMAGE_ITEM", CSTR2RVAL("<ImageItem>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "STOCK_ITEM", CSTR2RVAL("<StockItem>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "SEPARATOR", CSTR2RVAL("<Separator>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "BRANCH", CSTR2RVAL("<Branch>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "LAST_BRANCH", CSTR2RVAL("<LastBranch>"));
+    rb_define_const(RG_TARGET_NAMESPACE, "TEAROFF", CSTR2RVAL("<Tearoff>"));
 
     action_table = rb_hash_new();
     rb_global_variable(&action_table);
 }
-

data/ext/gtk2/rbgtklabel.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtklabel.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 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 cLabel
 #define _SELF(s) (GTK_LABEL(RVAL2GOBJ(s)))
 
 static VALUE
-label_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, with_mnemonic;
     GtkWidget* widget = NULL;
@@ -34,14 +45,14 @@ label_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-label_set_text_only(VALUE self, VALUE text)
+rg_operator_label_set_text_only(VALUE self, VALUE text)
 {
     gtk_label_set_text(_SELF(self), RVAL2CSTR(text));
     return text;
 }
 
 static VALUE
-label_set_text(int argc, VALUE *argv, VALUE self)
+rg_set_text(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, with_mnemonic;
 
@@ -55,14 +66,14 @@ label_set_text(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-label_set_markup_only(VALUE self, VALUE text)
+rg_operator_label_set_markup_only(VALUE self, VALUE text)
 {
     gtk_label_set_markup(_SELF(self), RVAL2CSTR(text));
     return text;
 }
 
 static VALUE
-label_set_markup(int argc, VALUE *argv, VALUE self)
+rg_set_markup(int argc, VALUE *argv, VALUE self)
 {
     VALUE str, with_mnemonic;
     rb_scan_args(argc, argv, "02", &str, &with_mnemonic);
@@ -76,7 +87,7 @@ label_set_markup(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-label_get_layout_offsets(VALUE self)
+rg_layout_offsets(VALUE self)
 { 
     gint x, y;
     gtk_label_get_layout_offsets(_SELF(self), &x, &y);
@@ -84,67 +95,45 @@ label_get_layout_offsets(VALUE self)
 }
 
 static VALUE
-label_get_text(VALUE self)
+rg_text(VALUE self)
 {
     return CSTR2RVAL(gtk_label_get_text(_SELF(self)));
 }
 
 static VALUE
-label_select_region(VALUE self, VALUE start_offset, VALUE end_offset)
+rg_select_region(VALUE self, VALUE start_offset, VALUE end_offset)
 {
     gtk_label_select_region(_SELF(self), NUM2INT(start_offset), NUM2INT(end_offset));
     return self;
 }
 
 static VALUE
-label_get_layout(VALUE self)
+rg_layout(VALUE self)
 {
     return GOBJ2RVAL(gtk_label_get_layout(_SELF(self)));
 }
 
 static VALUE
-label_get_selection_bounds(VALUE self)
+rg_selection_bounds(VALUE self)
 {
     gint start, end;
     gboolean ret = gtk_label_get_selection_bounds(_SELF(self), &start, &end);
     return ret ? rb_ary_new3(2, INT2NUM(start), INT2NUM(end)) : Qnil;
 }
 
-/* Defined as Properties
-gdouble     gtk_label_get_angle             (GtkLabel *label);
-void        gtk_label_set_angle             (GtkLabel *label,
-                                             gdouble angle);
-void        gtk_label_set_ellipsize         (GtkLabel *label,
-                                             PangoEllipsizeMode mode);
-PangoEllipsizeMode gtk_label_get_ellipsize  (GtkLabel *label);
-void        gtk_label_set_max_width_chars   (GtkLabel *label,
-                                             gint n_chars);
-gint        gtk_label_get_max_width_chars   (GtkLabel *label);
-
-gboolean    gtk_label_get_single_line_mode  (GtkLabel *label);
-void        gtk_label_set_single_line_mode  (GtkLabel *label,
-                                             gboolean single_line_mode);
-void        gtk_label_set_width_chars       (GtkLabel *label,
-                                             gint n_chars);
-gint        gtk_label_get_width_chars       (GtkLabel *label);
-void        gtk_label_set_line_wrap_mode    (GtkLabel *label,
-                                             PangoWrapMode wrap_mode);
-PangoWrapMode gtk_label_get_line_wrap_mode  (GtkLabel *label);
-*/
-
 void 
-Init_gtk_label()
+Init_gtk_label(VALUE mGtk)
 {
-    VALUE gLabel = G_DEF_CLASS(GTK_TYPE_LABEL, "Label", mGtk);
-
-    rb_define_method(gLabel, "initialize", label_initialize, -1);
-    rb_define_method(gLabel, "text", label_get_text, 0);
-    rb_define_method(gLabel, "set_text", label_set_text, -1);
-    rb_define_method(gLabel, "text=", label_set_text_only, 1);
-    rb_define_method(gLabel, "set_markup", label_set_markup, -1);
-    rb_define_method(gLabel, "markup=", label_set_markup_only, 1);
-    rb_define_method(gLabel, "layout_offsets", label_get_layout_offsets, 0);
-    rb_define_method(gLabel, "select_region", label_select_region, 2);
-    rb_define_method(gLabel, "layout", label_get_layout, 0);
-    rb_define_method(gLabel, "selection_bounds", label_get_selection_bounds, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_LABEL, "Label", mGtk);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(text, 0);
+    RG_DEF_METHOD(set_text, -1);
+    RG_DEF_METHOD_OPERATOR("text=", label_set_text_only, 1);
+    RG_DEF_METHOD(set_markup, -1);
+    RG_DEF_METHOD_OPERATOR("markup=", label_set_markup_only, 1);
+    RG_DEF_METHOD(layout_offsets, 0);
+    RG_DEF_METHOD(select_region, 2);
+    RG_DEF_METHOD(layout, 0);
+    RG_DEF_METHOD(selection_bounds, 0);
 }