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

data/ext/gtk2/rbgtkmacros.h

@@ -1,10 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkconversions.h -
-
-  Copyright (C) 2008 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008  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
+ */
 
 #ifndef __RB_GTK_MACROS_H__
 #define __RB_GTK_MACROS_H__

data/ext/gtk2/rbgtkmenu.c

@@ -1,24 +1,35 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkmenu.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2006 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 cMenu
 #define _SELF(self) (GTK_MENU(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-menu_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_menu_new());
     return Qnil;
@@ -26,7 +37,7 @@ menu_initialize(VALUE self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-menu_set_screen(VALUE self, VALUE screen)
+rg_set_screen(VALUE self, VALUE screen)
 {
     gtk_menu_set_screen(_SELF(self), GDK_SCREEN(RVAL2GOBJ(screen)));
     return self;
@@ -34,7 +45,7 @@ menu_set_screen(VALUE self, VALUE screen)
 #endif
 
 static VALUE
-menu_reorder_child(VALUE self, VALUE child, VALUE position)
+rg_reorder_child(VALUE self, VALUE child, VALUE position)
 {
     gtk_menu_reorder_child(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)),
                            NUM2INT(position));
@@ -43,7 +54,7 @@ menu_reorder_child(VALUE self, VALUE child, VALUE position)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-menu_attach(VALUE self, VALUE child, VALUE left_attach, VALUE right_attach, VALUE top_attach, VALUE bottom_attach)
+rg_attach(VALUE self, VALUE child, VALUE left_attach, VALUE right_attach, VALUE top_attach, VALUE bottom_attach)
 {
     gtk_menu_attach(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)), 
                     NUM2UINT(left_attach), NUM2UINT(right_attach), 
@@ -71,7 +82,7 @@ menu_pos_func(GtkMenu *menu, gint *px, gint *py, gboolean *push_in, gpointer dat
 
 /* the proc should return [x, y, push_in] */
 static VALUE
-menu_popup(VALUE self, VALUE pshell, VALUE pitem, VALUE button, VALUE activate_time)
+rg_popup(VALUE self, VALUE pshell, VALUE pitem, VALUE button, VALUE activate_time)
 {
     GtkWidget *gpshell = NULL;
     GtkWidget *gpitem = NULL;
@@ -91,46 +102,27 @@ menu_popup(VALUE self, VALUE pshell, VALUE pitem, VALUE button, VALUE activate_t
     if (!NIL_P(pitem)) {
         gpitem = RVAL2WIDGET(pitem);
     }
-    
+
     gtk_menu_popup(_SELF(self), gpshell, gpitem,
                    pfunc, data, NUM2UINT(button),
                    NUM2UINT(activate_time));
     return self;
 }
 
-/* Defined as Properties
-gboolean            gtk_menu_get_tearoff_state          (GtkMenu *menu);
-void                gtk_menu_set_accel_group            (GtkMenu *menu,
-                                                         GtkAccelGroup *accel_group);
-GtkAccelGroup *     gtk_menu_get_accel_group            (GtkMenu *menu);
-void                gtk_menu_set_accel_path             (GtkMenu *menu,
-                                                         const gchar *accel_path);
-*/
-
 static VALUE
-menu_popdown(VALUE self)
+rg_popdown(VALUE self)
 {
     gtk_menu_popdown(_SELF(self));
     return self;
 }
 
 static VALUE
-menu_reposition(VALUE self)
+rg_reposition(VALUE self)
 {
     gtk_menu_reposition(_SELF(self));
     return self;
 }
 
-/* Defined as Properties
-GtkWidget *         gtk_menu_get_active                 (GtkMenu *menu);
-void                gtk_menu_set_active                 (GtkMenu *menu,
-                                                         guint index_);
-void                gtk_menu_set_tearoff_state          (GtkMenu *menu,
-                                                         gboolean torn_off);
-void                gtk_menu_set_monitor                (GtkMenu *menu,
-                                                         gint monitor_num);
-gint                gtk_menu_get_monitor                (GtkMenu *menu);
-*/
 static VALUE menu_detacher;
 static void
 detach_func(GtkWidget *attach_widget, GtkMenu *menu)
@@ -140,7 +132,7 @@ detach_func(GtkWidget *attach_widget, GtkMenu *menu)
 }
 
 static VALUE
-menu_attach_to_widget(VALUE self, VALUE attach_widget)
+rg_attach_to_widget(VALUE self, VALUE attach_widget)
 {
     menu_detacher = rb_block_proc();
     G_RELATIVE(self, menu_detacher);
@@ -151,19 +143,15 @@ menu_attach_to_widget(VALUE self, VALUE attach_widget)
 }
 
 static VALUE
-menu_detach(VALUE self)
+rg_detach(VALUE self)
 {
     gtk_menu_detach(_SELF(self));
     return self;
 }
 
-/* Defined as Properties
-GtkWidget *         gtk_menu_get_attach_widget          (GtkMenu *menu);
-*/
-
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-menu_s_get_for_attach_widget(VALUE self, VALUE widget)
+rg_s_get_for_attach_widget(G_GNUC_UNUSED VALUE self, VALUE widget)
 {
     /* Owned by GTK+ */
     return GLIST2ARY(gtk_menu_get_for_attach_widget(GTK_WIDGET(RVAL2GOBJ(widget))));
@@ -171,25 +159,25 @@ menu_s_get_for_attach_widget(VALUE self, VALUE widget)
 #endif
 
 void 
-Init_gtk_menu()
+Init_gtk_menu(VALUE mGtk)
 {
-    VALUE gMenu = G_DEF_CLASS(GTK_TYPE_MENU, "Menu", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_MENU, "Menu", mGtk);
 
-    rb_define_method(gMenu, "initialize", menu_initialize, 0);
+    RG_DEF_METHOD(initialize, 0);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gMenu, "set_screen", menu_set_screen, 1);
-    G_DEF_SETTER(gMenu, "screen");
+    RG_DEF_METHOD(set_screen, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "screen");
 #endif
-    rb_define_method(gMenu, "reorder_child", menu_reorder_child, 2);
+    RG_DEF_METHOD(reorder_child, 2);
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gMenu, "attach", menu_attach, 5);
+    RG_DEF_METHOD(attach, 5);
 #endif
-    rb_define_method(gMenu, "popup", menu_popup, 4);
-    rb_define_method(gMenu, "popdown", menu_popdown, 0);
-    rb_define_method(gMenu, "reposition", menu_reposition, 0);
-    rb_define_method(gMenu, "detach", menu_detach, 0);
+    RG_DEF_METHOD(popup, 4);
+    RG_DEF_METHOD(popdown, 0);
+    RG_DEF_METHOD(reposition, 0);
+    RG_DEF_METHOD(detach, 0);
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_singleton_method(gMenu, "get_for_attach_widget", menu_s_get_for_attach_widget, 1);
+    RG_DEF_SMETHOD(get_for_attach_widget, 1);
 #endif
-    rb_define_method(gMenu, "attach_to_widget", menu_attach_to_widget, 1);
+    RG_DEF_METHOD(attach_to_widget, 1);
 }

data/ext/gtk2/rbgtkmenubar.c

@@ -1,47 +1,47 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkmenubar.c -
-
-  $Author: mutoh $
-  $Date: 2005/09/18 02:42:01 $
-
-  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 cMenuBar
+
 static VALUE
-mbar_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_menu_bar_new());
     return Qnil;
 }
 
-/* Defined as property
-void        gtk_menu_bar_set_pack_direction (GtkMenuBar *menubar,
-                                             GtkPackDirection pack_dir);
-GtkPackDirection gtk_menu_bar_get_pack_direction
-                                            (GtkMenuBar *menubar);
-void        gtk_menu_bar_set_child_pack_direction
-                                            (GtkMenuBar *menubar,
-                                             GtkPackDirection child_pack_dir);
-GtkPackDirection gtk_menu_bar_get_child_pack_direction
-                                            (GtkMenuBar *menubar);
-*/
-
 void 
-Init_gtk_menu_bar()
+Init_gtk_menu_bar(VALUE mGtk)
 {
-    VALUE gMenuBar = G_DEF_CLASS(GTK_TYPE_MENU_BAR, "MenuBar", mGtk);
-    rb_define_method(gMenuBar, "initialize", mbar_initialize, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_MENU_BAR, "MenuBar", mGtk);
+    RG_DEF_METHOD(initialize, 0);
 
 #if GTK_CHECK_VERSION(2,8,0)
     /* GtkPackDirection */
-    G_DEF_CLASS(GTK_TYPE_PACK_DIRECTION, "PackDirection", gMenuBar);
-    G_DEF_CONSTANTS(gMenuBar, GTK_TYPE_PACK_DIRECTION, "GTK_");
+    G_DEF_CLASS(GTK_TYPE_PACK_DIRECTION, "PackDirection", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_PACK_DIRECTION, "GTK_");
 #endif
 }

data/ext/gtk2/rbgtkmenuitem.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkmenuitem.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 cMenuItem
 #define _SELF(s) (GTK_MENU_ITEM(RVAL2GOBJ(s)))
 
 static VALUE
-mitem_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     const gchar *label = NULL;
     VALUE rb_label, use_underline;
@@ -41,13 +52,6 @@ mitem_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/* Defined as Properties
-void                gtk_menu_item_set_right_justified   (GtkMenuItem *menu_item,
-                                                         gboolean right_justified);
-gboolean            gtk_menu_item_get_right_justified   (GtkMenuItem *menu_item);
-GtkWidget *         gtk_menu_item_get_submenu           (GtkMenuItem *menu_item);
-*/
-
 static VALUE
 mitem_set_submenu(VALUE self, VALUE child)
 {
@@ -64,13 +68,8 @@ mitem_set_submenu(VALUE self, VALUE child)
     return self;
 }
 
-/* Defined as Properties
-void                gtk_menu_item_set_accel_path        (GtkMenuItem *menu_item,
-                                                         const gchar *accel_path);
-*/
-
 static VALUE
-mitem_remove_submenu(VALUE self)
+rg_remove_submenu(VALUE self)
 {
     GtkMenuItem *item;
     GtkWidget *submenu;
@@ -84,14 +83,8 @@ mitem_remove_submenu(VALUE self)
     return self;
 }
 
-/* Defined as Signals
-void                gtk_menu_item_select                (GtkMenuItem *menu_item);
-void                gtk_menu_item_deselect              (GtkMenuItem *menu_item);
-void                gtk_menu_item_activate              (GtkMenuItem *menu_item);
-*/
-
 static VALUE
-mitem_toggle_size_request(VALUE self)
+rg_toggle_size_request(VALUE self)
 {
     gint requisition;
     gtk_menu_item_toggle_size_request(_SELF(self), &requisition);
@@ -99,20 +92,20 @@ mitem_toggle_size_request(VALUE self)
 }
 
 static VALUE
-mitem_toggle_size_allocate(VALUE self, VALUE allocation)
+rg_toggle_size_allocate(VALUE self, VALUE allocation)
 {
     gtk_menu_item_toggle_size_allocate(_SELF(self), NUM2INT(allocation));
     return self;
 }
 
 void 
-Init_gtk_menu_item()
+Init_gtk_menu_item(VALUE mGtk)
 {
-    VALUE gMenuItem = G_DEF_CLASS(GTK_TYPE_MENU_ITEM, "MenuItem", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_MENU_ITEM, "MenuItem", mGtk);
 
-    rb_define_method(gMenuItem, "initialize", mitem_initialize, -1);
-    G_REPLACE_SET_PROPERTY(gMenuItem, "submenu", mitem_set_submenu, 1);
-    rb_define_method(gMenuItem, "remove_submenu", mitem_remove_submenu, 0);
-    rb_define_method(gMenuItem, "toggle_size_request", mitem_toggle_size_request, 0);
-    rb_define_method(gMenuItem, "toggle_size_allocate", mitem_toggle_size_allocate, 1);
+    RG_DEF_METHOD(initialize, -1);
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "submenu", mitem_set_submenu, 1);
+    RG_DEF_METHOD(remove_submenu, 0);
+    RG_DEF_METHOD(toggle_size_request, 0);
+    RG_DEF_METHOD(toggle_size_allocate, 1);
 }

data/ext/gtk2/rbgtkmenushell.c

@@ -1,24 +1,35 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkmenushell.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  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 cMenuShell
 #define _SELF(self) (GTK_MENU_SHELL(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-mshell_append(VALUE self, VALUE child)
+rg_append(VALUE self, VALUE child)
 {
     gtk_menu_shell_append(_SELF(self),RVAL2WIDGET(child));
     G_CHILD_ADD(self, child);
@@ -26,7 +37,7 @@ mshell_append(VALUE self, VALUE child)
 }
 
 static VALUE
-mshell_prepend(VALUE self, VALUE child)
+rg_prepend(VALUE self, VALUE child)
 {
     gtk_menu_shell_prepend(_SELF(self), RVAL2WIDGET(child));
     G_CHILD_ADD(self, child);
@@ -34,7 +45,7 @@ mshell_prepend(VALUE self, VALUE child)
 }
 
 static VALUE
-mshell_insert(VALUE self, VALUE child, VALUE pos)
+rg_insert(VALUE self, VALUE child, VALUE pos)
 {
     gtk_menu_shell_insert(_SELF(self), RVAL2WIDGET(child),
                           NUM2INT(pos));
@@ -43,14 +54,14 @@ mshell_insert(VALUE self, VALUE child, VALUE pos)
 }
 
 static VALUE
-mshell_deactivate(VALUE self)
+rg_deactivate(VALUE self)
 {
     gtk_menu_shell_deactivate(_SELF(self));
     return self;
 }
 
 static VALUE
-mshell_select_item(VALUE self, VALUE menu_item)
+rg_select_item(VALUE self, VALUE menu_item)
 {
     gtk_menu_shell_select_item(_SELF(self), RVAL2WIDGET(menu_item));
     return self;
@@ -58,7 +69,7 @@ mshell_select_item(VALUE self, VALUE menu_item)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-mshell_select_first(VALUE self, VALUE search_sensitive)
+rg_select_first(VALUE self, VALUE search_sensitive)
 {
     gtk_menu_shell_select_first(_SELF(self), RVAL2CBOOL(search_sensitive));
     return self;
@@ -66,46 +77,36 @@ mshell_select_first(VALUE self, VALUE search_sensitive)
 #endif
 
 static VALUE
-mshell_deselect(VALUE self)
+rg_deselect(VALUE self)
 {
     gtk_menu_shell_deselect(_SELF(self));
     return self;
 }
 
 static VALUE
-mshell_activate_item(VALUE self, VALUE menu_item, VALUE force_deactivate)
+rg_activate_item(VALUE self, VALUE menu_item, VALUE force_deactivate)
 {
     gtk_menu_shell_activate_item(_SELF(self), RVAL2WIDGET(menu_item), 
                                  RVAL2CBOOL(force_deactivate));
     return self;
 }
 
-/* Defined as Signals
-void                gtk_menu_shell_cancel               (GtkMenuShell *menu_shell);
-*/
-
-/* Defined as properties
-void        gtk_menu_shell_set_take_focus   (GtkMenuShell *menu_shell,
-                                             gboolean take_focus);
-gboolean    gtk_menu_shell_get_take_focus   (GtkMenuShell *menu_shell);
-*/
-
 void 
-Init_gtk_menu_shell()
+Init_gtk_menu_shell(VALUE mGtk)
 {
-    VALUE gMenuShell = G_DEF_CLASS(GTK_TYPE_MENU_SHELL, "MenuShell", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_MENU_SHELL, "MenuShell", mGtk);
 
-    rb_define_method(gMenuShell, "append", mshell_append, 1);
-    rb_define_method(gMenuShell, "prepend", mshell_prepend, 1);
-    rb_define_method(gMenuShell, "insert", mshell_insert, 2);
-    rb_define_method(gMenuShell, "deactivate", mshell_deactivate, 0);
-    rb_define_method(gMenuShell, "select_item", mshell_select_item, 1);
+    RG_DEF_METHOD(append, 1);
+    RG_DEF_METHOD(prepend, 1);
+    RG_DEF_METHOD(insert, 2);
+    RG_DEF_METHOD(deactivate, 0);
+    RG_DEF_METHOD(select_item, 1);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gMenuShell, "select_first", mshell_select_first, 1);
+    RG_DEF_METHOD(select_first, 1);
 #endif
-    rb_define_method(gMenuShell, "deselect", mshell_deselect, 0);
-    rb_define_method(gMenuShell, "activate_item", mshell_activate_item, 2);
+    RG_DEF_METHOD(deselect, 0);
+    RG_DEF_METHOD(activate_item, 2);
     /* GtkMenuDirectionType */
-    G_DEF_CLASS(GTK_TYPE_MENU_DIRECTION_TYPE, "DirectionType", gMenuShell);
-    G_DEF_CONSTANTS(gMenuShell, GTK_TYPE_MENU_DIRECTION_TYPE, "GTK_MENU_");
+    G_DEF_CLASS(GTK_TYPE_MENU_DIRECTION_TYPE, "DirectionType", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_MENU_DIRECTION_TYPE, "GTK_MENU_");
 }