gtk2 1.0.0 → 1.0.1

data/ext/gtk2/rbgtknotebook.c

@@ -453,6 +453,5 @@ Init_gtk_notebook()
     rb_define_const(gNotebook, "TAB_FIRST", GTK_NOTEBOOK_TAB_FIRST);
     rb_define_const(gNotebook, "TAB_LAST", GTK_NOTEBOOK_TAB_LAST);
 
-    G_DEF_SETTERS(gNotebook);
     G_DEF_SIGNAL_FUNC(gNotebook, "switch_page", (GValToRValSignalFunc)signal_g2r_func);
 }

data/ext/gtk2/rbgtkoptionmenu.c

@@ -54,8 +54,7 @@ Init_gtk_option_menu()
     rb_define_method(gOptionMenu, "initialize", omenu_initialize, 0);
     rb_define_method(gOptionMenu, "remove_menu", omenu_remove_menu, 0);
     rb_define_method(gOptionMenu, "set_history", omenu_set_history, 1);
+    G_DEF_SETTER(gOptionMenu, "history");
     rb_define_method(gOptionMenu, "history", omenu_get_history, 0);
-
-    G_DEF_SETTERS(gOptionMenu);
 #endif
 }

data/ext/gtk2/rbgtkprintjob.c

@@ -141,11 +141,10 @@ Init_gtk_print_job()
     rb_define_method(gPrintJob, "initialize", pj_initialize, 4);
     rb_define_method(gPrintJob, "status", pj_get_status, 0);
     rb_define_method(gPrintJob, "set_source_file", pj_set_source_file, 1);
+    G_DEF_SETTER(gPrintJob, "source_file");
 #ifdef HAVE_RB_CAIRO_H
     rb_define_method(gPrintJob, "surface", pj_get_surface, 0);
 #endif
     rb_define_method(gPrintJob, "send", pj_send, 0);
-
-    G_DEF_SETTERS(gPrintJob);
 #endif
 }

data/ext/gtk2/rbgtkprintoperation.c

@@ -146,7 +146,5 @@ Init_gtk_print_operation()
     /* GtkPrintOperationResult */
     G_DEF_CLASS(GTK_TYPE_PRINT_OPERATION_RESULT, "Result", gPrintOperation);
     G_DEF_CONSTANTS(gPrintOperation, GTK_TYPE_PRINT_OPERATION_RESULT, "GTK_PRINT_OPERATION_");
-
-    G_DEF_SETTERS(gPrintOperation);
 #endif
 }

data/ext/gtk2/rbgtkradioaction.c

@@ -79,7 +79,6 @@ void
 Init_gtk_radio_action()
 {
 #if GTK_CHECK_VERSION(2,4,0)
-
     VALUE gRadioAction = G_DEF_CLASS(GTK_TYPE_RADIO_ACTION, "RadioAction", mGtk);
 
     rb_define_method(gRadioAction, "initialize", raction_initialize, 5);
@@ -87,12 +86,8 @@ Init_gtk_radio_action()
     /* Define as Property since 2.10 */
     rb_define_method(gRadioAction, "current_value", raction_get_current_value, 0);
 #endif
-    rb_undef_method(gRadioAction, "group");
-    rb_undef_method(gRadioAction, "set_group");
-    rb_define_method(gRadioAction, "group", raction_get_group, 0);
-    rb_define_method(gRadioAction, "set_group", raction_set_group, 1);
-
-    G_DEF_SETTERS(gRadioAction);
+    G_REPLACE_GET_PROPERTY(gRadioAction, "group", raction_get_group, 0);
+    G_REPLACE_SET_PROPERTY(gRadioAction, "group", raction_get_group, 1);
 #endif
 }
 

data/ext/gtk2/rbgtkradiobutton.c

@@ -64,7 +64,7 @@ rbtn_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 rbtn_group(VALUE self)
 {
-    /* Owened by GTK+ */
+    /* Owned by GTK+ */
     return GSLIST2ARY(gtk_radio_button_get_group(GTK_RADIO_BUTTON(RVAL2GOBJ(self))));
 }
 

data/ext/gtk2/rbgtkradiomenuitem.c

@@ -36,8 +36,8 @@ rmitem_initialize(int argc, VALUE *argv, VALUE self)
     VALUE arg1, arg2, arg3;
     GtkWidget *widget;
     GSList *list = NULL;
-    char *label = NULL;
-    char *mnemonic = NULL;
+    const gchar *label = NULL;
+    const gchar *mnemonic = NULL;
     
     if (rb_scan_args(argc, argv, "03", &arg1, &arg2, &arg3) > 0 &&
         TYPE(arg1) == T_STRING) {
@@ -102,8 +102,6 @@ Init_gtk_radio_menu_item()
     VALUE gRMenuItem = G_DEF_CLASS(GTK_TYPE_RADIO_MENU_ITEM, "RadioMenuItem", mGtk);
 
     rb_define_method(gRMenuItem, "initialize", rmitem_initialize, -1);
-    rb_define_method(gRMenuItem, "group", rmitem_get_group, 0);
-    rb_define_method(gRMenuItem, "set_group", rmitem_set_group, 1);
-
-    G_DEF_SETTERS(gRMenuItem);
+    G_REPLACE_GET_PROPERTY(gRMenuItem, "group", rmitem_get_group, 0);
+    G_REPLACE_SET_PROPERTY(gRMenuItem, "group", rmitem_set_group, 1);
 }

data/ext/gtk2/rbgtkradiotoolbutton.c

@@ -86,9 +86,7 @@ Init_gtk_radiotoolbutton()
     gRToolButton = G_DEF_CLASS(GTK_TYPE_RADIO_TOOL_BUTTON, "RadioToolButton", mGtk);
 
     rb_define_method(gRToolButton, "initialize", rbtn_initialize, -1);
-    rb_define_method(gRToolButton, "group", rbtn_get_group, 0);
-    rb_define_method(gRToolButton, "set_group", rbtn_set_group, 1);
-
-    G_DEF_SETTERS(gRToolButton);
+    G_REPLACE_GET_PROPERTY(gRToolButton, "group", rbtn_get_group, 0);
+    G_REPLACE_SET_PROPERTY(gRToolButton, "group", rbtn_set_group, 1);
 #endif
 }

data/ext/gtk2/rbgtkrange.c

@@ -83,8 +83,7 @@ Init_gtk_range()
   rb_define_method(gRange, "set_increments", range_set_increments, 2);
   rb_define_method(gRange, "set_range", range_set_range, 2);
   rb_define_method(gRange, "set_value", range_set_value, 1);
-
-  G_DEF_SETTERS(gRange);
+  G_DEF_SETTER(gRange, "value");
 
 #if GTK_CHECK_VERSION(2,10,0)
   /* GtkSensitivityType */

data/ext/gtk2/rbgtkrc.c

@@ -116,16 +116,15 @@ rc_get_default_files(VALUE self)
 }
 
 static VALUE
-rc_set_default_files(VALUE self, VALUE filenames)
+rc_set_default_files(VALUE self, VALUE rbfilenames)
 {
-    int i;
-    gchar** gfiles = g_new(gchar*, RARRAY_LEN(filenames) + 1);
-    for (i = 0; i < RARRAY_LEN(filenames); i++) {
-        gfiles[i] = RVAL2CSTR(RARRAY_PTR(filenames)[i]);
-    }
-    gfiles[RARRAY_LEN(filenames)] = NULL;
-    gtk_rc_set_default_files(gfiles);
-    return filenames;
+    gchar **filenames = (gchar **)RVAL2STRV(rbfilenames);
+
+    gtk_rc_set_default_files(filenames);
+
+    g_free(filenames);
+
+    return rbfilenames;
 }
 /*
 guint       gtk_rc_parse_color              (GScanner *scanner,

data/ext/gtk2/rbgtkrcstyle.c

@@ -29,7 +29,7 @@ rcstyle_name(VALUE self)
 static VALUE
 rcstyle_set_name(VALUE self, VALUE name)
 {
-    _SELF(self)->name = RVAL2CSTR(name);
+    _SELF(self)->name = g_strdup(RVAL2CSTR(name));
     return self;
 }
 
@@ -50,7 +50,7 @@ rcstyle_set_bg_pixmap_name(VALUE self, VALUE idx, VALUE bg_pixmap_name)
 
     if (i < 0 || 5 < i)
         rb_raise(rb_eArgError, "state out of range");
-    _SELF(self)->bg_pixmap_name[i] = RVAL2CSTR(bg_pixmap_name);
+    _SELF(self)->bg_pixmap_name[i] = g_strdup(RVAL2CSTR(bg_pixmap_name));
     return self;
 }
     

data/ext/gtk2/rbgtkrecentaction.c

@@ -44,6 +44,5 @@ Init_gtk_recentaction()
 #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);
-    G_DEF_SETTERS(gRecentaction);
 #endif
 }

data/ext/gtk2/rbgtkrecentchooser.c

@@ -186,7 +186,7 @@ rc_get_items(VALUE self)
 static VALUE
 rc_get_uris(VALUE self)
 {
-    int i;
+    gsize i;
     gsize size;
     gchar** uris = gtk_recent_chooser_get_uris(_SELF(self), &size);
     VALUE ary = rb_ary_new();
@@ -227,9 +227,11 @@ Init_gtk_recent_chooser()
   VALUE gRecentChooser = G_DEF_CLASS(GTK_TYPE_RECENT_CHOOSER, "RecentChooser", mGtk);
 
   rb_define_method(gRecentChooser, "set_show_numbers", rc_set_show_numbers, 1);
+  G_DEF_SETTER(gRecentChooser, "show_numbers");
   rb_define_method(gRecentChooser, "show_numbers", rc_get_show_numbers, 0);
   rb_define_method(gRecentChooser, "set_sort_func", rc_set_sort_func, 0);
   rb_define_method(gRecentChooser, "set_current_uri", rc_set_current_uri, 1);
+  G_DEF_SETTER(gRecentChooser, "current_uri");
   rb_define_method(gRecentChooser, "current_uri", rc_get_current_uri, 0);
   rb_define_method(gRecentChooser, "current_item", rc_get_current_item, 0);
   rb_define_method(gRecentChooser, "select_uri", rc_select_uri, 1);
@@ -242,8 +244,6 @@ Init_gtk_recent_chooser()
   rb_define_method(gRecentChooser, "remove_filter", rc_remove_filter, 1);
   rb_define_method(gRecentChooser, "filters", rc_list_filters, 0);
   
-  G_DEF_SETTERS(gRecentChooser);
-  
   /* GtkRecentChooserError */
   G_DEF_ERROR(GTK_RECENT_CHOOSER_ERROR, "RecentChooserError", mGtk, rb_eRuntimeError,
               GTK_TYPE_RECENT_CHOOSER_ERROR);

data/ext/gtk2/rbgtkrecentdata.c

@@ -64,7 +64,7 @@ rd_get_ ## name (VALUE self)\
 static VALUE \
 rd_set_ ## name (VALUE self, VALUE val)\
 {\
-    _SELF(self)->name = RVAL2CSTR(val);\
+    _SELF(self)->name = (gchar *)RVAL2CSTR(val);\
     return self;\
 }
 
@@ -91,14 +91,7 @@ rd_get_groups(VALUE self)
 static VALUE
 rd_set_groups(VALUE self, VALUE groups)
 {
-    gint i;
-    gint len = RARRAY_LEN(groups);
-    gchar** grps = g_new(gchar*, len + 1);
-    for (i = 0; i < len; i++) {
-        grps[i] = RVAL2CSTR(RARRAY_PTR(groups)[i]);
-    }
-    grps[len] = NULL;
-    _SELF(self)->groups = grps;
+    _SELF(self)->groups = RVAL2STRV_DUP(groups);
 
     return self;
 }

data/ext/gtk2/rbgtkrecentfilter.c

@@ -94,12 +94,13 @@ invoke_callback(VALUE arg_)
 static gboolean
 filter_func(const GtkRecentFilterInfo *info, gpointer func)
 {
+    VALUE result;
     struct callback_arg arg;
 
     arg.callback = (VALUE)func;
     arg.info = BOXED2RVAL((gpointer)info, GTK_TYPE_RECENT_FILTER_INFO);
   
-    VALUE result = G_PROTECT_CALLBACK(invoke_callback, &arg);
+    result = G_PROTECT_CALLBACK(invoke_callback, &arg);
     return NIL_P(rb_errinfo()) ? TRUE : RVAL2CBOOL(result);
 }
 

data/ext/gtk2/rbgtkrecentfilterinfo.c

@@ -103,14 +103,10 @@ rf_get_applications(VALUE self)
 static VALUE
 rf_set_applications(VALUE self, VALUE applications)
 {
-    gint i;
-    gint len = RARRAY_LEN(applications);
-    gchar** apps = g_new(gchar*, len + 1);
-    for (i = 0; i < len; i++) {
-        apps[i] = RVAL2CSTR(RARRAY_PTR(applications)[i]);
-    }
-    apps[len] = NULL;
-    _SELF(self)->applications = (const gchar**)apps;
+    /* NOTE: This can’t be right.  What guarantees that the entries in
+     * applications will be around?  It should be RVAL2STRV_DUP and use
+     * g_strfreev in free above. */
+    _SELF(self)->applications = RVAL2STRV(applications);
 
     return self;
 }
@@ -132,14 +128,7 @@ rf_get_groups(VALUE self)
 static VALUE
 rf_set_groups(VALUE self, VALUE groups)
 {
-    gint i;
-    gint len = RARRAY_LEN(groups);
-    gchar** grps = g_new(gchar*, len + 1);
-    for (i = 0; i < len; i++) {
-        grps[i] = RVAL2CSTR(RARRAY_PTR(groups)[i]);
-    }
-    grps[len] = NULL;
-    _SELF(self)->groups = (const gchar**)grps;
+    _SELF(self)->groups = RVAL2STRV(groups);
 
     return self;
 }

data/ext/gtk2/rbgtkrecentinfo.c

@@ -90,7 +90,7 @@ ri_get_application_info(VALUE self, VALUE app_name)
 static VALUE
 ri_get_applications(VALUE self)
 {
-    gint i;
+    gsize i;
     gsize length;
     gchar** str = gtk_recent_info_get_applications(_SELF(self), &length);
     VALUE ary = rb_ary_new();
@@ -110,7 +110,7 @@ ri_last_application(VALUE self)
 static VALUE
 ri_get_groups(VALUE self)
 {
-    gint i;
+    gsize i;
     gsize length;
     gchar** str = gtk_recent_info_get_groups(_SELF(self), &length);
     VALUE ary = rb_ary_new();

data/ext/gtk2/rbgtkrecentmanager.c

@@ -134,6 +134,7 @@ Init_gtk_recent_manager()
     rb_define_singleton_method(rm, "default", rm_s_get_default, 0);
     rb_define_singleton_method(rm, "get_for_screen", rm_s_get_for_screen, 1);
     rb_define_method(rm, "set_screen", rm_set_screen, 1);
+    G_DEF_SETTER(rm, "set_screen");
     rb_define_method(rm, "add_item", rm_add_item, -1);
     rb_define_method(rm, "remove_item", rm_remove_item, 1);
     rb_define_method(rm, "lookup_item", rm_lookup_item, 1);
@@ -142,8 +143,6 @@ Init_gtk_recent_manager()
     rb_define_method(rm, "items", rm_get_items, 0);
     rb_define_method(rm, "purge_items", rm_purge_items, 0);
 
-    G_DEF_SETTERS(rm);   
-
     /* GtkRecentManagerError */
     G_DEF_ERROR(GTK_RECENT_MANAGER_ERROR, "RecentManagerError", mGtk, rb_eRuntimeError,
                 GTK_TYPE_RECENT_MANAGER_ERROR);

data/ext/gtk2/rbgtkruler.c

@@ -16,12 +16,11 @@
 
 #define _SELF(self) (GTK_RULER(RVAL2GOBJ(self)))
 
-static VALUE
-ruler_set_metric(VALUE self, VALUE metric)
-{
-    gtk_ruler_set_metric(_SELF(self), RVAL2GENUM(metric, GTK_TYPE_METRIC_TYPE));
-    return self;
-}
+/* Defined as Properties
+void                gtk_ruler_set_metric                (GtkRuler *ruler,
+                                                         GtkMetricType metric);
+GtkMetricType       gtk_ruler_get_metric                (GtkRuler *ruler);
+*/
 
 static VALUE
 ruler_set_range(VALUE self, VALUE lower, VALUE upper, VALUE position, VALUE max_size)
@@ -31,12 +30,6 @@ ruler_set_range(VALUE self, VALUE lower, VALUE upper, VALUE position, VALUE max_
     return self;
 }
 
-static VALUE
-ruler_get_metric(VALUE self)
-{
-    return INT2FIX(gtk_ruler_get_metric(_SELF(self)));
-}
-
 static VALUE
 ruler_get_range(VALUE self)
 {
@@ -65,12 +58,9 @@ Init_gtk_ruler()
 {
     VALUE gRuler = G_DEF_CLASS(GTK_TYPE_RULER, "Ruler", mGtk);
 
-    rb_define_method(gRuler, "set_metric", ruler_set_metric, 1);
     rb_define_method(gRuler, "set_range", ruler_set_range, 4);
-    rb_define_method(gRuler, "metric", ruler_get_metric, 0);
+    G_DEF_SETTER(gRuler, "range");
     rb_define_method(gRuler, "range", ruler_get_range, 0);
     rb_define_method(gRuler, "draw_ticks", ruler_draw_ticks, 0);
     rb_define_method(gRuler, "draw_pos", ruler_draw_pos, 0);
-
-    G_DEF_SETTERS(gRuler);
 }

data/ext/gtk2/rbgtkscalebutton.c

@@ -18,9 +18,6 @@
 
 #define _SELF(s) (GTK_SCALE_BUTTON(RVAL2GOBJ(s)))
 
-static VALUE
-scalebutton_set_icons(VALUE self, VALUE icons);
-
 static VALUE
 scalebutton_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -44,50 +41,27 @@ scalebutton_initialize(int argc, VALUE *argv, VALUE self)
     widget = gtk_scale_button_new(RVAL2GENUM(arg1, GTK_TYPE_ICON_SIZE), min, max, step, NULL);
     RBGTK_INITIALIZE(self, widget);
 
-    if (!NIL_P(arg5))
-        scalebutton_set_icons(self, arg5);
+    if (!NIL_P(arg5)) {
+        const gchar **icons = RVAL2STRV(arg5);
 
-    return Qnil;
-}
+        gtk_scale_button_set_icons(_SELF(self), icons);
 
-static VALUE
-scalebutton_set_adjustment(VALUE self, VALUE adjustment)
-{
-    gtk_scale_button_set_adjustment(_SELF(self), RVAL2GOBJ(adjustment));
-    return self;
-}
-
-static VALUE
-scalebutton_set_icons(VALUE self, VALUE icons)
-{
-    int i;
-    gchar **icons_c = g_new0(gchar*, RARRAY_LEN(icons) + 1);
-    for (i = 0; i < RARRAY_LEN(icons); i++)
-        icons_c[i] = RVAL2CSTR(RARRAY_PTR(icons)[i]);
-    icons_c[i] = NULL;
-    gtk_scale_button_set_icons(_SELF(self), (const gchar **) icons_c);
-    g_free(icons_c);
-    return self;
-}
+        g_free(icons);
+    }
 
-static VALUE
-scalebutton_set_value(VALUE self, VALUE value)
-{
-    gtk_scale_button_set_value(_SELF(self), NUM2DBL(value));
-    return self;
-}
-
-static VALUE
-scalebutton_get_adjustment(VALUE self)
-{
-    return GOBJ2RVAL(gtk_scale_button_get_adjustment(_SELF(self)));
+    return Qnil;
 }
 
-static VALUE
-scalebutton_get_value(VALUE self)
-{
-    return rb_float_new(gtk_scale_button_get_value(_SELF(self)));
-}
+/* Defined as Properties
+void                gtk_scale_button_set_adjustment     (GtkScaleButton *button,
+                                                         GtkAdjustment *adjustment);
+void                gtk_scale_button_set_icons          (GtkScaleButton *button,
+                                                         const gchar **icons);
+void                gtk_scale_button_set_value          (GtkScaleButton *button,
+                                                         gdouble value);
+GtkAdjustment *     gtk_scale_button_get_adjustment     (GtkScaleButton *button);
+gdouble             gtk_scale_button_get_value          (GtkScaleButton *button);
+*/
 
 #endif
 
@@ -97,11 +71,5 @@ Init_gtk_scalebutton()
 #if GTK_CHECK_VERSION(2,12,0)
     VALUE gScaleButton = G_DEF_CLASS(GTK_TYPE_SCALE_BUTTON, "ScaleButton", mGtk);
     rb_define_method(gScaleButton, "initialize", scalebutton_initialize, -1);
-    rb_define_method(gScaleButton, "set_adjustment", scalebutton_set_adjustment, 1);
-    rb_define_method(gScaleButton, "set_icons", scalebutton_set_icons, 1);
-    rb_define_method(gScaleButton, "set_value", scalebutton_set_value, 1);
-    rb_define_method(gScaleButton, "adjustment", scalebutton_get_adjustment, 0);
-    rb_define_method(gScaleButton, "value", scalebutton_get_value, 0);
-    G_DEF_SETTERS(gScaleButton);
 #endif
 }

data/ext/gtk2/rbgtkscrolledwindow.c

@@ -144,6 +144,6 @@ Init_gtk_scrolled_window()
     rb_define_method(gScrolledWin, "unset_placement", scwin_unset_placement, 0);
     rb_define_method(gScrolledWin, "placement", scwin_get_placement, 0);
     rb_define_method(gScrolledWin, "set_placement", scwin_set_placement, 1);
+    G_DEF_SETTER(gScrolledWin, "placement");
 #endif
-    G_DEF_SETTERS(gScrolledWin);
 }