gtk2 1.0.0 → 1.0.1

data/ext/gtk2/rbgtktogglebutton.c

@@ -71,8 +71,7 @@ Init_gtk_toggle_button()
 
     rb_define_method(gTButton, "initialize", tbtn_initialize, -1);
     rb_define_method(gTButton, "set_mode", tbtn_set_mode, 1);
+    G_DEF_SETTER(gTButton, "mode");
     rb_define_method(gTButton, "mode?", tbtn_get_mode, 0);
     rb_define_method(gTButton, "toggled", tbtn_toggled, 0);
-
-    G_DEF_SETTERS(gTButton);
 }

data/ext/gtk2/rbgtktoggletoolbutton.c

@@ -35,18 +35,11 @@ toggletoolbutton_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-static VALUE
-toggletoolbutton_set_active(VALUE self, VALUE is_active)
-{
-    gtk_toggle_tool_button_set_active(_SELF(self), RVAL2CBOOL(is_active));
-    return self;
-}
-
-static VALUE
-toggletoolbutton_get_active(VALUE self)
-{
-    return CBOOL2RVAL(gtk_toggle_tool_button_get_active(_SELF(self)));
-}
+/* Defined as Properties:
+void                gtk_toggle_tool_button_set_active   (GtkToggleToolButton *button,
+                                                         gboolean is_active);
+gboolean            gtk_toggle_tool_button_get_active   (GtkToggleToolButton *button);
+*/
 
 #endif
 
@@ -57,9 +50,5 @@ Init_gtk_toggletoolbutton()
     VALUE gToggleToolButton = G_DEF_CLASS(GTK_TYPE_TOGGLE_TOOL_BUTTON, "ToggleToolButton", mGtk);
 
     rb_define_method(gToggleToolButton, "initialize", toggletoolbutton_initialize, -1);
-    rb_define_method(gToggleToolButton, "set_active", toggletoolbutton_set_active, 1);
-    rb_define_method(gToggleToolButton, "active?", toggletoolbutton_get_active, 0);
-
-    G_DEF_SETTERS(gToggleToolButton);
 #endif
 }

data/ext/gtk2/rbgtktoolbar.c

@@ -256,31 +256,14 @@ tbar_insert_space(VALUE self, VALUE pos)
     return self;
 }
 
-static VALUE
-tbar_set_tooltips(VALUE self, VALUE enable)
-{
-    gtk_toolbar_set_tooltips(_SELF(self), RVAL2CBOOL(enable));
-    return self;
-}
-
-static VALUE
-tbar_set_icon_size(VALUE self, VALUE size)
-{
-    gtk_toolbar_set_icon_size(_SELF(self), RVAL2GENUM(size, GTK_TYPE_ICON_SIZE));
-    return self;
-}
-
-static VALUE
-tbar_get_icon_size(VALUE self)
-{
-    return GENUM2RVAL(gtk_toolbar_get_icon_size(_SELF(self)), GTK_TYPE_ICON_SIZE);
-}
-
-static VALUE
-tbar_get_tooltips(VALUE self)
-{
-    return CBOOL2RVAL(gtk_toolbar_get_tooltips(_SELF(self)));
-}
+/* Defined as Properties:
+void                gtk_toolbar_set_tooltips            (GtkToolbar *toolbar,
+                                                         gboolean enable);
+void                gtk_toolbar_set_icon_size           (GtkToolbar *toolbar,
+                                                         GtkIconSize icon_size);
+GtkIconSize         gtk_toolbar_get_icon_size           (GtkToolbar *toolbar);
+gboolean            gtk_toolbar_get_tooltips            (GtkToolbar *toolbar);
+*/
 
 static VALUE
 tbar_remove_space(VALUE self, VALUE position)
@@ -323,16 +306,10 @@ Init_gtk_toolbar()
     rb_define_method(gToolbar, "append_space", tbar_append_space, 0);
     rb_define_method(gToolbar, "prepend_space", tbar_prepend_space, 0);
     rb_define_method(gToolbar, "insert_space", tbar_insert_space, 1);
-    rb_define_method(gToolbar, "set_tooltips", tbar_set_tooltips, 1);
-    rb_define_method(gToolbar, "set_icon_size", tbar_set_icon_size, 1);
-    rb_define_method(gToolbar, "icon_size", tbar_get_icon_size, 0);
-    rb_define_method(gToolbar, "tooltips?", tbar_get_tooltips, 0);
     rb_define_method(gToolbar, "remove_space", tbar_remove_space, 1);
     rb_define_method(gToolbar, "unset_icon_size", tbar_unset_icon_size, 0);
     rb_define_method(gToolbar, "unset_style", tbar_unset_style, 0);
 
-    G_DEF_SETTERS(gToolbar);
-
     /* GtkToolbarChildType */
     G_DEF_CLASS(GTK_TYPE_TOOLBAR_CHILD_TYPE, "ChildType", gToolbar);
     G_DEF_CONSTANTS(gToolbar, GTK_TYPE_TOOLBAR_CHILD_TYPE, "GTK_TOOLBAR_");

data/ext/gtk2/rbgtktoolitem.c

@@ -145,11 +145,14 @@ Init_gtk_toolitem()
     VALUE gToolItem = G_DEF_CLASS(GTK_TYPE_TOOL_ITEM, "ToolItem", mGtk);
     rb_define_method(gToolItem, "initialize", toolitem_initialize, 0);
     rb_define_method(gToolItem, "set_homogeneous", toolitem_set_homogeneous, 1);
+    G_DEF_SETTER(gToolItem, "homogenous");
     rb_define_method(gToolItem, "homogeneous?", toolitem_get_homogeneous, 0);
     rb_define_method(gToolItem, "set_expand", toolitem_set_expand, 1);
+    G_DEF_SETTER(gToolItem, "expand");
     rb_define_method(gToolItem, "expand?", toolitem_get_expand, 0);
     rb_define_method(gToolItem, "set_tooltip", toolitem_set_tooltip, -1);
     rb_define_method(gToolItem, "set_use_drag_window", toolitem_set_use_drag_window, 1);
+    G_DEF_SETTER(gToolItem, "use_drag_window");
     rb_define_method(gToolItem, "use_drag_window?", toolitem_get_use_drag_window, 0);
     rb_define_method(gToolItem, "icon_size", toolitem_get_icon_size, 0);
     rb_define_method(gToolItem, "orientation", toolitem_get_orientation, 0);
@@ -161,6 +164,5 @@ Init_gtk_toolitem()
 #if GTK_CHECK_VERSION(2,6,0)
     rb_define_method(gToolItem, "rebuild_menu", toolitem_rebuild_menu, 0);
 #endif
-    G_DEF_SETTERS(gToolItem);
 #endif
 }

data/ext/gtk2/rbgtktreerowreference.c

@@ -137,10 +137,6 @@ treerowref_s_reordered(VALUE self, VALUE proxy, VALUE path, VALUE iter, VALUE ne
 void 
 Init_gtk_treerowreference()
 {
-    id_proxy = rb_intern("proxy");
-    id_model = rb_intern("model");
-    id_path = rb_intern("path");
-
     VALUE gTreeref = G_DEF_CLASS(GTK_TYPE_TREE_ROW_REFERENCE, "TreeRowReference", mGtk);
   
     rb_define_method(gTreeref, "initialize", treerowref_initialize, -1);
@@ -153,5 +149,9 @@ Init_gtk_treerowreference()
     rb_define_singleton_method(gTreeref, "inserted", treerowref_s_inserted, 2);
     rb_define_singleton_method(gTreeref, "deleted", treerowref_s_deleted, 2);
     rb_define_singleton_method(gTreeref, "reordered", treerowref_s_reordered, 4);
+
+    id_proxy = rb_intern("proxy");
+    id_model = rb_intern("model");
+    id_path = rb_intern("path");
 }
 

data/ext/gtk2/rbgtktreesortable.c

@@ -107,9 +107,6 @@ Init_gtk_treesortable()
     rb_define_method(mts, "set_default_sort_func", treesortable_set_default_sort_func, 0);
     rb_define_method(mts, "has_default_sort_func?", treesortable_has_default_sort_func, 0);
 
-    G_DEF_SETTERS(mts);
-
-    rb_undef_method(mts, "sort_func=");
     rb_define_const(mts, "DEFAULT_SORT_COLUMN_ID", GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID);
 }
 

data/ext/gtk2/rbgtktreestore.c

@@ -119,11 +119,13 @@ tstore_insert(int argc, VALUE *argv, VALUE self)
         
         if(TYPE(values)==T_ARRAY) {
             for(i=0; i<size; i++) {
+                GType gtype;
+                GValue gval = {0,};
+
                 c_columns[i] = i;
-                GType gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(RVAL2GOBJ(self)),
-                                                             c_columns[i]);
+                gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(RVAL2GOBJ(self)),
+                                                       c_columns[i]);
         
-                GValue gval = {0,};
                 g_value_init(&gval, gtype);
                 rbgobj_rvalue_to_gvalue(rb_ary_shift(values), &gval);
                 c_values[i] = gval;
@@ -133,12 +135,13 @@ tstore_insert(int argc, VALUE *argv, VALUE self)
             r_columns = rb_funcall(values, rb_intern("keys"), 0);
             
             for(i=0; i<size; i++) {
+                GType gtype;
+                GValue gval = {0,};
+
                 c_columns[i] = NUM2INT (rb_ary_entry(r_columns, i));
+                gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(RVAL2GOBJ(self)),
+                                                       c_columns[i]);
                 
-                GType gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(RVAL2GOBJ(self)),
-                                                             c_columns[i]);
-                
-                GValue gval = {0,};
                 g_value_init(&gval, gtype);
                 rbgobj_rvalue_to_gvalue(rb_hash_aref(values, INT2NUM(c_columns[i])), &gval);
                 c_values[i] = gval;

data/ext/gtk2/rbgtktreeview.c

@@ -222,13 +222,11 @@ treeview_get_cursor(VALUE self)
                        GOBJ2RVAL(focus_column));
 }
 
-static VALUE
-treeview_row_activated(VALUE self, VALUE path, VALUE column)
-{
-    gtk_tree_view_row_activated(_SELF(self), RVAL2GTKTREEPATH(path),
-                                TREEVIEW_COL(column));
-    return self;
-}
+/* Defined as Signals
+void                gtk_tree_view_row_activated         (GtkTreeView *tree_view,
+                                                         GtkTreePath *path,
+                                                         GtkTreeViewColumn *column);
+*/
 
 static VALUE
 treeview_expand_all(VALUE self)
@@ -730,7 +728,6 @@ Init_gtk_treeview()
     rb_define_method(gTv, "scroll_to_cell", treeview_scroll_to_cell, 5);
     rb_define_method(gTv, "set_cursor", treeview_set_cursor, 3);
     rb_define_method(gTv, "cursor", treeview_get_cursor, 0);
-    rb_define_method(gTv, "row_activated", treeview_row_activated, 2);
     rb_define_method(gTv, "expand_all", treeview_expand_all, 0);
     rb_define_method(gTv, "collapse_all", treeview_collapse_all, 0);
     rb_define_method(gTv, "expand_row", treeview_expand_row, 2);

data/ext/gtk2/rbgtktreeviewcolumn.c

@@ -154,18 +154,11 @@ tvc_clear_attributes(VALUE self, VALUE cell)
     return self;
 }
 
-static VALUE
-tvc_set_spacing(VALUE self, VALUE spacing)
-{
-    gtk_tree_view_column_set_spacing(_SELF(self), NUM2INT(spacing));
-    return self;
-}
-
-static VALUE
-tvc_get_spacing(VALUE self)
-{
-    return INT2NUM(gtk_tree_view_column_get_spacing(_SELF(self)));
-}
+/* Defined as Properties:
+void                gtk_tree_view_column_set_spacing    (GtkTreeViewColumn *tree_column,
+                                                         gint spacing);
+gint                gtk_tree_view_column_get_spacing    (GtkTreeViewColumn *tree_column);
+*/
 
 static VALUE
 tvc_clicked(VALUE self)
@@ -174,19 +167,13 @@ tvc_clicked(VALUE self)
     return self;
 }
 
-static VALUE
-tvc_set_sort_column_id(VALUE self, VALUE sort_column_id)
-{
-    gtk_tree_view_column_set_sort_column_id(_SELF(self), 
-                                            NUM2INT(sort_column_id));
-    return self;
-}
-
-static VALUE
-tvc_get_sort_column_id(VALUE self)
-{
-    return INT2NUM(gtk_tree_view_column_get_sort_column_id(_SELF(self)));
-}
+/* Defined as Properties:
+void                gtk_tree_view_column_set_sort_column_id
+                                                        (GtkTreeViewColumn *tree_column,
+                                                         gint sort_column_id);
+gint                gtk_tree_view_column_get_sort_column_id
+                                                        (GtkTreeViewColumn *tree_column);
+*/
 
 static VALUE
 tvc_cell_set_cell_data(VALUE self, VALUE model, VALUE iter, VALUE is_expander, VALUE is_expanded)
@@ -229,7 +216,7 @@ tvc_cell_get_size(VALUE self)
 }
 
 static VALUE
-tvc_cell_is_visible(self)
+tvc_cell_is_visible(VALUE self)
 {
     return CBOOL2RVAL(gtk_tree_view_column_cell_is_visible(_SELF(self)));
 }
@@ -278,11 +265,7 @@ Init_gtk_treeviewcolumn()
     rb_define_method(tvc, "set_attributes", tvc_set_attributes, 2);
     rb_define_method(tvc, "set_cell_data_func", tvc_set_cell_data_func, 1);
     rb_define_method(tvc, "clear_attributes", tvc_clear_attributes, 1);
-    rb_define_method(tvc, "set_spacing", tvc_set_spacing, 1);
-    rb_define_method(tvc, "spacing", tvc_get_spacing, 0);
     rb_define_method(tvc, "clicked", tvc_clicked, 0);
-    rb_define_method(tvc, "set_sort_column_id", tvc_set_sort_column_id, 1);
-    rb_define_method(tvc, "sort_column_id", tvc_get_sort_column_id, 0);
     rb_define_method(tvc, "cell_set_cell_data", tvc_cell_set_cell_data, 4);
     rb_define_method(tvc, "cell_size", tvc_cell_get_size, 0);
     rb_define_method(tvc, "cell_is_visible?", tvc_cell_is_visible, 0);
@@ -298,8 +281,4 @@ Init_gtk_treeviewcolumn()
     /* GtkTreeViewColumnSizing */
     G_DEF_CLASS(GTK_TYPE_TREE_VIEW_COLUMN_SIZING, "Sizing", tvc);
     G_DEF_CONSTANTS(tvc, GTK_TYPE_TREE_VIEW_COLUMN_SIZING, "GTK_TREE_VIEW_COLUMN_");
-
-    G_DEF_SETTERS(tvc);
-
-    rb_undef_method(tvc, "cell_data_func=");
 }

data/ext/gtk2/rbgtkuimanager.c

@@ -97,7 +97,8 @@ rbuimanager_add_ui(int argc, VALUE *argv, VALUE self)
 
         if (RVAL2CBOOL(buffer)){
             StringValue(buffer_or_filename);
-            ret = gtk_ui_manager_add_ui_from_string(_SELF(self), RVAL2CSTR(buffer_or_filename),
+            ret = gtk_ui_manager_add_ui_from_string(_SELF(self),
+                                                    RSTRING_PTR(buffer_or_filename),
                                                     RSTRING_LEN(buffer_or_filename),
                                                     &error);
         } else {
@@ -186,8 +187,6 @@ Init_gtk_uimanager()
     rb_define_method(gUI, "remove_ui", rbuimanager_remove_ui, 1);
     rb_define_method(gUI, "ensure_update", rbuimanager_ensure_update, 0);
 
-    G_DEF_SETTERS(gUI);
-                                                                                
     /* GtkUIManagerItemType */
     G_DEF_CLASS(GTK_TYPE_UI_MANAGER_ITEM_TYPE, "ItemType", gUI);
     G_DEF_CONSTANTS(gUI, GTK_TYPE_UI_MANAGER_ITEM_TYPE, "GTK_UI_MANAGER_");

data/ext/gtk2/rbgtkwidget.c

@@ -230,18 +230,13 @@ widget_intersect(VALUE self, VALUE area)
     return ret ? BOXED2RVAL(&intersection, GDK_TYPE_RECTANGLE) : Qnil;
 }
 
-static VALUE
-widget_is_focus(VALUE self)
-{
-    return CBOOL2RVAL(gtk_widget_is_focus(_SELF(self)));
-}
+/* Defined as Properties
+gboolean            gtk_widget_is_focus                 (GtkWidget *widget);
+*/
 
-static VALUE
-widget_grab_focus(VALUE self)
-{
-    gtk_widget_grab_focus(_SELF(self));
-    return self;
-}
+/* Defined as Signals
+void                gtk_widget_grab_focus               (GtkWidget *widget);
+*/
 
 static VALUE
 widget_grab_default(VALUE self)
@@ -610,12 +605,10 @@ widget_reset_shapes(VALUE self)
     return self;
 }
 
-static VALUE
-widget_set_double_buffered(VALUE self, VALUE double_buffered)
-{
-    gtk_widget_set_double_buffered(_SELF(self), RVAL2CBOOL(double_buffered));
-    return self;
-}
+/* Defined as Properties:
+void                gtk_widget_set_double_buffered      (GtkWidget *widget,
+                                                         gboolean double_buffered);
+*/
 
 static VALUE
 widget_set_redraw_on_allocate(VALUE self, VALUE redraw_on_allocate)
@@ -727,7 +720,7 @@ widget_s_style_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;
@@ -801,7 +794,7 @@ widget_style_get_property(VALUE self, VALUE prop_name)
 static VALUE
 widget_get_accessible(VALUE self)
 {
-    return GOBJ2RVAL(_SELF(self));
+    return GOBJ2RVAL(gtk_widget_get_accessible(_SELF(self)));
 }
 
 static VALUE
@@ -916,18 +909,11 @@ widget_thaw_child_notify(VALUE self)
 }
 
 #if GTK_CHECK_VERSION(2,4,0)
-static VALUE
-widget_set_no_show_all(VALUE self, VALUE no_show_all)
-{
-    gtk_widget_set_no_show_all(_SELF(self), RVAL2CBOOL(no_show_all));
-    return self;
-}
-
-static VALUE
-widget_get_no_show_all(VALUE self)
-{
-    return CBOOL2RVAL(gtk_widget_get_no_show_all(_SELF(self)));
-}
+/* Defined as Properties:
+void                gtk_widget_set_no_show_all          (GtkWidget *widget,
+                                                         gboolean no_show_all);
+gboolean            gtk_widget_get_no_show_all          (GtkWidget *widget);
+*/
 
 static VALUE
 widget_list_mnemonic_labels(VALUE self)
@@ -987,16 +973,18 @@ widget_is_composited(VALUE self)
 }
 #endif
 
-static VALUE
-widget_window(VALUE self)
-{
-    return GOBJ2RVAL(_SELF(self)->window);
-}
+/* Defined as Properties:
+GdkWindow *         gtk_widget_get_window               (GtkWidget *widget);
+*/
 
 static VALUE
 widget_set_window(VALUE self, VALUE window)
 {
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_window(_SELF(self), GDK_WINDOW(RVAL2GOBJ(window)));
+#else
     _SELF(self)->window = RVAL2GOBJ(window);
+#endif
     return self;
 }
 
@@ -1016,7 +1004,6 @@ DEFINE_IS_WIDGET(PARENT_SENSITIVE);
 DEFINE_IS_WIDGET(IS_SENSITIVE);
 DEFINE_IS_WIDGET(HAS_GRAB);
 DEFINE_IS_WIDGET(RC_STYLE);
-DEFINE_IS_WIDGET(DOUBLE_BUFFERED);
 
 static VALUE
 widget_get_allocation(VALUE self)
@@ -1125,8 +1112,6 @@ Init_gtk_widget()
     rb_define_singleton_method(gWidget, "style_properties", widget_s_style_properties, -1);
 #endif
     rb_define_method(gWidget, "intersect", widget_intersect, 1);
-    rb_define_method(gWidget, "focus?", widget_is_focus, 0);
-    rb_define_method(gWidget, "grab_focus", widget_grab_focus, 0);
     rb_define_method(gWidget, "grab_default", widget_grab_default, 0);
     rb_define_method(gWidget, "set_state", widget_set_state, 1);
     rb_define_method(gWidget, "set_parent_window", widget_set_parent_window, 1);
@@ -1168,7 +1153,6 @@ Init_gtk_widget()
     rb_define_method(gWidget, "render_icon", widget_render_icon, -1);
     rb_define_method(gWidget, "queue_draw_area", widget_queue_draw_area, 4);
     rb_define_method(gWidget, "reset_shapes", widget_reset_shapes, 0);
-    rb_define_method(gWidget, "set_double_buffered", widget_set_double_buffered, 1);
     rb_define_method(gWidget, "set_redraw_on_allocate", widget_set_redraw_on_allocate, 1);
     rb_define_method(gWidget, "set_composite_name", widget_set_composite_name, 1);
     rb_define_method(gWidget, "set_scroll_adjustments", widget_set_scroll_adjustments, 2);
@@ -1200,8 +1184,6 @@ Init_gtk_widget()
     rb_define_method(gWidget, "set_size_request", widget_set_size_request, 2);
     rb_define_method(gWidget, "thaw_child_notify", widget_thaw_child_notify, 0);
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gWidget, "set_no_show_all", widget_set_no_show_all, 1);
-    rb_define_method(gWidget, "no_show_all?", widget_get_no_show_all, 0);
     rb_define_method(gWidget, "mnemonic_labels", widget_list_mnemonic_labels, 0);
     rb_define_method(gWidget, "add_mnemonic_label", widget_add_mnemonic_label, 1);
     rb_define_method(gWidget, "remove_mnemonic_label", widget_remove_mnemonic_label, 1);
@@ -1215,7 +1197,6 @@ Init_gtk_widget()
     rb_define_method(gWidget, "action", widget_get_action, 0);
     rb_define_method(gWidget, "composited?", widget_is_composited, 0);
 #endif
-    rb_define_method(gWidget, "window", widget_window, 0);
     rb_define_method(gWidget, "set_window", widget_set_window, 1);
     rb_define_method(gWidget, "allocation", widget_get_allocation, 0);
     rb_define_method(gWidget, "set_allocation", widget_set_allocation, 4);
@@ -1234,7 +1215,6 @@ Init_gtk_widget()
     rb_define_method(gWidget, "sensitive_with_parent?",   widget_IS_SENSITIVE, 0);
     rb_define_method(gWidget, "has_grab?",    widget_HAS_GRAB, 0);
     rb_define_method(gWidget, "rc_style?",    widget_RC_STYLE, 0);
-    rb_define_method(gWidget, "double_buffered?",  widget_DOUBLE_BUFFERED, 0);
 
     /*
      * singleton methods