gtk2 1.0.0 → 1.0.1

data/ext/gtk2/rbgtkiconview.c

@@ -138,19 +138,10 @@ iview_get_selected_items(VALUE self)
     return ret;
 }
 
-static VALUE
-iview_select_all(VALUE self)
-{
-    gtk_icon_view_select_all(_SELF(self));
-    return self;
-}
-
-static VALUE
-iview_unselect_all(VALUE self)
-{
-    gtk_icon_view_unselect_all(_SELF(self));
-    return self;
-}
+/* Defined as Signals
+void                gtk_icon_view_select_all            (GtkIconView *icon_view);
+void                gtk_icon_view_unselect_all          (GtkIconView *icon_view);
+*/
  
 static VALUE
 iview_item_activated(VALUE self, VALUE path)
@@ -298,8 +289,6 @@ Init_gtk_iconview()
     rb_define_method(iview, "unselect_path", iview_unselect_path, 1);
     rb_define_method(iview, "path_is_selected?", iview_path_is_selected, 1);
     rb_define_method(iview, "selected_items", iview_get_selected_items, 0);
-    rb_define_method(iview, "select_all", iview_select_all, 0);
-    rb_define_method(iview, "unselect_all", iview_unselect_all, 0);
     rb_define_method(iview, "item_activated", iview_item_activated, 1);
 #endif
 #if GTK_CHECK_VERSION(2,8,0)

data/ext/gtk2/rbgtkimcontext.c

@@ -79,7 +79,7 @@ imcontext_set_surrounding(VALUE self, VALUE text, VALUE cursor_index)
 {
     StringValue(text);
     gtk_im_context_set_surrounding(_SELF(self),
-                                   RVAL2CSTR(text), RSTRING_LEN(text),
+                                   RSTRING_PTR(text), RSTRING_LEN(text),
                                    NUM2INT(cursor_index));
     return self;
 }

data/ext/gtk2/rbgtkinvisible.c

@@ -32,20 +32,11 @@ invisible_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-#if GTK_CHECK_VERSION(2,2,0)
-static VALUE
-invisible_set_screen(VALUE self, VALUE screen)
-{
-    gtk_invisible_set_screen(_SELF(self), GDK_SCREEN(RVAL2GOBJ(screen)));
-    return self;
-}
-
-static VALUE
-invisible_get_screen(VALUE self)
-{
-    return GOBJ2RVAL(gtk_invisible_get_screen(_SELF(self)));
-}
-#endif
+/* Defined as Properties
+void                gtk_invisible_set_screen            (GtkInvisible *invisible,
+                                                         GdkScreen *screen);
+GdkScreen *         gtk_invisible_get_screen            (GtkInvisible *invisible);
+*/
 
 void
 Init_invisible()
@@ -53,11 +44,4 @@ Init_invisible()
     VALUE gInvisible = G_DEF_CLASS(GTK_TYPE_INVISIBLE, "Invisible", mGtk);
 
     rb_define_method(gInvisible, "initialize", invisible_initialize, -1);
-
-#if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gInvisible, "set_screen", invisible_set_screen, 1);
-    rb_define_method(gInvisible, "screen", invisible_get_screen, 0);
-#endif
-
-    G_DEF_SETTERS(gInvisible);
 }

data/ext/gtk2/rbgtkitemfactory.c

@@ -122,9 +122,9 @@ create_factory_entry(GtkItemFactoryEntry *entry, VALUE self, VALUE path, VALUE i
 {
     VALUE action;
 
-    entry->path = NIL_P(path) ? NULL : RVAL2CSTR(path);
-    entry->item_type = NIL_P(item_type) ? "<Branch>" : RVAL2CSTR(item_type);
-    entry->accelerator = NIL_P(accel) ? NULL : RVAL2CSTR(accel);
+    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;

data/ext/gtk2/rbgtklabel.c

@@ -147,6 +147,4 @@ Init_gtk_label()
     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);
-
-    G_DEF_SETTERS(gLabel);
 }

data/ext/gtk2/rbgtklinkbutton.c

@@ -55,7 +55,5 @@ Init_gtk_link_button()
 
     rb_define_method(button, "initialize", lb_initialize, -1);
     rb_define_singleton_method(button, "set_uri_hook", lb_set_uri_hook, 0);
-
-    G_DEF_SETTERS(button);
 #endif
 }

data/ext/gtk2/rbgtkmain.c

@@ -87,7 +87,7 @@ gtk_m_init(int argc, VALUE *argv, VALUE self)
 {
     gint i, gargc;
     VALUE argary;
-    gchar** gargv;
+    char** gargv;
     VALUE progname;
 
     if (_initialized)
@@ -107,16 +107,13 @@ gtk_m_init(int argc, VALUE *argv, VALUE self)
     
     gargv = ALLOCA_N(char *, gargc + 1);
     progname = rb_gv_get("$0");
-    gargv[0] = RVAL2CSTR(progname);
+    gargv[0] = (char *)RVAL2CSTR(progname);
 
-    for (i = 0; i < gargc; i++) {
-        if (TYPE(RARRAY_PTR(argary)[i]) == T_STRING) {
-            gargv[i+1] = RVAL2CSTR(RARRAY_PTR(argary)[i]);
-        }
-        else {
-            gargv[i+1] = "";
-        }
-    }
+    for (i = 0; i < gargc; i++)
+        if (TYPE(RARRAY_PTR(argary)[i]) == T_STRING)
+            gargv[i+1] = (char *)RVAL2CSTR(RARRAY_PTR(argary)[i]);
+        else
+            gargv[i+1] = (char *)"";
     gargc++;
 
     {

data/ext/gtk2/rbgtkmenu.c

@@ -98,32 +98,14 @@ menu_popup(VALUE self, VALUE pshell, VALUE pitem, VALUE button, VALUE activate_t
     return self;
 }
 
-static VALUE
-menu_set_accel_group(VALUE self, VALUE accel_group)
-{
-    gtk_menu_set_accel_group(_SELF(self), 
-                             GTK_ACCEL_GROUP(RVAL2GOBJ(accel_group)));
-    return self;
-}
-
-static VALUE
-menu_get_accel_group(VALUE self)
-{
-    return GOBJ2RVAL(gtk_menu_get_accel_group(_SELF(self)));
-}
-
-static VALUE
-menu_set_accel_path(VALUE self, VALUE accel_path)
-{
-    gtk_menu_set_accel_path(_SELF(self), RVAL2CSTR(accel_path));
-    return self;
-}
-
-static VALUE
-menu_get_tearoff_state(VALUE self)
-{
-    return CBOOL2RVAL(gtk_menu_get_tearoff_state(_SELF(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)
@@ -139,28 +121,16 @@ menu_reposition(VALUE self)
     return self;
 }
 
-static VALUE
-menu_get_active(VALUE self)
-{
-    GtkWidget *mitem = gtk_menu_get_active(_SELF(self));
-
-    return (mitem == NULL) ? Qnil : GOBJ2RVAL(mitem);
-}
-
-static VALUE
-menu_set_active(VALUE self, VALUE active)
-{
-    gtk_menu_set_active(_SELF(self), NUM2INT(active));
-    return self;
-}
-
-static VALUE
-menu_set_tearoff_state(VALUE self, VALUE torn_off)
-{
-    gtk_menu_set_tearoff_state(_SELF(self), RVAL2CBOOL(torn_off));
-    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)
@@ -187,11 +157,9 @@ menu_detach(VALUE self)
     return self;
 }
 
-static VALUE
-menu_get_attach_widget(VALUE self)
-{
-    return GOBJ2RVAL(gtk_menu_get_attach_widget(_SELF(self)));
-}
+/* Defined as Properties
+GtkWidget *         gtk_menu_get_attach_widget          (GtkMenu *menu);
+*/
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
@@ -202,14 +170,6 @@ menu_s_get_for_attach_widget(VALUE self, VALUE widget)
 }
 #endif
 
-#if GTK_CHECK_VERSION(2,4,0)
-static VALUE
-menu_set_monitor(VALUE self, VALUE monitor_num)
-{
-    gtk_menu_set_monitor(_SELF(self), NUM2INT(monitor_num));
-    return self;
-}
-#endif
 void 
 Init_gtk_menu()
 {
@@ -218,6 +178,7 @@ Init_gtk_menu()
     rb_define_method(gMenu, "initialize", menu_initialize, 0);
 #if GTK_CHECK_VERSION(2,2,0)
     rb_define_method(gMenu, "set_screen", menu_set_screen, 1);
+    G_DEF_SETTER(gMenu, "screen");
 #endif
     rb_define_method(gMenu, "reorder_child", menu_reorder_child, 2);
 #if GTK_CHECK_VERSION(2,4,0)
@@ -226,22 +187,9 @@ Init_gtk_menu()
     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, "set_accel_group", menu_set_accel_group, 1);
-    rb_define_method(gMenu, "accel_group", menu_get_accel_group, 0);
-    rb_define_method(gMenu, "set_accel_path", menu_set_accel_path, 1);
-    rb_define_method(gMenu, "tearoff_state?", menu_get_tearoff_state, 0);
-    rb_define_method(gMenu, "active", menu_get_active, 0);
-    rb_define_method(gMenu, "set_active", menu_set_active, 1);
-    rb_define_method(gMenu, "set_tearoff_state", menu_set_tearoff_state, 1);
     rb_define_method(gMenu, "detach", menu_detach, 0);
-    rb_define_method(gMenu, "attach_widget", menu_get_attach_widget, 0);
 #if GTK_CHECK_VERSION(2,6,0)
     rb_define_singleton_method(gMenu, "get_for_attach_widget", menu_s_get_for_attach_widget, 1);
 #endif
     rb_define_method(gMenu, "attach_to_widget", menu_attach_to_widget, 1);
-#if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gMenu, "set_monitor", menu_set_monitor, 1);
-#endif
-
-    G_DEF_SETTERS(gMenu);
 }

data/ext/gtk2/rbgtkmenuitem.c

@@ -41,12 +41,12 @@ mitem_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-static VALUE
-mitem_set_right_justified(VALUE self, VALUE right_justified)
-{
-    gtk_menu_item_set_right_justified(_SELF(self), RVAL2CBOOL(right_justified));
-    return self;
-}
+/* 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,12 +64,10 @@ mitem_set_submenu(VALUE self, VALUE child)
     return self;
 }
 
-static VALUE
-mitem_set_accel_path(VALUE self, VALUE accel_path)
-{
-    gtk_menu_item_set_accel_path(_SELF(self), RVAL2CSTR(accel_path));
-    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)
@@ -86,26 +84,11 @@ mitem_remove_submenu(VALUE self)
     return self;
 }
 
-static VALUE
-mitem_select(VALUE self)
-{
-    gtk_menu_item_select(_SELF(self));
-    return self;
-}
-
-static VALUE
-mitem_deselect(VALUE self)
-{
-    gtk_menu_item_deselect(_SELF(self));
-    return self;
-}
-
-static VALUE
-mitem_activate(VALUE self)
-{
-    gtk_menu_item_activate(_SELF(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)
@@ -122,36 +105,14 @@ mitem_toggle_size_allocate(VALUE self, VALUE allocation)
     return self;
 }
 
-static VALUE
-mitem_get_right_justified(VALUE self)
-{
-    return CBOOL2RVAL(gtk_menu_item_get_right_justified(_SELF(self)));
-}
-
-static VALUE
-mitem_get_submenu(VALUE self)
-{
-    GtkWidget* submenu = gtk_menu_item_get_submenu(_SELF(self));
-    return submenu ? GOBJ2RVAL(submenu) : Qnil;
-}
-
 void 
 Init_gtk_menu_item()
 {
     VALUE gMenuItem = G_DEF_CLASS(GTK_TYPE_MENU_ITEM, "MenuItem", mGtk);
 
     rb_define_method(gMenuItem, "initialize", mitem_initialize, -1);
-    rb_define_method(gMenuItem, "set_right_justified", mitem_set_right_justified, 1);
-    rb_define_method(gMenuItem, "set_submenu", mitem_set_submenu, 1);
-    rb_define_method(gMenuItem, "set_accel_path", mitem_set_accel_path, 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, "select", mitem_select, 0);
-    rb_define_method(gMenuItem, "deselect", mitem_deselect, 0);
-    rb_define_method(gMenuItem, "activate", mitem_activate, 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);
-    rb_define_method(gMenuItem, "right_justified?", mitem_get_right_justified, 0);
-    rb_define_method(gMenuItem, "submenu", mitem_get_submenu, 0);
-
-    G_DEF_SETTERS(gMenuItem);
 }

data/ext/gtk2/rbgtkmenushell.c

@@ -80,14 +80,9 @@ mshell_activate_item(VALUE self, VALUE menu_item, VALUE force_deactivate)
     return self;
 }
 
-#if GTK_CHECK_VERSION(2,4,0)
-static VALUE
-mshell_cancel(VALUE self)
-{
-    gtk_menu_shell_cancel(_SELF(self));
-    return self;
-}
-#endif
+/* Defined as Signals
+void                gtk_menu_shell_cancel               (GtkMenuShell *menu_shell);
+*/
 
 /* Defined as properties
 void        gtk_menu_shell_set_take_focus   (GtkMenuShell *menu_shell,
@@ -110,9 +105,6 @@ Init_gtk_menu_shell()
 #endif
     rb_define_method(gMenuShell, "deselect", mshell_deselect, 0);
     rb_define_method(gMenuShell, "activate_item", mshell_activate_item, 2);
-#if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gMenuShell, "cancel", mshell_cancel, 0);
-#endif
     /* GtkMenuDirectionType */
     G_DEF_CLASS(GTK_TYPE_MENU_DIRECTION_TYPE, "DirectionType", gMenuShell);
     G_DEF_CONSTANTS(gMenuShell, GTK_TYPE_MENU_DIRECTION_TYPE, "GTK_MENU_");

data/ext/gtk2/rbgtkmessagedialog.c

@@ -55,21 +55,16 @@ void        gtk_message_dialog_set_image    (GtkMessageDialog *dialog,
                                              GtkWidget *image);
 */
 
-#if GTK_CHECK_VERSION(2,6,0)
-static VALUE
-mdiag_format_secondary_text(VALUE self, VALUE text)
-{
-    gtk_message_dialog_format_secondary_text(_SELF(self), RVAL2CSTR(text), NULL);
-    return self;
-}
-
-static VALUE
-mdiag_format_secondary_markup(VALUE self, VALUE markup)
-{
-    gtk_message_dialog_format_secondary_markup(_SELF(self), RVAL2CSTR(markup), NULL);
-    return self;
-}
-#endif
+/* Not needed in Ruby
+void                gtk_message_dialog_format_secondary_text
+                                                        (GtkMessageDialog *message_dialog,
+                                                         const gchar *message_format,
+                                                         ...);
+void                gtk_message_dialog_format_secondary_markup
+                                                        (GtkMessageDialog *message_dialog,
+                                                         const gchar *message_format,
+                                                         ...);
+*/
 
 void 
 Init_gtk_message_dialog()
@@ -79,12 +74,8 @@ Init_gtk_message_dialog()
     rb_define_method(gMessageDialog, "initialize", mdiag_initialize, -1);
 #if GTK_CHECK_VERSION(2,4,0)
     rb_define_method(gMessageDialog, "set_markup", mdiag_set_markup, 1);
+    G_DEF_SETTER(gMessageDialog, "markup");
 #endif
-#if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gMessageDialog, "set_secondary_text", mdiag_format_secondary_text, 1);
-    rb_define_method(gMessageDialog, "set_secondary_markup", mdiag_format_secondary_markup, 1);
-#endif
-    G_DEF_SETTERS(gMessageDialog);
 
     /* GtkMessageType */
     G_DEF_CLASS(GTK_TYPE_MESSAGE_TYPE, "Type", gMessageDialog);