gtk2 1.0.0 → 1.0.1

data/ext/gtk2/rbgtkcolorselectiondialog.c

@@ -27,30 +27,6 @@ cdialog_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-static VALUE
-cdialog_get_colorsel(VALUE self)
-{
-    return GOBJ2RVAL(_SELF(self)->colorsel);
-}
-
-static VALUE
-cdialog_get_ok_button(VALUE self)
-{
-    return GOBJ2RVAL(_SELF(self)->ok_button);
-}
-
-static VALUE
-cdialog_get_cancel_button(VALUE self)
-{
-    return GOBJ2RVAL(_SELF(self)->cancel_button);
-}
-
-static VALUE
-cdialog_get_help_button(VALUE self)
-{
-    return GOBJ2RVAL(_SELF(self)->help_button);
-}
-
 void 
 Init_gtk_color_selection_dialog()
 {
@@ -58,8 +34,6 @@ Init_gtk_color_selection_dialog()
                                         "ColorSelectionDialog", mGtk);
 
     rb_define_method(gColorSelDialog, "initialize", cdialog_initialize, -1);
-    rb_define_method(gColorSelDialog, "colorsel", cdialog_get_colorsel, 0);
-    rb_define_method(gColorSelDialog, "ok_button", cdialog_get_ok_button, 0);
-    rb_define_method(gColorSelDialog, "cancel_button", cdialog_get_cancel_button, 0);
-    rb_define_method(gColorSelDialog, "help_button", cdialog_get_help_button, 0);
+    /* NOTE: Backward compatibility */
+    rb_define_alias(gColorSelDialog, "colorsel", "color_selection");
 }

data/ext/gtk2/rbgtkcombo.c

@@ -24,7 +24,7 @@ combo_set_popdown_strings(VALUE self, VALUE ary)
 
     Check_Type(ary, T_ARRAY);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-        glist = g_list_append(glist, RVAL2CSTR(RARRAY_PTR(ary)[i]));
+        glist = g_list_append(glist, (gpointer)RVAL2CSTR(RARRAY_PTR(ary)[i]));
     }
     gtk_combo_set_popdown_strings(GTK_COMBO(RVAL2GOBJ(self)), glist);
     g_list_free(glist);
@@ -94,7 +94,7 @@ Init_gtk_combo()
     VALUE gCombo = G_DEF_CLASS(GTK_TYPE_COMBO, "Combo", mGtk);
 
     rb_define_method(gCombo, "initialize", combo_initialize, -1);
-    rb_define_method(gCombo, "set_value_in_list", combo_set_val_in_list, 2);
+    G_REPLACE_SET_PROPERTY(gCombo, "value_in_list", combo_set_val_in_list, 2);
     rb_define_method(gCombo, "set_use_arrows", combo_set_use_arrows, 1);
     rb_define_method(gCombo, "set_use_arrows_always", combo_set_use_arrows_always, 1);
     rb_define_method(gCombo, "set_popdown_strings", combo_set_popdown_strings, 1);

data/ext/gtk2/rbgtkcombobox.c

@@ -108,20 +108,10 @@ combobox_remove_text(VALUE self, VALUE position)
     return self;
 }
     
-
-static VALUE
-combobox_popup(VALUE self)
-{
-    gtk_combo_box_popup(_SELF(self));
-    return self;
-}
-
-static VALUE
-combobox_popdown(VALUE self)
-{
-    gtk_combo_box_popdown(_SELF(self));
-    return self;
-}
+/* Defined as Signals
+void                gtk_combo_box_popup                 (GtkComboBox *combo_box);
+void                gtk_combo_box_popdown               (GtkComboBox *combo_box);
+*/
 
 #if GTK_CHECK_VERSION(2,6,0)
 /* Defined as Property
@@ -174,16 +164,10 @@ combobox_set_row_separator_func(VALUE self)
     return self;
 }
 
-/* This calls g_object_notify(combo, "focus_on_click");
-   If you want to set "focus_on_click" property only, 
-   call GLib::Object.set_property.
-*/
-static VALUE
-combobox_set_focus_on_click(VALUE self, VALUE val)
-{
-    gtk_combo_box_set_focus_on_click(_SELF(self), RVAL2CBOOL(val));
-    return self;
-}
+/* Defined as Properties
+void                gtk_combo_box_set_focus_on_click    (GtkComboBox *combo,
+                                                         gboolean focus_on_click);
+ */
 
 #endif
 #endif
@@ -203,20 +187,16 @@ Init_gtk_combobox()
     rb_define_method(gCombobox, "initialize", combobox_initialize, -1);
     rb_define_method(gCombobox, "active_iter", combobox_get_active_iter, 0);
     rb_define_method(gCombobox, "set_active_iter", combobox_set_active_iter, 1);
+    G_DEF_SETTER(gCombobox, "active_iter");
     rb_define_method(gCombobox, "append_text", combobox_append_text, 1);
     rb_define_method(gCombobox, "insert_text", combobox_insert_text, 2);
     rb_define_method(gCombobox, "prepend_text", combobox_prepend_text, 1);
     rb_define_method(gCombobox, "remove_text", combobox_remove_text, 1);
-    rb_define_method(gCombobox, "popup", combobox_popup, 0);
-    rb_define_method(gCombobox, "popdown", combobox_popdown, 0);
 
 #if GTK_CHECK_VERSION(2,6,0)
     rb_define_method(gCombobox, "active_text", combobox_get_active_text, 0);
     rb_define_method(gCombobox, "popup_accessible", combobox_get_popup_accessible, 0);
     rb_define_method(gCombobox, "set_row_separator_func", combobox_set_row_separator_func, 0);
-    rb_define_method(gCombobox, "set_focus_on_click", combobox_set_focus_on_click, 1);
 #endif
- 
-    G_DEF_SETTERS(gCombobox);
 #endif
 }

data/ext/gtk2/rbgtkcontainer.c

@@ -422,7 +422,7 @@ cont_s_child_properties(int argc, VALUE *argv, VALUE self)
     GParamSpec** props;
     VALUE inherited_too;
     VALUE ary;
-    int i;
+    guint i;
 
     if (rb_scan_args(argc, argv, "01", &inherited_too) == 0)
         inherited_too = Qtrue;

data/ext/gtk2/rbgtkcurve.c

@@ -84,16 +84,18 @@ Init_gtk_curve()
     rb_define_method(gCurve, "initialize", curve_initialize, 0);
     rb_define_method(gCurve, "reset", curve_reset, 0);
     rb_define_method(gCurve, "set_gamma", curve_set_gamma, 1);
+    G_DEF_SETTER(gCurve, "gamma");
     rb_define_method(gCurve, "set_range", curve_set_range, 4);
     rb_define_method(gCurve, "set_vector", curve_set_vector, 2);
+    G_DEF_SETTER(gCurve, "vector");
+    /* NOTE: For backwards compatability. */
     rb_define_method(gCurve, "get_vector", curve_get_vector, 1);
+    rb_define_method(gCurve, "vector", curve_get_vector, 1);
 
     /* GtkCurveType(from standard constants) */
 
     G_DEF_CLASS(GTK_TYPE_CURVE_TYPE, "Type", gCurve);
     G_DEF_CONSTANTS(gCurve, GTK_TYPE_CURVE_TYPE, "GTK_CURVE_");
-
-    G_DEF_SETTERS(gCurve);
 }
 
 

data/ext/gtk2/rbgtkdialog.c

@@ -198,6 +198,7 @@ Init_gtk_dialog()
     rb_define_method(gDialog, "add_buttons", dialog_add_buttons, -1);
     rb_define_method(gDialog, "add_action_widget", dialog_add_action_widget, 2);
     rb_define_method(gDialog, "set_default_response", dialog_set_default_response, 1);
+    G_DEF_SETTER(gDialog, "default_response");
 
 #if GTK_CHECK_VERSION(2,6,0)
     rb_define_singleton_method(gDialog, "alternative_dialog_button_order?", 
@@ -213,9 +214,7 @@ Init_gtk_dialog()
     rb_define_method(gDialog, "get_response", dialog_get_response_for_widget, 1);
     rb_define_method(gDialog, "get_response_for_widget", dialog_get_response_for_widget, 1);
 #endif
-   
-    G_DEF_SETTERS(gDialog);
-   
+
     /* GtkDialogFlags */
     G_DEF_CLASS(GTK_TYPE_DIALOG_FLAGS, "Flags", gDialog);
     G_DEF_CONSTANTS(gDialog, GTK_TYPE_DIALOG_FLAGS, "GTK_DIALOG_");

data/ext/gtk2/rbgtkdrag.c

@@ -36,9 +36,9 @@ rbgtk_get_target_entry(VALUE targets)
         e_flags = rb_ary_entry(ary, 1);
         e_info = rb_ary_entry(ary, 2);
         
-        entries[i].target = NIL_P(e_target) ? NULL:RVAL2CSTR(e_target);
-        entries[i].flags = NIL_P(e_flags) ? 0:RVAL2GFLAGS(e_flags, GTK_TYPE_TARGET_FLAGS);
-        entries[i].info = NIL_P(e_info) ? 0:NUM2INT(e_info);
+        entries[i].target = NIL_P(e_target) ? NULL : (char *)RVAL2CSTR(e_target);
+        entries[i].flags = NIL_P(e_flags) ? 0 : RVAL2GFLAGS(e_flags, GTK_TYPE_TARGET_FLAGS);
+        entries[i].info = NIL_P(e_info) ? 0 : NUM2INT(e_info);
 
     }
     return entries;

data/ext/gtk2/rbgtkentry.c

@@ -138,6 +138,7 @@ Init_gtk_entry()
     rb_define_method(gEntry, "layout_offsets", entry_get_layout_offsets, 0);
 #if GTK_CHECK_VERSION(2,4,0)
     rb_define_method(gEntry, "set_completion", entry_set_completion, 1);
+    G_DEF_SETTER(gEntry, "completion");
     rb_define_method(gEntry, "completion", entry_get_completion, 0);
 #endif
     rb_define_method(gEntry, "layout_index_to_text_index", entry_layout_index_to_text_index, 1);
@@ -148,7 +149,6 @@ Init_gtk_entry()
 		     entry_get_cursor_hadjustment, 0);
     rb_define_method(gEntry, "set_cursor_hadjustment",
 		     entry_set_cursor_hadjustment, 1);
+    G_DEF_SETTER(gEntry, "cursor_hadjustment");
 #endif
-
-    G_DEF_SETTERS(gEntry);
 }

data/ext/gtk2/rbgtkentrycompletion.c

@@ -142,13 +142,10 @@ Init_gtk_entry_completion()
     rb_define_method(gEntryC, "insert_action_markup", entryc_insert_action_markup, 2);
     rb_define_method(gEntryC, "delete_action", entryc_delete_action, 1);
 
-    rb_undef_method(gEntryC, "text_column=");
-    rb_define_method(gEntryC, "set_text_column", entryc_set_text_column, 1);
+    G_REPLACE_SET_PROPERTY(gEntryC, "text_column", entryc_set_text_column, 1);
 
 #if GTK_CHECK_VERSION(2, 12, 0)
     rb_define_method(gEntryC, "completion_prefix", entryc_get_completion_prefix, 0);
 #endif
-
-    G_DEF_SETTERS(gEntryC);
 #endif
 }

data/ext/gtk2/rbgtkfilechooser.c

@@ -34,22 +34,9 @@ gslist2ary_free(GSList* list)
     return ary;
 }
 
-static VALUE
-fcho_set_action(VALUE self, VALUE action)
-{
-    gtk_file_chooser_set_action(
-        _SELF(self),
-        RVAL2GENUM(action, GTK_TYPE_FILE_CHOOSER_ACTION));
-    return self;
-}
-
-static VALUE
-fcho_get_action(VALUE self)
-{
-    return GENUM2RVAL(gtk_file_chooser_get_action(_SELF(self)), GTK_TYPE_FILE_CHOOSER_ACTION);
-}
-
 /*  They are defined as properties
+    gtk_file_chooser_set_action(_SELF(self), RVAL2GENUM(action, GTK_TYPE_FILE_CHOOSER_ACTION));
+    gtk_file_chooser_get_action(_SELF(self));
     gtk_file_chooser_set_local_only(_SELF(self), RVAL2CBOOL(local));
     gtk_file_chooser_get_local_only(_SELF(self));
     gtk_file_chooser_set_select_multiple(_SELF(self), RVAL2CBOOL(multiple));
@@ -79,23 +66,34 @@ fcho_get_filename(VALUE self)
 }
 
 static VALUE
-fcho_set_filename(VALUE self, VALUE name)
+fcho_set_filename(VALUE self, VALUE rbfilename)
 {
-    gboolean ret = gtk_file_chooser_set_filename(_SELF(self), RVAL2CSTRFILENAME(name));
-    if (! ret) rb_raise(rb_eRuntimeError, "Can't set filename");
+    gchar *filename = RVAL2CSTRFILENAME(rbfilename);
+    gboolean ret = gtk_file_chooser_set_filename(_SELF(self), filename);
+    g_free(filename);
+    if (!ret)
+        rb_raise(rb_eRuntimeError, "Can't set filename");
+
     return self;
 }
 
 static VALUE
-fcho_select_filename(VALUE self, VALUE filename)
+fcho_select_filename(VALUE self, VALUE rbfilename)
 {
-    return CBOOL2RVAL(gtk_file_chooser_select_filename(_SELF(self), RVAL2CSTRFILENAME(filename)));
+    gchar *filename = RVAL2CSTRFILENAME(rbfilename);
+    gboolean ret = gtk_file_chooser_select_filename(_SELF(self), filename);
+    g_free(filename);
+
+    return CBOOL2RVAL(ret);
 }
 
 static VALUE
-fcho_unselect_filename(VALUE self, VALUE filename)
+fcho_unselect_filename(VALUE self, VALUE rbfilename)
 {
-    gtk_file_chooser_unselect_filename(_SELF(self), RVAL2CSTRFILENAME(filename));
+    gchar *filename = RVAL2CSTRFILENAME(rbfilename);
+    gtk_file_chooser_unselect_filename(_SELF(self), filename);
+    g_free(filename);
+
     return self;
 }
 
@@ -233,20 +231,28 @@ fcho_list_filters(VALUE self)
 */
 
 static VALUE
-fcho_add_shortcut_folder(VALUE self, VALUE folder)
+fcho_add_shortcut_folder(VALUE self, VALUE rbfolder)
 {
+    gchar *folder = RVAL2CSTRFILENAME(rbfolder);
     GError *error = NULL;
-    if (! gtk_file_chooser_add_shortcut_folder(_SELF(self), RVAL2CSTRFILENAME(folder), &error))
+    gboolean ret = gtk_file_chooser_add_shortcut_folder(_SELF(self), folder, &error);
+    g_free(folder);
+    if (!ret)
         RAISE_GERROR(error);
+
     return self;
 }
 
 static VALUE
-fcho_remove_shortcut_folder(VALUE self, VALUE folder)
+fcho_remove_shortcut_folder(VALUE self, VALUE rbfolder)
 {
+    gchar *folder = RVAL2CSTRFILENAME(rbfolder);
     GError *error = NULL;
-    if (! gtk_file_chooser_remove_shortcut_folder(_SELF(self), RVAL2CSTRFILENAME(folder), &error))
+    gboolean ret = gtk_file_chooser_remove_shortcut_folder(_SELF(self), folder, &error);
+    g_free(folder);
+    if (!ret)
         RAISE_GERROR(error);
+
     return self;
 }
 
@@ -301,8 +307,6 @@ Init_gtk_file_chooser()
     VALUE eFileSystemError;
 #endif
 
-    rb_define_method(gFileCho, "set_action", fcho_set_action, 1);
-    rb_define_method(gFileCho, "action", fcho_get_action, 0);
     rb_define_method(gFileCho, "set_current_name", fcho_set_current_name, 1);
     rb_define_method(gFileCho, "set_filename", fcho_set_filename, 1);
     rb_define_method(gFileCho, "filename", fcho_get_filename, 0);
@@ -371,4 +375,3 @@ Init_gtk_file_chooser()
 
 #endif
 }
-

data/ext/gtk2/rbgtkfilechooserdialog.c

@@ -20,20 +20,22 @@ fchodiag_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE title, parent, action, back, button_ary;
     GtkWidget* dialog;
-    gchar* gtitle;
+    const gchar *gtitle;
     GtkWindow *gparent;
     GtkFileChooserAction gaction;
-    gchar* gback;
+    const gchar *gback;
 
     rb_scan_args(argc, argv, "04*", &title, &parent, &action, &back, &button_ary);
     gtitle = NIL_P(title) ? NULL : RVAL2CSTR(title);
     gparent = NIL_P(parent) ? NULL : GTK_WINDOW(RVAL2GOBJ(parent));
     gaction = NIL_P(action) ? GTK_FILE_CHOOSER_ACTION_OPEN : RVAL2GENUM(action, GTK_TYPE_FILE_CHOOSER_ACTION);
     gback = NIL_P(back) ? NULL : RVAL2CSTR(back);
-    dialog = gtk_file_chooser_dialog_new_with_backend((const gchar*)gtitle, 
-                                                      gparent, gaction, 
-                                                      (const gchar*)gback, 
-                                                      (const gchar*)NULL, NULL);
+    dialog = gtk_file_chooser_dialog_new_with_backend(gtitle, 
+                                                      gparent,
+                                                      gaction, 
+                                                      gback, 
+                                                      NULL,
+                                                      NULL);
     RBGTK_INITIALIZE(self, dialog);
     rbgtk_dialog_add_buttons_internal(self, button_ary);
     return Qnil;

data/ext/gtk2/rbgtkfilefilter.c

@@ -54,10 +54,14 @@ ffil_add_pattern(VALUE self, VALUE pattern)
 static gboolean
 filter_func(const GtkFileFilterInfo *info, gpointer func)
 {
-    return CBOOL2RVAL(rb_funcall((VALUE)func, 5, 
-                                 GFLAGS2RVAL(info->contains, GTK_TYPE_FILE_FILTER_FLAGS), 
-                                 CSTR2RVAL(info->filename), CSTR2RVAL(info->uri), 
-                                 CSTR2RVAL(info->display_name), CSTR2RVAL(info->mime_type)));
+    return CBOOL2RVAL(rb_funcall((VALUE)func,
+                                 id_call,
+                                 5,
+                                 GFLAGS2RVAL(info->contains, GTK_TYPE_FILE_FILTER_FLAGS),
+                                 CSTR2RVAL(info->filename),
+                                 CSTR2RVAL(info->uri),
+                                 CSTR2RVAL(info->display_name),
+                                 CSTR2RVAL(info->mime_type)));
 }
 
 #if GTK_CHECK_VERSION(2,6,0)

data/ext/gtk2/rbgtkframe.c

@@ -51,9 +51,8 @@ Init_gtk_frame()
     rb_define_method(gFrame, "initialize", frame_initialize, -1);
     rb_define_method(gFrame, "set_label_align", frame_set_label_align, 2);
     rb_define_method(gFrame, "label_align", frame_get_label_align, 0);
-
-	 rb_undef_method(gFrame, "shadow");
-	 rb_undef_method(gFrame, "shadow=");
-	 rb_undef_method(gFrame, "set_shadow");
+    rb_undef_method(gFrame, "shadow");
+    rb_undef_method(gFrame, "shadow=");
+    rb_undef_method(gFrame, "set_shadow");
 }
 

data/ext/gtk2/rbgtkhandlebox.c

@@ -21,19 +21,12 @@ hb_initialize(VALUE self)
     return Qnil;
 }
 
-static VALUE
-hb_child_detached(VALUE self)
-{
-    return CBOOL2RVAL(GTK_HANDLE_BOX(RVAL2GOBJ(self))->child_detached);
-}
-
 void 
 Init_gtk_handle_box()
 {
     VALUE gHandleBox = G_DEF_CLASS(GTK_TYPE_HANDLE_BOX, "HandleBox", mGtk);
 
     rb_define_method(gHandleBox, "initialize", hb_initialize, 0);
-    rb_define_method(gHandleBox, "child_detached?", hb_child_detached, 0);
     rb_undef_method(gHandleBox, "shadow");
     rb_undef_method(gHandleBox, "shadow=");
     rb_undef_method(gHandleBox, "set_shadow");

data/ext/gtk2/rbgtkicontheme.c

@@ -192,28 +192,19 @@ it_choose_icon(int argc, VALUE *argv, VALUE self)
 {
     VALUE rb_icon_names, rb_size, rb_flags;
     gint size;
-    gchar **icon_names;
+    const gchar **icon_names;
     GtkIconLookupFlags flags;
     GtkIconInfo *info;
 
     rb_scan_args(argc, argv, "21", &rb_icon_names, &rb_size, &rb_flags);
 
     if (RVAL2CBOOL(rb_obj_is_kind_of(rb_icon_names, rb_cString))) {
-	icon_names = ALLOCA_N(gchar *, 2);
+	icon_names = ALLOCA_N(const gchar *, 2);
 	icon_names[0] = RVAL2CSTR(rb_icon_names);
 	icon_names[1] = NULL;
     }
     else if (RVAL2CBOOL(rb_obj_is_kind_of(rb_icon_names, rb_cArray))) {
-	VALUE *elements;
-	long i, len;
-
-	len = RARRAY_LEN(rb_icon_names);
-	icon_names = ALLOCA_N(gchar *, len + 1);
-	elements = RARRAY_PTR(rb_icon_names);
-	for (i = 0; i < len; i++) {
-	    icon_names[i] = RVAL2CSTR(elements[i]);
-	}
-	icon_names[i] = NULL;
+        icon_names = RVAL2STRV(rb_icon_names);
     }
     else {
 	rb_raise(rb_eArgError,
@@ -233,7 +224,7 @@ it_choose_icon(int argc, VALUE *argv, VALUE self)
     }
 
     info = gtk_icon_theme_choose_icon(_SELF(self),
-				      (const gchar **)icon_names,
+				      icon_names,
 				      size, flags);
     return ICON_INFO2RVAL(info);
 }