gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkspinbutton.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkspinbutton.c -
-
-  $Author: mutoh $
-  $Date: 2004/03/05 16:24:30 $
-
-  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 cSpinButton
 #define _SELF(self) (GTK_SPIN_BUTTON(RVAL2GOBJ(self)))
 
 static VALUE
-sbtn_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3;
     GtkAdjustment *adj = NULL;
@@ -41,7 +52,7 @@ sbtn_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-sbtn_configure(VALUE self, VALUE adj, VALUE climb_rate, VALUE digits)
+rg_configure(VALUE self, VALUE adj, VALUE climb_rate, VALUE digits)
 {
     gtk_spin_button_configure(_SELF(self), GTK_ADJUSTMENT(RVAL2GOBJ(adj)),
                               NUM2DBL(climb_rate), NUM2UINT(digits));
@@ -49,28 +60,27 @@ sbtn_configure(VALUE self, VALUE adj, VALUE climb_rate, VALUE digits)
 }
 
 static VALUE
-sbtn_set_increments(VALUE self, VALUE step, VALUE page)
+rg_set_increments(VALUE self, VALUE step, VALUE page)
 {
     gtk_spin_button_set_increments(_SELF(self), NUM2DBL(step), NUM2DBL(page));
     return self;
 }
 
 static VALUE
-sbtn_set_range(VALUE self, VALUE min, VALUE max)
+rg_set_range(VALUE self, VALUE min, VALUE max)
 {
     gtk_spin_button_set_range(_SELF(self), NUM2DBL(min), NUM2DBL(max));
     return self;
 }
 
-
 static VALUE
-sbtn_get_value_as_int(VALUE self)
+rg_value_as_int(VALUE self)
 {
     return INT2NUM(gtk_spin_button_get_value_as_int(_SELF(self)));
 }
 
 static VALUE
-sbtn_spin(VALUE self, VALUE direction, VALUE increment)
+rg_spin(VALUE self, VALUE direction, VALUE increment)
 {
     gtk_spin_button_spin(_SELF(self), RVAL2GENUM(direction, GTK_TYPE_SPIN_TYPE), 
                          NUM2DBL(increment));
@@ -78,14 +88,14 @@ sbtn_spin(VALUE self, VALUE direction, VALUE increment)
 }
 
 static VALUE
-sbtn_update(VALUE self)
+rg_update(VALUE self)
 {
     gtk_spin_button_update(_SELF(self));
     return self;
 }
 
 static VALUE
-sbtn_get_increments(VALUE self)
+rg_increments(VALUE self)
 {
     gdouble step, page;
     gtk_spin_button_get_increments(_SELF(self), &step, &page);
@@ -94,7 +104,7 @@ sbtn_get_increments(VALUE self)
 }
 
 static VALUE
-sbtn_get_range(VALUE self)
+rg_range(VALUE self)
 {
     gdouble min, max;
     gtk_spin_button_get_range(_SELF(self), &min, &max);
@@ -103,25 +113,25 @@ sbtn_get_range(VALUE self)
 }
 
 void 
-Init_gtk_spin_button()
+Init_gtk_spin_button(VALUE mGtk)
 {
-    VALUE gSButton = G_DEF_CLASS(GTK_TYPE_SPIN_BUTTON, "SpinButton", mGtk);
-
-    rb_define_method(gSButton, "initialize", sbtn_initialize, -1);
-    rb_define_method(gSButton, "configure", sbtn_configure, 3);
-    rb_define_method(gSButton, "set_increments", sbtn_set_increments, 2);
-    rb_define_method(gSButton, "set_range", sbtn_set_range, 2);
-    rb_define_method(gSButton, "value_as_int", sbtn_get_value_as_int, 0);
-    rb_define_method(gSButton, "spin", sbtn_spin, 2);
-    rb_define_method(gSButton, "update", sbtn_update, 0);
-    rb_define_method(gSButton, "increments", sbtn_get_increments, 0);
-    rb_define_method(gSButton, "range", sbtn_get_range, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_SPIN_BUTTON, "SpinButton", mGtk);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(configure, 3);
+    RG_DEF_METHOD(set_increments, 2);
+    RG_DEF_METHOD(set_range, 2);
+    RG_DEF_METHOD(value_as_int, 0);
+    RG_DEF_METHOD(spin, 2);
+    RG_DEF_METHOD(update, 0);
+    RG_DEF_METHOD(increments, 0);
+    RG_DEF_METHOD(range, 0);
 
     /* GtkSpinType */
-    G_DEF_CLASS(GTK_TYPE_SPIN_TYPE, "Type", gSButton);
-    G_DEF_CONSTANTS(gSButton, GTK_TYPE_SPIN_TYPE, "GTK_SPIN_");
+    G_DEF_CLASS(GTK_TYPE_SPIN_TYPE, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_SPIN_TYPE, "GTK_SPIN_");
 
     /* GtkSpinButtonUpdatePolicy */
-    G_DEF_CLASS(GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY, "UpdatePolicy", gSButton);
-    G_DEF_CONSTANTS(gSButton, GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY, "GTK_");
+    G_DEF_CLASS(GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY, "UpdatePolicy", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY, "GTK_");
 }

data/ext/gtk2/rbgtkspinner.c

@@ -1,33 +1,46 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkspinner.c -
-
-  Copyright (C) 2011 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  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
+ *  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"
 
 #if GTK_CHECK_VERSION(2,20,0)
 
+#define RG_TARGET_NAMESPACE cSpinner
 #define _SELF(s) (GTK_SPINNER(RVAL2GOBJ(s)))
 
 static VALUE
-spinner_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_spinner_new());
     return Qnil;
 }
 
 static VALUE
-spinner_start(VALUE self)
+rg_start(VALUE self)
 {
     gtk_spinner_start(_SELF(self));
     return self;
 }
 
 static VALUE
-spinner_stop(VALUE self)
+rg_stop(VALUE self)
 {
     gtk_spinner_stop(_SELF(self));
     return self;
@@ -36,13 +49,13 @@ spinner_stop(VALUE self)
 #endif
 
 void 
-Init_gtk_spinner()
+Init_gtk_spinner(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,20,0)
-    VALUE gSpinner = G_DEF_CLASS(GTK_TYPE_SPINNER, "Spinner", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_SPINNER, "Spinner", mGtk);
 
-    rb_define_method(gSpinner, "initialize", spinner_initialize, 0);
-    rb_define_method(gSpinner, "start", spinner_start, 0);
-    rb_define_method(gSpinner, "stop", spinner_stop, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(start, 0);
+    RG_DEF_METHOD(stop, 0);
 #endif
 }

data/ext/gtk2/rbgtkstatusbar.c

@@ -1,30 +1,41 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkstatusbar.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:32 $
-
-  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 cStatusbar
 #define _SELF(self) (GTK_STATUSBAR(RVAL2GOBJ(self)))
 
 static VALUE
-statusbar_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_statusbar_new());
     return Qnil;
 }
 
 static VALUE
-statusbar_get_context_id(VALUE self, VALUE text)
+rg_get_context_id(VALUE self, VALUE text)
 {
 
     return INT2FIX(gtk_statusbar_get_context_id(_SELF(self),
@@ -32,14 +43,14 @@ statusbar_get_context_id(VALUE self, VALUE text)
 }
 
 static VALUE
-statusbar_push(VALUE self, VALUE id, VALUE text)
+rg_push(VALUE self, VALUE id, VALUE text)
 {
     return INT2FIX(gtk_statusbar_push(_SELF(self), 
                                       NUM2INT(id), RVAL2CSTR(text)));
 }
-    
+
 static VALUE
-statusbar_pop(VALUE self, VALUE id)
+rg_pop(VALUE self, VALUE id)
 {
     gtk_statusbar_pop(_SELF(self), NUM2INT(id));
     return self;
@@ -47,26 +58,20 @@ statusbar_pop(VALUE self, VALUE id)
 }
 
 static VALUE
-statusbar_remove(VALUE self, VALUE cid, VALUE mid)
+rg_remove(VALUE self, VALUE cid, VALUE mid)
 {
     gtk_statusbar_remove(_SELF(self), NUM2INT(cid), NUM2INT(mid)); 
     return self;
 }
 
-/* Defined as Properties:
-void                gtk_statusbar_set_has_resize_grip   (GtkStatusbar *statusbar,
-                                                         gboolean setting);
-gboolean            gtk_statusbar_get_has_resize_grip   (GtkStatusbar *statusbar);
-*/
-
 void 
-Init_gtk_statusbar()
+Init_gtk_statusbar(VALUE mGtk)
 {
-    VALUE gStatusBar = G_DEF_CLASS(GTK_TYPE_STATUSBAR, "Statusbar", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_STATUSBAR, "Statusbar", mGtk);
 
-    rb_define_method(gStatusBar, "initialize", statusbar_initialize, 0);
-    rb_define_method(gStatusBar, "get_context_id", statusbar_get_context_id, 1);
-    rb_define_method(gStatusBar, "push", statusbar_push, 2);
-    rb_define_method(gStatusBar, "pop", statusbar_pop, 1);
-    rb_define_method(gStatusBar, "remove", statusbar_remove, 2);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(get_context_id, 1);
+    RG_DEF_METHOD(push, 2);
+    RG_DEF_METHOD(pop, 1);
+    RG_DEF_METHOD(remove, 2);
 }

data/ext/gtk2/rbgtkstatusicon.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkstatusicon.c -
-
-  $Author: mutoh $
-  $Date: 2006/11/17 18:12:41 $
-
-  Copyright (C) 2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Masao Mutoh
+ *
+ *  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"
 
 #if GTK_CHECK_VERSION(2,10,0)
 
+#define RG_TARGET_NAMESPACE cStatusIcon
 #define _SELF(w) (GTK_STATUS_ICON(RVAL2GOBJ(w)))
 
 static VALUE
-si_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_status_icon_new());
     return Qnil;
@@ -32,40 +43,16 @@ GtkStatusIcon* gtk_status_icon_new_from_stock
 GtkStatusIcon* gtk_status_icon_new_from_icon_name
                                             (const gchar *icon_name);
 */
-/* Defined as properties
-void        gtk_status_icon_set_from_pixbuf (GtkStatusIcon *status_icon,
-                                             GdkPixbuf *pixbuf);
-void        gtk_status_icon_set_from_file   (GtkStatusIcon *status_icon,
-                                             const gchar *filename);
-void        gtk_status_icon_set_from_stock  (GtkStatusIcon *status_icon,
-                                             const gchar *stock_id);
-void        gtk_status_icon_set_from_icon_name
-                                            (GtkStatusIcon *status_icon,
-                                             const gchar *icon_name);
-GtkImageType gtk_status_icon_get_storage_type
-                                            (GtkStatusIcon *status_icon);
-GdkPixbuf*  gtk_status_icon_get_pixbuf      (GtkStatusIcon *status_icon);
-const gchar* gtk_status_icon_get_stock      (GtkStatusIcon *status_icon);
-const gchar* gtk_status_icon_get_icon_name  (GtkStatusIcon *status_icon);
-gint        gtk_status_icon_get_size        (GtkStatusIcon *status_icon);
-void        gtk_status_icon_set_visible     (GtkStatusIcon *status_icon,
-                                             gboolean visible);
-gboolean    gtk_status_icon_get_visible     (GtkStatusIcon *status_icon);
-void        gtk_status_icon_set_blinking    (GtkStatusIcon *status_icon,
-                                             gboolean blinking);
-gboolean    gtk_status_icon_get_blinking    (GtkStatusIcon *status_icon);
-gboolean            gtk_status_icon_is_embedded         (GtkStatusIcon *status_icon);
-*/
 
 static VALUE
-si_set_tooltip(VALUE self, VALUE tooltip_text)
+rg_set_tooltip(VALUE self, VALUE tooltip_text)
 {
     gtk_status_icon_set_tooltip(_SELF(self), RVAL2CSTR(tooltip_text));
     return self;
 }
 
 static VALUE
-si_position_menu(VALUE self, VALUE menu)
+rg_position_menu(VALUE self, VALUE menu)
 {
     gint x, y;
     gboolean push_in;
@@ -76,7 +63,7 @@ si_position_menu(VALUE self, VALUE menu)
 }
 
 static VALUE
-si_get_geometry(VALUE self)
+rg_geometry(VALUE self)
 {
     GdkScreen* screen;
     GdkRectangle area;
@@ -94,15 +81,15 @@ si_get_geometry(VALUE self)
 #endif
 
 void 
-Init_gtk_status_icon()
+Init_gtk_status_icon(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE si = G_DEF_CLASS(GTK_TYPE_STATUS_ICON, "StatusIcon", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_STATUS_ICON, "StatusIcon", mGtk);
 
-    rb_define_method(si, "initialize", si_initialize, 0);
-    rb_define_method(si, "set_tooltip", si_set_tooltip, 1);
-    G_DEF_SETTER(si, "tooltip");
-    rb_define_method(si, "position_menu", si_position_menu, 1);
-    rb_define_method(si, "geometry", si_get_geometry, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(set_tooltip, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "tooltip");
+    RG_DEF_METHOD(position_menu, 1);
+    RG_DEF_METHOD(geometry, 0);
 #endif
 }