gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkrc.c

@@ -1,19 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrc.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:32 $
-
-  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 mRC
+
 /*
 static VALUE
 rc_scanner_new(VALUE self)
@@ -23,7 +35,7 @@ rc_scanner_new(VALUE self)
 */
 
 static VALUE
-rc_get_style(VALUE self, VALUE widget)
+rg_m_get_style(G_GNUC_UNUSED VALUE self, VALUE widget)
 {
     GtkStyle* style = gtk_rc_get_style(GTK_WIDGET(RVAL2GOBJ(widget)));
     GType gtype = G_OBJECT_TYPE(style);
@@ -35,7 +47,7 @@ rc_get_style(VALUE self, VALUE widget)
 }
 
 static VALUE
-rc_get_style_by_paths(int argc, VALUE *argv, VALUE self)
+rg_m_get_style_by_paths(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE settings, widget_path, class_path, klass;
     GtkStyle* style;
@@ -61,27 +73,27 @@ rc_get_style_by_paths(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-rc_parse(VALUE self, VALUE filename)
+rg_m_parse(G_GNUC_UNUSED VALUE self, VALUE filename)
 {
     gtk_rc_parse(RVAL2CSTR(filename));
     return filename;
 }
 
 static VALUE
-rc_parse_string(VALUE self, VALUE rc_string)
+rg_m_parse_string(G_GNUC_UNUSED VALUE self, VALUE rc_string)
 {
     gtk_rc_parse_string(RVAL2CSTR(rc_string));
     return rc_string;
 }
 
 static VALUE
-rc_reparse_all(VALUE self)
+rg_m_reparse_all(G_GNUC_UNUSED VALUE self)
 {
     return CBOOL2RVAL(gtk_rc_reparse_all());
 }
 
 static VALUE
-rc_reparse_all_for_settings(VALUE self, VALUE settings, VALUE force_load)
+rg_m_reparse_all_for_settings(G_GNUC_UNUSED VALUE self, VALUE settings, VALUE force_load)
 {
     return CBOOL2RVAL(gtk_rc_reparse_all_for_settings(GTK_SETTINGS(RVAL2GOBJ(settings)), 
                                                       RVAL2CBOOL(force_load)));
@@ -89,7 +101,7 @@ rc_reparse_all_for_settings(VALUE self, VALUE settings, VALUE force_load)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-rc_reset_styles(VALUE self, VALUE settings)
+rg_m_reset_styles(G_GNUC_UNUSED VALUE self, VALUE settings)
 {
     gtk_rc_reset_styles(GTK_SETTINGS(RVAL2GOBJ(settings)));
     return settings;
@@ -97,14 +109,14 @@ rc_reset_styles(VALUE self, VALUE settings)
 #endif
 
 static VALUE
-rc_add_default_file(VALUE self, VALUE filename)
+rg_m_add_default_file(G_GNUC_UNUSED VALUE self, VALUE filename)
 {
     gtk_rc_add_default_file(RVAL2CSTR(filename));
     return filename;
 }
 
 static VALUE
-rc_get_default_files(VALUE self)
+rg_m_default_files(G_GNUC_UNUSED VALUE self)
 {
     gchar** files = gtk_rc_get_default_files();
     VALUE ary = rb_ary_new();
@@ -116,7 +128,7 @@ rc_get_default_files(VALUE self)
 }
 
 static VALUE
-rc_set_default_files(VALUE self, VALUE rbfilenames)
+rg_m_set_default_files(G_GNUC_UNUSED VALUE self, VALUE rbfilenames)
 {
     gchar **filenames = (gchar **)RVAL2STRV(rbfilenames);
 
@@ -139,7 +151,7 @@ guint       gtk_rc_parse_priority           (GScanner *scanner,
 */
 
 static VALUE
-rc_find_module_in_path(VALUE self, VALUE module_file)
+rg_m_find_module_in_path(G_GNUC_UNUSED VALUE self, VALUE module_file)
 {
     return CSTR2RVAL_FREE(gtk_rc_find_module_in_path(RVAL2CSTR(module_file)));
 }
@@ -151,59 +163,59 @@ gchar*      gtk_rc_find_pixmap_in_path      (GtkSettings *settings,
 */
 
 static VALUE
-rc_get_module_dir(VALUE self)
+rg_m_module_dir(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_rc_get_module_dir());
 }
 
 static VALUE
-rc_get_im_module_path(VALUE self)
+rg_m_im_module_path(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gtk_rc_get_im_module_path());
 }
 
 static VALUE
-rc_get_im_module_file(VALUE self)
+rg_m_im_module_file(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gtk_rc_get_im_module_file());
 }
 
 static VALUE
-rc_get_theme_dir(VALUE self)
+rg_m_theme_dir(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_rc_get_theme_dir());
 }
 
 void 
-Init_gtk_rc()
+Init_gtk_rc(VALUE mGtk)
 {
-    VALUE mRC = rb_define_module_under(mGtk, "RC");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGtk, "RC");
 
-    rb_define_module_function(mRC, "get_style", rc_get_style, 1);
-    rb_define_module_function(mRC, "get_style_by_paths", rc_get_style_by_paths, -1);
-    rb_define_module_function(mRC, "parse", rc_parse, 1);
-    rb_define_module_function(mRC, "parse_string", rc_parse_string, 1);
-    rb_define_module_function(mRC, "reparse_all", rc_reparse_all, 0);
-    rb_define_module_function(mRC, "reparse_all_for_settings", rc_reparse_all_for_settings, 2);
+    RG_DEF_MODFUNC(get_style, 1);
+    RG_DEF_MODFUNC(get_style_by_paths, -1);
+    RG_DEF_MODFUNC(parse, 1);
+    RG_DEF_MODFUNC(parse_string, 1);
+    RG_DEF_MODFUNC(reparse_all, 0);
+    RG_DEF_MODFUNC(reparse_all_for_settings, 2);
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_module_function(mRC, "reset_styles", rc_reset_styles, 1);
+    RG_DEF_MODFUNC(reset_styles, 1);
 #endif
-    rb_define_module_function(mRC, "add_default_file", rc_add_default_file, 1);
-    rb_define_module_function(mRC, "default_files", rc_get_default_files, 0);
-    rb_define_module_function(mRC, "set_default_files", rc_set_default_files, 1);
-    rb_define_module_function(mRC, "find_module_in_path", rc_find_module_in_path, 1);
-    rb_define_module_function(mRC, "module_dir", rc_get_module_dir, 0);
-    rb_define_module_function(mRC, "im_module_path", rc_get_im_module_path, 0);
-    rb_define_module_function(mRC, "im_module_file", rc_get_im_module_file, 0);
-    rb_define_module_function(mRC, "theme_dir", rc_get_theme_dir, 0);
+    RG_DEF_MODFUNC(add_default_file, 1);
+    RG_DEF_MODFUNC(default_files, 0);
+    RG_DEF_MODFUNC(set_default_files, 1);
+    RG_DEF_MODFUNC(find_module_in_path, 1);
+    RG_DEF_MODFUNC(module_dir, 0);
+    RG_DEF_MODFUNC(im_module_path, 0);
+    RG_DEF_MODFUNC(im_module_file, 0);
+    RG_DEF_MODFUNC(theme_dir, 0);
 
-    G_DEF_SETTERS(mRC);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GtkRcFlags */
-    G_DEF_CLASS(GTK_TYPE_RC_FLAGS, "Flags", mRC);
-    G_DEF_CONSTANTS(mRC, GTK_TYPE_RC_FLAGS, "GTK_RC_");
+    G_DEF_CLASS(GTK_TYPE_RC_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_RC_FLAGS, "GTK_RC_");
 
     /* GtkRcTokenType */
-    G_DEF_CLASS(GTK_TYPE_RC_TOKEN_TYPE, "TokenType", mRC);
-    G_DEF_CONSTANTS(mRC, GTK_TYPE_RC_TOKEN_TYPE, "GTK_RC_");
+    G_DEF_CLASS(GTK_TYPE_RC_TOKEN_TYPE, "TokenType", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_RC_TOKEN_TYPE, "GTK_RC_");
 }

data/ext/gtk2/rbgtkrcstyle.c

@@ -1,40 +1,51 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrcstyle.c -
-
-  $Author: ggc $
-  $Date: 2006/06/22 19:52:54 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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"
 
+#define RG_TARGET_NAMESPACE cRcStyle
 #define _SELF(rc) (GTK_RC_STYLE(RVAL2GOBJ(rc)))
 
 static VALUE
-rcstyle_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_rc_style_new());
     return Qnil;
 }
 
 static VALUE
-rcstyle_name(VALUE self)
+rg_name(VALUE self)
 {
     return CSTR2RVAL(_SELF(self)->name);
 }
 
 static VALUE
-rcstyle_set_name(VALUE self, VALUE name)
+rg_set_name(VALUE self, VALUE name)
 {
     _SELF(self)->name = g_strdup(RVAL2CSTR(name));
     return self;
 }
 
 static VALUE
-rcstyle_bg_pixmap_name(VALUE self, VALUE idx)
+rg_bg_pixmap_name(VALUE self, VALUE idx)
 {
     int i = NUM2INT(idx);
 
@@ -44,7 +55,7 @@ rcstyle_bg_pixmap_name(VALUE self, VALUE idx)
 }
 
 static VALUE
-rcstyle_set_bg_pixmap_name(VALUE self, VALUE idx, VALUE bg_pixmap_name)
+rg_set_bg_pixmap_name(VALUE self, VALUE idx, VALUE bg_pixmap_name)
 {
     int i = NUM2INT(idx);
 
@@ -53,23 +64,23 @@ rcstyle_set_bg_pixmap_name(VALUE self, VALUE idx, VALUE bg_pixmap_name)
     _SELF(self)->bg_pixmap_name[i] = g_strdup(RVAL2CSTR(bg_pixmap_name));
     return self;
 }
-    
+
 static VALUE
-rcstyle_font_desc(VALUE self)
+rg_font_desc(VALUE self)
 {
     PangoFontDescription* desc = _SELF(self)->font_desc;
     return BOXED2RVAL(desc, PANGO_TYPE_FONT_DESCRIPTION);
 }
 
 static VALUE
-rcstyle_set_font_desc(VALUE self, VALUE font_desc)
+rg_set_font_desc(VALUE self, VALUE font_desc)
 {
     _SELF(self)->font_desc = (PangoFontDescription*)RVAL2BOXED(font_desc, PANGO_TYPE_FONT_DESCRIPTION);
     return self;
 }
 
 static VALUE
-rcstyle_color_flags(VALUE self, VALUE rb_state_type)
+rg_color_flags(VALUE self, VALUE rb_state_type)
 {
     GtkStateType state_type;
 
@@ -78,7 +89,7 @@ rcstyle_color_flags(VALUE self, VALUE rb_state_type)
 }
 
 static VALUE
-rcstyle_set_color_flags(VALUE self, VALUE rb_state_type, VALUE flags)
+rg_set_color_flags(VALUE self, VALUE rb_state_type, VALUE flags)
 {
     GtkStateType state_type;
 
@@ -116,56 +127,56 @@ DEFINE_STYLE_COLOR(text);
 DEFINE_STYLE_COLOR(base);
 
 static VALUE
-rcstyle_xthickness(VALUE self)
+rg_xthickness(VALUE self)
 {
     return INT2NUM(_SELF(self)->xthickness);
 }
 
 static VALUE
-rcstyle_set_xthickness(VALUE self, VALUE xthickness)
+rg_set_xthickness(VALUE self, VALUE xthickness)
 {
     _SELF(self)->xthickness = NUM2INT(xthickness);
     return self;
 }
 
 static VALUE
-rcstyle_ythickness(VALUE self)
+rg_ythickness(VALUE self)
 {
     return INT2NUM(_SELF(self)->ythickness);
 }
 
 static VALUE
-rcstyle_set_ythickness(VALUE self, VALUE ythickness)
+rg_set_ythickness(VALUE self, VALUE ythickness)
 {
     _SELF(self)->ythickness = NUM2INT(ythickness);
     return self;
 }
 
 void 
-Init_gtk_rcstyle()
+Init_gtk_rcstyle(VALUE mGtk)
 {
-    VALUE gRcStyle = G_DEF_CLASS(GTK_TYPE_RC_STYLE, "RcStyle", mGtk);
-    rb_define_method(gRcStyle, "initialize", rcstyle_initialize, 0);
-    rb_define_method(gRcStyle, "color_flags", rcstyle_color_flags, 1);
-    rb_define_method(gRcStyle, "set_color_flags", rcstyle_set_color_flags, 2);
-    rb_define_method(gRcStyle, "name", rcstyle_name, 0);
-    rb_define_method(gRcStyle, "set_name", rcstyle_set_name, 1);
-    rb_define_method(gRcStyle, "bg_pixmap_name", rcstyle_bg_pixmap_name, 1);
-    rb_define_method(gRcStyle, "set_bg_pixmap_name", rcstyle_set_bg_pixmap_name, 2);
-    rb_define_method(gRcStyle, "font_desc", rcstyle_font_desc, 0);
-    rb_define_method(gRcStyle, "set_font_desc", rcstyle_set_font_desc, 1);
-    rb_define_method(gRcStyle, "fg", rcstyle_fg, 1);
-    rb_define_method(gRcStyle, "bg", rcstyle_bg, 1);
-    rb_define_method(gRcStyle, "text", rcstyle_text, 1);
-    rb_define_method(gRcStyle, "base", rcstyle_base, 1);
-    rb_define_method(gRcStyle, "set_fg", rcstyle_set_fg, 4);
-    rb_define_method(gRcStyle, "set_bg", rcstyle_set_bg, 4);
-    rb_define_method(gRcStyle, "set_text", rcstyle_set_text, 4);
-    rb_define_method(gRcStyle, "set_base", rcstyle_set_base, 4);
-    rb_define_method(gRcStyle, "xthickness", rcstyle_xthickness, 0);
-    rb_define_method(gRcStyle, "ythickness", rcstyle_ythickness, 0);
-    rb_define_method(gRcStyle, "set_xthickness", rcstyle_set_xthickness, 1);
-    rb_define_method(gRcStyle, "set_ythickness", rcstyle_set_ythickness, 1);
-
-    G_DEF_SETTERS(gRcStyle);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RC_STYLE, "RcStyle", mGtk);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(color_flags, 1);
+    RG_DEF_METHOD(set_color_flags, 2);
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD(set_name, 1);
+    RG_DEF_METHOD(bg_pixmap_name, 1);
+    RG_DEF_METHOD(set_bg_pixmap_name, 2);
+    RG_DEF_METHOD(font_desc, 0);
+    RG_DEF_METHOD(set_font_desc, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "fg", rcstyle_fg, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "bg", rcstyle_bg, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "text", rcstyle_text, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "base", rcstyle_base, 1);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_fg", rcstyle_set_fg, 4);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_bg", rcstyle_set_bg, 4);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_text", rcstyle_set_text, 4);
+    rb_define_method(RG_TARGET_NAMESPACE, "set_base", rcstyle_set_base, 4);
+    RG_DEF_METHOD(xthickness, 0);
+    RG_DEF_METHOD(ythickness, 0);
+    RG_DEF_METHOD(set_xthickness, 1);
+    RG_DEF_METHOD(set_ythickness, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkrecentaction.c

@@ -1,23 +1,35 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkrecentaction.c -
-
-  $Author: ggc $
-  $Date: 2007/07/12 14:53:09 $
-
-  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"
 
 #if GTK_CHECK_VERSION(2,12,0)
 
+#define RG_TARGET_NAMESPACE cRecentAction
+
 static VALUE
-recentaction_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE  name, label, tooltip, stock_id, manager;
     rb_scan_args(argc, argv, "23", &name, &label, &tooltip, &stock_id, &manager);
@@ -39,10 +51,10 @@ recentaction_initialize(int argc, VALUE *argv, VALUE self)
 #endif
 
 void 
-Init_gtk_recentaction()
+Init_gtk_recentaction(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,12,0)
-    VALUE gRecentaction = G_DEF_CLASS(GTK_TYPE_RECENT_ACTION, "RecentAction", mGtk);
-    rb_define_method(gRecentaction, "initialize", recentaction_initialize, -1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RECENT_ACTION, "RecentAction", mGtk);
+    RG_DEF_METHOD(initialize, -1);
 #endif
 }