gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkdrawingarea.c

@@ -1,30 +1,42 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkdrawingarea.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 cDrawingArea
+
 static VALUE
-darea_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_drawing_area_new());
     return Qnil;
 }
 
 void 
-Init_gtk_drawing_area()
+Init_gtk_drawing_area(VALUE mGtk)
 {
-    VALUE gDrawArea = G_DEF_CLASS(GTK_TYPE_DRAWING_AREA, "DrawingArea", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_DRAWING_AREA, "DrawingArea", mGtk);
 
-    rb_define_method(gDrawArea, "initialize", darea_initialize, 0);
+    RG_DEF_METHOD(initialize, 0);
 }

data/ext/gtk2/rbgtkeditable.c

@@ -1,29 +1,41 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkeditable.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 mEditable
+
 static VALUE
-edit_sel_region(VALUE self, VALUE start, VALUE end)
+rg_select_region(VALUE self, VALUE start, VALUE end)
 {
     gtk_editable_select_region(GTK_EDITABLE(RVAL2GOBJ(self)),
-			       NUM2INT(start), NUM2INT(end));
+                               NUM2INT(start), NUM2INT(end));
     return self;
 }
 
 static VALUE
-edit_get_sel_bounds(VALUE self)
+rg_selection_bounds(VALUE self)
 {
     gint start, end;
     gboolean ret;
@@ -33,107 +45,107 @@ edit_get_sel_bounds(VALUE self)
 }
 
 static VALUE
-edit_insert_text(VALUE self, VALUE new_text, VALUE pos)
+rg_insert_text(VALUE self, VALUE new_text, VALUE pos)
 {
     gint p = NUM2INT(pos);
 
     StringValue(new_text);
     gtk_editable_insert_text(GTK_EDITABLE(RVAL2GOBJ(self)),
-			     RSTRING_PTR(new_text),
-			     RSTRING_LEN(new_text),
-			     &p);
+                             RSTRING_PTR(new_text),
+                             RSTRING_LEN(new_text),
+                             &p);
     return INT2NUM(p);
 }
 
 static VALUE
-edit_delete_text(VALUE self, VALUE start, VALUE end)
+rg_delete_text(VALUE self, VALUE start, VALUE end)
 {
     gtk_editable_delete_text(GTK_EDITABLE(RVAL2GOBJ(self)),
-			     NUM2INT(start), NUM2INT(end));
+                             NUM2INT(start), NUM2INT(end));
     return self;
 }
 
 static VALUE
-edit_get_chars(VALUE self, VALUE start, VALUE end)
+rg_get_chars(VALUE self, VALUE start, VALUE end)
 {
     return CSTR2RVAL_FREE(
-    	gtk_editable_get_chars(GTK_EDITABLE(RVAL2GOBJ(self)),   /* check s */
-			       NUM2INT(start), NUM2INT(end)));  /* check start,end */
+            gtk_editable_get_chars(GTK_EDITABLE(RVAL2GOBJ(self)),   /* check s */
+                                   NUM2INT(start), NUM2INT(end)));  /* check start,end */
 }
 
 static VALUE
-edit_delete_selection(VALUE self)
+rg_delete_selection(VALUE self)
 {
     gtk_editable_delete_selection(GTK_EDITABLE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-edit_get_position(VALUE self)
+rg_position(VALUE self)
 {
     return INT2NUM(gtk_editable_get_position(GTK_EDITABLE(RVAL2GOBJ(self))));
 }
 
 static VALUE
-edit_set_position(VALUE self, VALUE position)
+rg_set_position(VALUE self, VALUE position)
 {
     gtk_editable_set_position(GTK_EDITABLE(RVAL2GOBJ(self)),
-			      NUM2INT(position));
+                              NUM2INT(position));
     return self;
 }
 
 static VALUE
-edit_set_editable(VALUE self, VALUE editable)
+rg_set_editable(VALUE self, VALUE editable)
 {
     gtk_editable_set_editable(GTK_EDITABLE(RVAL2GOBJ(self)), RVAL2CBOOL(editable));
     return self;
 }
 
 static VALUE
-edit_get_editable(VALUE self)
+rg_editable_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_editable_get_editable(GTK_EDITABLE(RVAL2GOBJ(self))));
 }
 
 static VALUE
-edit_cut_clipboard(VALUE self)
+rg_cut_clipboard(VALUE self)
 {
     gtk_editable_cut_clipboard(GTK_EDITABLE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-edit_copy_clipboard(VALUE self)
+rg_copy_clipboard(VALUE self)
 {
     gtk_editable_copy_clipboard(GTK_EDITABLE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-edit_paste_clipboard(VALUE self)
+rg_paste_clipboard(VALUE self)
 {
     gtk_editable_paste_clipboard(GTK_EDITABLE(RVAL2GOBJ(self)));
     return self;
 }
 
 void 
-Init_gtk_editable()
+Init_gtk_editable(VALUE mGtk)
 {
-    VALUE mEditable = G_DEF_INTERFACE(GTK_TYPE_EDITABLE, "Editable", mGtk);
-
-    rb_define_method(mEditable, "select_region", edit_sel_region, 2);
-    rb_define_method(mEditable, "selection_bounds", edit_get_sel_bounds, 0);
-    rb_define_method(mEditable, "insert_text", edit_insert_text, 2);
-    rb_define_method(mEditable, "delete_text", edit_delete_text, 2);
-    rb_define_method(mEditable, "get_chars", edit_get_chars, 2);
-    rb_define_method(mEditable, "delete_selection", edit_delete_selection, 0);
-    rb_define_method(mEditable, "position", edit_get_position, 0);
-    rb_define_method(mEditable, "set_position", edit_set_position, 1);
-    rb_define_method(mEditable, "set_editable", edit_set_editable, 1);
-    rb_define_method(mEditable, "editable?", edit_get_editable, 0);
-    rb_define_method(mEditable, "copy_clipboard", edit_copy_clipboard, 0);
-    rb_define_method(mEditable, "cut_clipboard", edit_cut_clipboard, 0);
-    rb_define_method(mEditable, "paste_clipboard", edit_paste_clipboard, 0);
-
-    G_DEF_SETTERS(mEditable);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GTK_TYPE_EDITABLE, "Editable", mGtk);
+
+    RG_DEF_METHOD(select_region, 2);
+    RG_DEF_METHOD(selection_bounds, 0);
+    RG_DEF_METHOD(insert_text, 2);
+    RG_DEF_METHOD(delete_text, 2);
+    RG_DEF_METHOD(get_chars, 2);
+    RG_DEF_METHOD(delete_selection, 0);
+    RG_DEF_METHOD(position, 0);
+    RG_DEF_METHOD(set_position, 1);
+    RG_DEF_METHOD(set_editable, 1);
+    RG_DEF_METHOD_P(editable, 0);
+    RG_DEF_METHOD(copy_clipboard, 0);
+    RG_DEF_METHOD(cut_clipboard, 0);
+    RG_DEF_METHOD(paste_clipboard, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkentry.c

@@ -1,36 +1,47 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkentry.c -
-
-  $Author: mutoh $
-  $Date: 2006/10/21 16:58:00 $
-
-  Copyright (C) 2002-2004 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2004 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 cEntry
 #define _SELF(self) (GTK_ENTRY(RVAL2GOBJ(self)))
 
 static VALUE
-entry_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_entry_new());
     return Qnil;
 }
 
 static VALUE
-entry_get_layout(VALUE self)
+rg_layout(VALUE self)
 {
     return GOBJ2RVAL(gtk_entry_get_layout(_SELF(self)));
 }
 
 static VALUE
-entry_get_layout_offsets(VALUE self)
+rg_layout_offsets(VALUE self)
 {
     int x, y;
     gtk_entry_get_layout_offsets(_SELF(self), &x, &y);
@@ -39,89 +50,43 @@ entry_get_layout_offsets(VALUE self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-entry_set_completion(VALUE self, VALUE completion)
+rg_set_completion(VALUE self, VALUE completion)
 {
     gtk_entry_set_completion(_SELF(self), GTK_ENTRY_COMPLETION(RVAL2GOBJ(completion)));
+
+    G_CHILD_SET(self, rb_intern("completion"), completion);
+
     return self;
 }
 
 static VALUE
-entry_get_completion(VALUE self)
+rg_completion(VALUE self)
 {
     return GOBJ2RVAL(gtk_entry_get_completion(_SELF(self)));
 }
 #endif
 
 static VALUE
-entry_layout_index_to_text_index(VALUE self, VALUE layout_index)
+rg_layout_index_to_text_index(VALUE self, VALUE layout_index)
 {
     return INT2NUM(gtk_entry_layout_index_to_text_index(_SELF(self), NUM2INT(layout_index)));
 }
 
 static VALUE
-entry_text_index_to_layout_index(VALUE self, VALUE text_index)
+rg_text_index_to_layout_index(VALUE self, VALUE text_index)
 {
     return INT2NUM(gtk_entry_text_index_to_layout_index(_SELF(self), NUM2INT(text_index)));
 }
 
-/* Deprecated.
-GtkWidget*  gtk_entry_new_with_max_length   (gint max);
-void        gtk_entry_append_text           (GtkEntry *entry,
-                                             const gchar *text);
-void        gtk_entry_prepend_text          (GtkEntry *entry,
-                                             const gchar *text);
-void        gtk_entry_set_position          (GtkEntry *entry,
-                                             gint position);
-void        gtk_entry_select_region         (GtkEntry *entry,
-                                             gint start,
-                                             gint end);
-void        gtk_entry_set_editable          (GtkEntry *entry,
-                                             gboolean editable);
-*/
-
-/* Defined as properties
-const gchar* gtk_entry_get_text             (GtkEntry *entry);
-void        gtk_entry_set_text              (GtkEntry *entry,
-                                             const gchar *text);
-
-void        gtk_entry_set_visibility        (GtkEntry *entry,
-                                             gboolean visible);
-void        gtk_entry_set_invisible_char    (GtkEntry *entry,
-                                             gunichar ch);
-
-void        gtk_entry_set_max_length        (GtkEntry *entry,
-                                             gint max);
-gboolean    gtk_entry_get_activates_default (GtkEntry *entry);
-gboolean    gtk_entry_get_has_frame         (GtkEntry *entry);
-const GtkBorder* gtk_entry_get_inner_border (GtkEntry *entry);
-gint        gtk_entry_get_width_chars       (GtkEntry *entry);
-void        gtk_entry_set_activates_default (GtkEntry *entry,
-                                             gboolean setting);
-void        gtk_entry_set_has_frame         (GtkEntry *entry,
-                                             gboolean setting);
-void        gtk_entry_set_inner_border      (GtkEntry *entry,
-                                             const GtkBorder *border);
-void        gtk_entry_set_width_chars       (GtkEntry *entry,
-                                             gint n_chars);
-gunichar    gtk_entry_get_invisible_char    (GtkEntry *entry);
-// Use xalign/xalign=.
-void        gtk_entry_set_alignment         (GtkEntry *entry,
-                                             gfloat xalign); 
-gfloat      gtk_entry_get_alignment         (GtkEntry *entry);
-
-gint        gtk_entry_get_max_length        (GtkEntry *entry);
-gboolean    gtk_entry_get_visibility        (GtkEntry *entry);
-*/
-
 #if GTK_CHECK_VERSION(2, 12, 0)
 static VALUE
-entry_get_cursor_hadjustment(VALUE self)
+rg_cursor_hadjustment(VALUE self)
 {
     return GOBJ2RVAL(gtk_entry_get_cursor_hadjustment(_SELF(self)));
 }
 
 static VALUE
-entry_set_cursor_hadjustment(VALUE self, VALUE adjustment)
+rg_set_cursor_hadjustment(VALUE self, VALUE adjustment)
 {
     gtk_entry_set_cursor_hadjustment(_SELF(self), RVAL2GOBJ(adjustment));
     return self;
@@ -129,26 +94,24 @@ entry_set_cursor_hadjustment(VALUE self, VALUE adjustment)
 #endif
 
 void 
-Init_gtk_entry()
+Init_gtk_entry(VALUE mGtk)
 {
-    VALUE gEntry = G_DEF_CLASS(GTK_TYPE_ENTRY, "Entry", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ENTRY, "Entry", mGtk);
 
-    rb_define_method(gEntry, "initialize", entry_initialize, 0);
-    rb_define_method(gEntry, "layout", entry_get_layout, 0);
-    rb_define_method(gEntry, "layout_offsets", entry_get_layout_offsets, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(layout, 0);
+    RG_DEF_METHOD(layout_offsets, 0);
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gEntry, "set_completion", entry_set_completion, 1);
-    G_DEF_SETTER(gEntry, "completion");
-    rb_define_method(gEntry, "completion", entry_get_completion, 0);
+    RG_DEF_METHOD(set_completion, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "completion");
+    RG_DEF_METHOD(completion, 0);
 #endif
-    rb_define_method(gEntry, "layout_index_to_text_index", entry_layout_index_to_text_index, 1);
-    rb_define_method(gEntry, "text_index_to_layout_index", entry_text_index_to_layout_index, 1);
+    RG_DEF_METHOD(layout_index_to_text_index, 1);
+    RG_DEF_METHOD(text_index_to_layout_index, 1);
 
 #if GTK_CHECK_VERSION(2, 12, 0)
-    rb_define_method(gEntry, "cursor_hadjustment",
-		     entry_get_cursor_hadjustment, 0);
-    rb_define_method(gEntry, "set_cursor_hadjustment",
-		     entry_set_cursor_hadjustment, 1);
-    G_DEF_SETTER(gEntry, "cursor_hadjustment");
+    RG_DEF_METHOD(cursor_hadjustment, 0);
+    RG_DEF_METHOD(set_cursor_hadjustment, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "cursor_hadjustment");
 #endif
 }