gtk2 1.0.0 → 1.0.1

data/ext/gtk2/rbgtkselectiondata.c

@@ -33,7 +33,7 @@ rbgtk_atom2selectiondata(VALUE type, VALUE size, VALUE src, GdkAtom *gtype,
         fmt = sizeof(int) * 8;
         len = 1;
     } else if(ntype == GDK_SELECTION_TYPE_STRING) {
-        dat = RVAL2CSTR(src);
+        dat = (void *)RVAL2CSTR(src);
 	if (NIL_P(size)) {
 	    fmt = sizeof(char) * 8;
 	    len = RSTRING_LEN(src);
@@ -45,7 +45,7 @@ rbgtk_atom2selectiondata(VALUE type, VALUE size, VALUE src, GdkAtom *gtype,
         guchar* str = (guchar*)dat;
         gdk_string_to_compound_text(RVAL2CSTR(src), &ntype, &fmt, &str, &len);
     } else if(type != Qnil && size != Qnil && src != Qnil) {
-    	dat = RVAL2CSTR(src);
+    	dat = (void *)RVAL2CSTR(src);
 	fmt = NUM2INT(size);
 	len = (RSTRING_LEN(src) * sizeof(char) / fmt);
     } else {
@@ -137,14 +137,10 @@ gtkselectiondata_set(int argc, VALUE *argv, VALUE self)
 static VALUE
 gtkselectiondata_set_text(VALUE self, VALUE str)
 {
-    gboolean ret;
     StringValue(str);
 
-    ret = gtk_selection_data_set_text(_SELF(self), RVAL2CSTR(str),
-                                      RSTRING_LEN(str));
-
-    if (!ret) 
-        rb_raise(rb_eRuntimeError, "the selection wasn't successfully.");
+    if (!gtk_selection_data_set_text(_SELF(self), RSTRING_PTR(str), RSTRING_LEN(str)))
+        rb_raise(rb_eRuntimeError, "the selection wasn't successfully set");
 
     return self;
 }
@@ -152,23 +148,15 @@ gtkselectiondata_set_text(VALUE self, VALUE str)
 static VALUE
 gtkselectiondata_get_text(VALUE self)
 {
-    VALUE ret = Qnil;
-    guchar* text = gtk_selection_data_get_text(_SELF(self));
-    if (text) {
-        ret = CSTR2RVAL((const char*)text);
-        g_free(text);
-    }
-    return ret;
+    return CSTR2RVAL_FREE((gchar *)gtk_selection_data_get_text(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
 gtkselectiondata_set_pixbuf(VALUE self, VALUE pixbuf)
 {
-    gboolean ret = gtk_selection_data_set_pixbuf(_SELF(self), 
-                                                 GDK_PIXBUF(RVAL2GOBJ(pixbuf)));
-    if (!ret) 
-        rb_raise(rb_eRuntimeError, "the selection wasn't successfully.");
+    if (!gtk_selection_data_set_pixbuf(_SELF(self), GDK_PIXBUF(RVAL2GOBJ(pixbuf))))
+        rb_raise(rb_eRuntimeError, "the selection wasn't successfully set");
 
     return self;
 }
@@ -183,23 +171,11 @@ static VALUE
 gtkselectiondata_set_uris(VALUE self, VALUE uris)
 {
     gboolean ret;
-    gchar** guris;
-    int i, n_targets;
+    gchar **guris;
     
-    Check_Type(uris, T_ARRAY);
-    n_targets = RARRAY_LEN(uris);
- 
-    guris = g_new(gchar*, n_targets + 1);
-
-    for (i = 0; i < n_targets; i++) {
-        guris[i] = RVAL2CSTR(RARRAY_PTR(uris)[i]);
-    }
-    guris[n_targets] = NULL;
-
+    guris = (gchar **)RVAL2STRV(uris);
     ret = gtk_selection_data_set_uris(_SELF(self), guris);
-
-    g_strfreev(guris);
-
+    g_free(guris);
     if (!ret) 
         rb_raise(rb_eRuntimeError, "the selection wasn't successfully.");
 

data/ext/gtk2/rbgtksettings.c

@@ -163,7 +163,7 @@ settings_set_property_value(VALUE self, VALUE name, VALUE value, VALUE origin)
     g_value_init(&svalue.value, RVAL2GTYPE(value));
     rbgobj_rvalue_to_gvalue(value, &svalue.value);
 
-    svalue.origin = RVAL2CSTR(origin);
+    svalue.origin = (char *)RVAL2CSTR(origin);
     gtk_settings_set_property_value(GTK_SETTINGS(RVAL2GOBJ(self)), 
                                     RVAL2CSTR(name), &svalue);
     g_value_unset(&svalue.value);

data/ext/gtk2/rbgtkspinner.c

@@ -3,9 +3,6 @@
 
   rbgtkspinner.c -
 
-  $Author: masaakiaoyagi $
-  $Date: 2011-02-19 09:24:49 +0900 (土, 19  2月 2011) $
-
   Copyright (C) 2011 Ruby-GNOME2 Project Team
 ************************************************/
 

data/ext/gtk2/rbgtkstatusbar.c

@@ -53,18 +53,11 @@ statusbar_remove(VALUE self, VALUE cid, VALUE mid)
     return self;
 }
 
-static VALUE
-statusbar_set_has_resize_grip(VALUE self, VALUE setting)
-{
-    gtk_statusbar_set_has_resize_grip(_SELF(self), RVAL2CBOOL(setting));
-    return self;
-}
-
-static VALUE
-statusbar_get_has_resize_grip(VALUE self)
-{
-    return CBOOL2RVAL(gtk_statusbar_get_has_resize_grip(_SELF(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()
@@ -76,8 +69,4 @@ Init_gtk_statusbar()
     rb_define_method(gStatusBar, "push", statusbar_push, 2);
     rb_define_method(gStatusBar, "pop", statusbar_pop, 1);
     rb_define_method(gStatusBar, "remove", statusbar_remove, 2);
-    rb_define_method(gStatusBar, "set_has_resize_grip", statusbar_set_has_resize_grip, 1);
-    rb_define_method(gStatusBar, "has_resize_grip?", statusbar_get_has_resize_grip, 0);
-
-    G_DEF_SETTERS(gStatusBar);
 }

data/ext/gtk2/rbgtkstatusicon.c

@@ -54,6 +54,7 @@ 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
@@ -63,12 +64,6 @@ si_set_tooltip(VALUE self, VALUE tooltip_text)
     return self;
 }
 
-static VALUE
-si_is_embedded(VALUE self)
-{
-    return CBOOL2RVAL(gtk_status_icon_is_embedded(_SELF(self)));
-}
-
 static VALUE
 si_position_menu(VALUE self, VALUE menu)
 {
@@ -106,10 +101,8 @@ Init_gtk_status_icon()
 
     rb_define_method(si, "initialize", si_initialize, 0);
     rb_define_method(si, "set_tooltip", si_set_tooltip, 1);
-    rb_define_method(si, "embedded?", si_is_embedded, 0);
+    G_DEF_SETTER(si, "tooltip");
     rb_define_method(si, "position_menu", si_position_menu, 1);
     rb_define_method(si, "geometry", si_get_geometry, 0);
-
-    G_DEF_SETTERS(si);   
 #endif
 }

data/ext/gtk2/rbgtkstock.c

@@ -30,10 +30,10 @@ stock_m_add(int argc, VALUE *argv, VALUE klass)
     rb_scan_args(argc, argv, "23", &stock_id, &label, &modifier, &keyval, &translation_domain);
     Check_Symbol(stock_id);
     item.stock_id = (gchar *)SYM2CSTR(stock_id);
-    item.label = RVAL2CSTR(label);
+    item.label = (gchar *)RVAL2CSTR(label);
     item.modifier = NIL_P(modifier) ? 0 : NUM2UINT(modifier);
     item.keyval = NIL_P(keyval) ? 0 : NUM2UINT(keyval);
-    item.translation_domain = NIL_P(translation_domain) ? NULL : RVAL2CSTR(translation_domain);
+    item.translation_domain = NIL_P(translation_domain) ? NULL : (gchar *)RVAL2CSTR(translation_domain);
     gtk_stock_add(&item, 1);
     return Qnil;
 }
@@ -70,11 +70,11 @@ stock_m_list_ids(VALUE klass)
 }
 
 #if GTK_CHECK_VERSION(2,8,0)
-static gchar*
+static gchar *
 translate_func(const gchar *path, gpointer func)
 {
     VALUE ret = rb_funcall((VALUE)func, id_call, 1, CSTR2RVAL(path));
-    return RVAL2CSTR(ret);
+    return (gchar *)RVAL2CSTR(ret);
 }
 
 static VALUE

data/ext/gtk2/rbgtktable.c

@@ -143,29 +143,24 @@ Init_gtk_table()
 {
     VALUE gTable = G_DEF_CLASS(GTK_TYPE_TABLE, "Table", mGtk);
 
-    /* Undef properties, column/row-spacing confuse us ... */
-    rb_undef_method(gTable, "set_row_spacing");
-    rb_undef_method(gTable, "set_column_spacing");
-    rb_undef_method(gTable, "row_spacing=");
-    rb_undef_method(gTable, "column_spacing=");
-    rb_undef_method(gTable, "row_spacing");
-    rb_undef_method(gTable, "column_spacing");
-
     rb_define_method(gTable, "initialize", tbl_initialize, -1);
     rb_define_method(gTable, "resize", tbl_resize, 2);
     rb_define_method(gTable, "attach", tbl_attach, -1);
     rb_define_method(gTable, "attach_defaults", tbl_attach_defaults, 5);
-    rb_define_method(gTable, "set_row_spacing", tbl_set_row_spacing, 2);
-    rb_define_method(gTable, "set_column_spacing", tbl_set_col_spacing, 2);
+    G_REPLACE_SET_PROPERTY(gTable, "row_spacing", tbl_set_row_spacing, 2);
+    rb_undef_method(gTable, "row_spacing=");
+    G_REPLACE_SET_PROPERTY(gTable, "column_spacing", tbl_set_col_spacing, 2);
+    rb_undef_method(gTable, "column_spacing=");
     rb_define_method(gTable, "get_row_spacing", tbl_get_row_spacing, 1);
+    rb_undef_method(gTable, "row_spacing");
     rb_define_method(gTable, "get_column_spacing", tbl_get_col_spacing, 1);
+    rb_undef_method(gTable, "column_spacing");
     rb_define_method(gTable, "set_row_spacings", tbl_set_row_spacings, 1);
+    G_DEF_SETTER(gTable, "row_spacings");
     rb_define_method(gTable, "set_column_spacings", tbl_set_col_spacings, 1);
+    G_DEF_SETTER(gTable, "column_spacings");
     rb_define_method(gTable, "row_spacings", tbl_get_row_spacings, 0);
     rb_define_method(gTable, "column_spacings", tbl_get_col_spacings, 0);
     rb_define_method(gTable, "default_row_spacing", tbl_get_default_row_spacing, 0);
     rb_define_method(gTable, "default_column_spacing", tbl_get_default_col_spacing, 0);
-
-    G_DEF_SETTERS(gTable);
-
 }

data/ext/gtk2/rbgtktextattributes.c

@@ -182,8 +182,6 @@ Init_txt_attr()
     rb_define_method(gTextAttributes, "set_invisible", txt_attr_bool_set_invisible, 1);
     rb_define_method(gTextAttributes, "bg_full_height?", txt_attr_bool_bg_full_height, 0);
     rb_define_method(gTextAttributes, "set_bg_full_height", txt_attr_bool_set_bg_full_height, 1);
-    rb_define_method(gTextAttributes, "bg_full_height?", txt_attr_bool_bg_full_height, 0);
-    rb_define_method(gTextAttributes, "set_bg_full_height", txt_attr_bool_set_bg_full_height, 1);
     rb_define_method(gTextAttributes, "editable?", txt_attr_bool_editable, 0);
     rb_define_method(gTextAttributes, "set_editable", txt_attr_bool_set_editable, 1);
     rb_define_method(gTextAttributes, "realized?", txt_attr_bool_realized, 0);

data/ext/gtk2/rbgtktextbuffer.c

@@ -49,17 +49,15 @@ txt_get_char_count(VALUE self)
     return INT2NUM(gtk_text_buffer_get_char_count(_SELF(self)));
 }
 
-static VALUE
-txt_get_tag_table(VALUE self)
-{
-    return GOBJ2RVAL(gtk_text_buffer_get_tag_table(_SELF(self)));
-}
+/* Defined as Properties:
+GtkTextTagTable *   gtk_text_buffer_get_tag_table       (GtkTextBuffer *buffer);
+*/
 
 static VALUE
 txt_set_text(VALUE self, VALUE text)
 {
     StringValue(text);
-    gtk_text_buffer_set_text(_SELF(self), RVAL2CSTR(text), RSTRING_LEN(text));
+    gtk_text_buffer_set_text(_SELF(self), RSTRING_PTR(text), RSTRING_LEN(text));
     return self;
 }
 
@@ -77,17 +75,18 @@ static VALUE
 txt_insert_at_cursor(VALUE self, VALUE text)
 {
     StringValue(text);
-    gtk_text_buffer_insert_at_cursor(_SELF(self),
-                                     RVAL2CSTR(text), RSTRING_LEN(text));
+    gtk_text_buffer_insert_at_cursor(_SELF(self), RSTRING_PTR(text), RSTRING_LEN(text));
     return self;
 }
 
 static VALUE
 txt_insert_interactive(VALUE self, VALUE iter, VALUE text, VALUE editable)
 {
+    StringValue(text);
+
     return CBOOL2RVAL(gtk_text_buffer_insert_interactive(_SELF(self),
                                                          RVAL2ITR(iter),
-                                                         RVAL2CSTR(text),
+                                                         RSTRING_PTR(text),
                                                          RSTRING_LEN(text),
                                                          RVAL2CBOOL(editable)));
 }
@@ -95,8 +94,10 @@ txt_insert_interactive(VALUE self, VALUE iter, VALUE text, VALUE editable)
 static VALUE
 txt_insert_interactive_at_cursor(VALUE self, VALUE text, VALUE editable)
 {
+    StringValue(text);
+
     return CBOOL2RVAL(gtk_text_buffer_insert_interactive_at_cursor(_SELF(self),
-                                                                   RVAL2CSTR(text),
+                                                                   RSTRING_PTR(text),
                                                                    RSTRING_LEN(text),
                                                                    RVAL2CBOOL(editable)));
 }
@@ -346,6 +347,7 @@ txt_deserialize(VALUE self, VALUE content_buffer, VALUE format, VALUE iter, VALU
     GError* error = NULL;
     gboolean ret;
 
+    /* TODO: Why not StringValue(data)? */
     Check_Type(data, T_STRING);
     ret = gtk_text_buffer_deserialize(_SELF(self), _SELF(content_buffer),
                                       RVAL2ATOM(format),
@@ -493,6 +495,7 @@ serialize_func(GtkTextBuffer *register_buffer, GtkTextBuffer *content_buffer, Gt
 
     /* This should return data as String */
     result = G_PROTECT_CALLBACK(invoke_callback, &arg);
+    /* TODO: Why not StringValue(result)? */
     Check_Type(result, T_STRING);
     *length = RSTRING_LEN(result);
     return (guint8*)(NIL_P(rb_errinfo()) ? RSTRING_PTR(result) : NULL);
@@ -676,7 +679,7 @@ txt_insert(int argc, VALUE *argv, VALUE self)
         start_offset = gtk_text_iter_get_offset(RVAL2ITR(where));
         StringValue(value);
         gtk_text_buffer_insert(_SELF(self), RVAL2ITR(where),
-                               RVAL2CSTR(value), RSTRING_LEN(value));
+                               RSTRING_PTR(value), RSTRING_LEN(value));
         
         if (RARRAY_LEN(tags) == 0)
             return self;
@@ -808,9 +811,8 @@ Init_gtk_textbuffer()
     rb_define_method(gTextBuffer, "initialize", txt_initialize, -1);
     rb_define_method(gTextBuffer, "line_count", txt_get_line_count, 0);
     rb_define_method(gTextBuffer, "char_count", txt_get_char_count, 0);
-    rb_define_method(gTextBuffer, "tag_table", txt_get_tag_table, 0);
 
-    rb_define_method(gTextBuffer, "set_text", txt_set_text, 1);
+    G_REPLACE_SET_PROPERTY(gTextBuffer, "text", txt_set_text, 1);
     rb_define_method(gTextBuffer, "insert", txt_insert, -1);
     rb_define_method(gTextBuffer, "insert_with_tags", txt_insert_with_tags, -1);
 #if GTK_CHECK_VERSION(2,6,0)
@@ -826,7 +828,7 @@ Init_gtk_textbuffer()
     rb_define_method(gTextBuffer, "delete_interactive", txt_delete_interactive, 3);
 
     rb_define_method(gTextBuffer, "get_text", txt_get_text, -1);
-    rb_define_method(gTextBuffer, "text", txt_get_text_all, 0);
+    G_REPLACE_GET_PROPERTY(gTextBuffer, "text", txt_get_text_all, 0);
     rb_define_method(gTextBuffer, "get_slice", txt_get_slice, -1);
     rb_define_method(gTextBuffer, "slice", txt_get_slice_all, 0);
 
@@ -852,6 +854,7 @@ Init_gtk_textbuffer()
 #endif
     rb_define_method(gTextBuffer, "modified?", txt_get_modified, 0);
     rb_define_method(gTextBuffer, "set_modified", txt_set_modified, 1);
+    G_DEF_SETTER(gTextBuffer, "modified");
 
     rb_define_method(gTextBuffer, "add_selection_clipboard", txt_add_selection_clipboard, 1);
     rb_define_method(gTextBuffer, "remove_selection_clipboard", txt_remove_selection_clipboard, 1);
@@ -894,7 +897,5 @@ Init_gtk_textbuffer()
     rb_define_method(gTextBuffer, "apply_tag", txt_apply_tag, 3);
     rb_define_method(gTextBuffer, "remove_tag", txt_remove_tag, 3);
     rb_define_method(gTextBuffer, "remove_all_tags", txt_remove_all_tags, 2);
-
-    G_DEF_SETTERS(gTextBuffer);
 }
 

data/ext/gtk2/rbgtktextmark.c

@@ -38,11 +38,9 @@ get_visible(VALUE self)
     return CBOOL2RVAL(gtk_text_mark_get_visible(_SELF(self)));
 }
 
-static VALUE
-get_name(VALUE self)
-{
-    return CSTR2RVAL(gtk_text_mark_get_name(_SELF(self)));
-}
+/* Defined as Properties:
+const gchar *       gtk_text_mark_get_name              (GtkTextMark *mark);
+*/
 
 static VALUE
 get_deleted(VALUE self)
@@ -56,11 +54,9 @@ get_buffer(VALUE self)
     return GOBJ2RVAL(gtk_text_mark_get_buffer(_SELF(self)));
 }
 
-static VALUE
-get_left_gravity(VALUE self)
-{
-    return CBOOL2RVAL(gtk_text_mark_get_left_gravity(_SELF(self)));
-}
+/* Defined as Properties:
+gboolean            gtk_text_mark_get_left_gravity      (GtkTextMark *mark);
+*/
 
 void 
 Init_gtk_textmark()
@@ -70,11 +66,8 @@ Init_gtk_textmark()
     rb_define_method(gTextMark, "initialize", initialize, 2);
 #endif
     rb_define_method(gTextMark, "set_visible", set_visible, 1);
+    G_DEF_SETTER(gTextMark, "visible");
     rb_define_method(gTextMark, "visible?", get_visible, 0);
-    rb_define_method(gTextMark, "name", get_name, 0);
     rb_define_method(gTextMark, "deleted?", get_deleted, 0);
     rb_define_method(gTextMark, "buffer", get_buffer, 0);
-    rb_define_method(gTextMark, "left_gravity?", get_left_gravity, 0);
-
-    G_DEF_SETTERS(gTextMark);
 }

data/ext/gtk2/rbgtktexttag.c

@@ -50,10 +50,9 @@ Init_gtk_texttag()
     rb_define_method(gTextTag, "initialize", initialize, -1);
     rb_define_method(gTextTag, "priority", get_priority, 0);
     rb_define_method(gTextTag, "set_priority", set_priority, 1);
+    G_DEF_SETTER(gTextTag, "priority");
     rb_define_method(gTextTag, "event", event, 3);
 
-    G_DEF_SETTERS(gTextTag);
-
     /* GtkWrapMode */
     G_DEF_CLASS(GTK_TYPE_WRAP_MODE, "WrapMode", gTextTag);
     G_DEF_CONSTANTS(gTextTag, GTK_TYPE_WRAP_MODE, "GTK_");

data/ext/gtk2/rbgtktextview.c

@@ -277,8 +277,8 @@ Init_gtk_textview()
     id_buffer = rb_intern("buffer");
 
     rb_define_method(cTextView, "initialize", textview_initialize, -1);
-    rb_define_method(cTextView, "set_buffer", textview_set_buffer, 1);
-    rb_define_method(cTextView, "buffer", textview_get_buffer, 0);
+    G_REPLACE_SET_PROPERTY(cTextView, "buffer", textview_set_buffer, 1);
+    G_REPLACE_GET_PROPERTY(cTextView, "buffer", textview_get_buffer, 0);
     rb_define_method(cTextView, "scroll_to_mark", textview_scroll_to_mark, 5);
     rb_define_method(cTextView, "scroll_to_iter", textview_scroll_to_iter, 5);
     rb_define_method(cTextView, "scroll_mark_onscreen", textview_scroll_mark_onscreen, 1);
@@ -297,6 +297,7 @@ Init_gtk_textview()
     rb_define_method(cTextView, "get_window", textview_get_window, 1);
     rb_define_method(cTextView, "get_window_type", textview_get_window_type, 1);
     rb_define_method(cTextView, "set_border_window_size", textview_set_border_window_size, 2);
+    G_DEF_SETTER(cTextView, "border_window_size");
     rb_define_method(cTextView, "get_border_window_size", textview_get_border_window_size, 1);
     rb_define_method(cTextView, "forward_display_line", textview_forward_display_line, 1);
     rb_define_method(cTextView, "backward_display_line", textview_backward_display_line, 1);
@@ -309,8 +310,6 @@ Init_gtk_textview()
     rb_define_method(cTextView, "move_child", textview_move_child, 3);
     rb_define_method(cTextView, "default_attributes", textview_get_default_attributes, 0);
 
-    G_DEF_SETTERS(cTextView);
-
     /* GtkTextWindowType */
     G_DEF_CLASS(GTK_TYPE_TEXT_WINDOW_TYPE, "WindowType", cTextView);
     G_DEF_CONSTANTS(cTextView, GTK_TYPE_TEXT_WINDOW_TYPE, "GTK_TEXT_");

data/ext/gtk2/rbgtktoggleaction.c

@@ -40,18 +40,11 @@ taction_toggled(VALUE self)
     return self;
 }
 
-static VALUE
-taction_set_active(VALUE self, VALUE is_active)
-{
-    gtk_toggle_action_set_active(_SELF(self), RVAL2CBOOL(is_active));
-    return self;
-}
-
-static VALUE
-taction_get_active(VALUE self)
-{
-    return CBOOL2RVAL(gtk_toggle_action_get_active(_SELF(self)));
-}
+/* Defined as Properties:
+void                gtk_toggle_action_set_active        (GtkToggleAction *action,
+                                                         gboolean is_active);
+gboolean            gtk_toggle_action_get_active        (GtkToggleAction *action);
+*/
 #endif
 
 void 
@@ -63,10 +56,6 @@ Init_gtk_toggle_action()
 
     rb_define_method(gToggleAction, "initialize", taction_initialize, 4);
     rb_define_method(gToggleAction, "toggled", taction_toggled, 0);
-    rb_define_method(gToggleAction, "set_active", taction_set_active, 1);
-    rb_define_method(gToggleAction, "active?", taction_get_active, 0);
-
-    G_DEF_SETTERS(gToggleAction);
 #endif
 }