From: Jürg Billeter Date: Fri, 11 Jul 2008 12:00:37 +0000 (+0000) Subject: Various fixes, based on patch by Jorn Baayen X-Git-Tag: VALA_0_3_5~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1948d80bb74582d504162e19cb96253e7c5089ba;p=thirdparty%2Fvala.git Various fixes, based on patch by Jorn Baayen 2008-07-11 Jürg Billeter * vapi/packages/gtk+-2.0/: Various fixes, based on patch by Jorn Baayen * vapi/gtk+-2.0.vapi: regenerated svn path=/trunk/; revision=1694 --- diff --git a/ChangeLog b/ChangeLog index 2d7fe9fa1..5530737ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-11 Jürg Billeter + + * vapi/packages/gtk+-2.0/: + + Various fixes, based on patch by Jorn Baayen + + * vapi/gtk+-2.0.vapi: regenerated + 2008-07-10 Raffaele Sandrini * ccode/valaccodedeclaration.vala: diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 7acf3e2df..605934357 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -1722,7 +1722,7 @@ namespace Gtk { public weak Gtk.TreeRowReference copy (); public static void deleted (GLib.Object proxy, Gtk.TreePath path); public weak Gtk.TreeModel get_model (); - public weak Gtk.TreePath get_path (); + public Gtk.TreePath get_path (); public static void inserted (GLib.Object proxy, Gtk.TreePath path); public TreeRowReference (Gtk.TreeModel model, Gtk.TreePath path); public TreeRowReference.proxy (GLib.Object proxy, Gtk.TreeModel model, Gtk.TreePath path); @@ -3255,7 +3255,7 @@ namespace Gtk { public void enable_model_drag_source (Gdk.ModifierType start_button_mask, Gtk.TargetEntry[] targets, Gdk.DragAction actions); public int get_column_spacing (); public int get_columns (); - public bool get_cursor (out weak Gtk.TreePath path, out weak Gtk.CellRenderer cell); + public bool get_cursor (out Gtk.TreePath path, out weak Gtk.CellRenderer cell); public bool get_dest_item_at_pos (int drag_x, int drag_y, out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos); public void get_drag_dest_item (out weak Gtk.TreePath path, Gtk.IconViewDropPosition pos); public bool get_item_at_pos (int x, int y, out weak Gtk.TreePath path, out weak Gtk.CellRenderer cell); @@ -3282,10 +3282,10 @@ namespace Gtk { public bool path_is_selected (Gtk.TreePath path); public void scroll_to_path (Gtk.TreePath path, bool use_align, float row_align, float col_align); public void select_path (Gtk.TreePath path); - public void selected_foreach (Gtk.IconViewForeachFunc func, void* data); + public void selected_foreach (Gtk.IconViewForeachFunc func); public void set_column_spacing (int column_spacing); public void set_columns (int columns); - public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer cell, bool start_editing); + public void set_cursor (Gtk.TreePath path, Gtk.CellRenderer? cell, bool start_editing); public void set_drag_dest_item (Gtk.TreePath path, Gtk.IconViewDropPosition pos); public void set_item_width (int item_width); public void set_margin (int margin); @@ -5525,7 +5525,7 @@ namespace Gtk { public void refilter (); public void set_modify_func (int n_columns, GLib.Type[] types, Gtk.TreeModelFilterModifyFunc func, void* data, Gtk.DestroyNotify destroy); public void set_visible_column (int column); - public void set_visible_func (Gtk.TreeModelFilterVisibleFunc func, void* data, Gtk.DestroyNotify destroy); + public void set_visible_func (Gtk.TreeModelFilterVisibleFunc# func); [NoAccessorMethod] public Gtk.TreeModel child_model { get; construct; } [NoAccessorMethod] @@ -5581,7 +5581,7 @@ namespace Gtk { public void select_iter (Gtk.TreeIter iter); public void select_path (Gtk.TreePath path); public void select_range (Gtk.TreePath start_path, Gtk.TreePath end_path); - public void selected_foreach (Gtk.TreeSelectionForeachFunc func, void* data); + public void selected_foreach (Gtk.TreeSelectionForeachFunc func); public void set_mode (Gtk.SelectionMode type); public void set_select_function (Gtk.TreeSelectionFunc func, void* data, Gtk.DestroyNotify destroy); public void unselect_all (); @@ -5700,7 +5700,7 @@ namespace Gtk { public void scroll_to_cell (Gtk.TreePath? path, Gtk.TreeViewColumn? column, bool use_align, float row_align, float col_align); public void scroll_to_point (int tree_x, int tree_y); public void set_column_drag_function (Gtk.TreeViewColumnDropFunc func, Gtk.DestroyNotify destroy); - public void set_cursor (Gtk.TreePath path, Gtk.TreeViewColumn focus_column, bool start_editing); + public void set_cursor (Gtk.TreePath path, Gtk.TreeViewColumn? focus_column, bool start_editing); public void set_cursor_on_cell (Gtk.TreePath path, Gtk.TreeViewColumn focus_column, Gtk.CellRenderer focus_cell, bool start_editing); public void set_destroy_count_func (Gtk.TreeDestroyCountFunc func, void* data, Gtk.DestroyNotify destroy); public void set_drag_dest_row (Gtk.TreePath? path, Gtk.TreeViewDropPosition pos); @@ -6154,7 +6154,7 @@ namespace Gtk { public abstract void pack_end (Gtk.CellRenderer cell, bool expand); public abstract void pack_start (Gtk.CellRenderer cell, bool expand); public abstract void reorder (Gtk.CellRenderer cell, int position); - public abstract void set_cell_data_func (Gtk.CellRenderer cell, Gtk.CellLayoutDataFunc func, void* func_data, GLib.DestroyNotify destroy); + public abstract void set_cell_data_func (Gtk.CellRenderer cell, Gtk.CellLayoutDataFunc# func); } [CCode (cheader_filename = "gtk/gtk.h")] public interface Editable { @@ -6363,9 +6363,9 @@ namespace Gtk { public interface TreeSortable : Gtk.TreeModel, GLib.Object { public abstract bool get_sort_column_id (out int sort_column_id, out Gtk.SortType order); public abstract bool has_default_sort_func (); - public abstract void set_default_sort_func (Gtk.TreeIterCompareFunc sort_func, Gtk.DestroyNotify destroy); + public abstract void set_default_sort_func (Gtk.TreeIterCompareFunc# sort_func); public abstract void set_sort_column_id (int sort_column_id, Gtk.SortType order); - public abstract void set_sort_func (int sort_column_id, Gtk.TreeIterCompareFunc sort_func, Gtk.DestroyNotify destroy); + public abstract void set_sort_func (int sort_column_id, Gtk.TreeIterCompareFunc# sort_func); [HasEmitter] public virtual signal void sort_column_changed (); } diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index c1b6f0e74..e20b8ef68 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -57,6 +57,9 @@ GtkCellEditable::editing_done has_emitter="1" GtkCellEditable::remove_widget has_emitter="1" GtkCellEditable::start_editing has_emitter="1" gtk_cell_layout_set_attributes ellipsis="1" +gtk_cell_layout_set_cell_data_func.func transfer_ownership="1" +gtk_cell_layout_set_cell_data_func.func_data hidden="1" +gtk_cell_layout_set_cell_data_func.destroy hidden="1" gtk_cell_renderer_get_size abstract="1" gtk_cell_renderer_get_size.cell_area nullable="1" gtk_cell_renderer_get_size.x_offset is_out="1" @@ -106,9 +109,12 @@ gtk_frame_new.label nullable="1" GtkHandleBox.child_detached hidden="1" gtk_get_option_group transfer_ownership="1" gtk_icon_info_get_embedded_rect.rectangle is_out="1" +gtk_icon_view_get_cursor.path transfer_ownership="1" gtk_icon_view_get_tooltip_context.iter is_out="1" GtkIconView::item_activated has_emitter="1" gtk_icon_view_select_all hidden="1" experimental="1" +gtk_icon_view_selected_foreach.data hidden="1" +gtk_icon_view_set_cursor.cell nullable="1" gtk_icon_view_set_model.model nullable="1" gtk_icon_view_unselect_all hidden="1" experimental="1" GtkImage.data hidden="1" @@ -369,6 +375,9 @@ GtkTreeModel::row_inserted has_emitter="1" GtkTreeModel::rows_reordered has_emitter="1" gtk_tree_model_filter_convert_child_iter_to_iter.filter_iter is_out="1" gtk_tree_model_filter_convert_iter_to_child_iter.child_iter is_out="1" +gtk_tree_model_filter_set_visible_func.func transfer_ownership="1" +gtk_tree_model_filter_set_visible_func.data hidden="1" +gtk_tree_model_filter_set_visible_func.destroy hidden="1" gtk_tree_model_sort_convert_child_iter_to_iter.sort_iter is_out="1" gtk_tree_model_sort_convert_iter_to_child_iter.child_iter is_out="1" gtk_tree_path_get_indices is_array="1" no_array_length="1" @@ -376,8 +385,10 @@ gtk_tree_path_new_from_indices sentinel="-1" gtk_tree_path_copy transfer_ownership="1" GtkTreePath is_value_type="0" gtk_tree_row_reference_reordered.new_order is_array="1" +gtk_tree_row_reference_get_path transfer_ownership="1" gtk_tree_selection_get_selected.iter is_out="1" gtk_tree_selection_get_selected_rows transfer_ownership="1" type_arguments="TreePath" +gtk_tree_selection_selected_foreach.data hidden="1" gtk_tree_store_new ellipsis="1" gtk_tree_store_append.iter is_out="1" gtk_tree_store_append.parent nullable="1" @@ -404,12 +415,19 @@ gtk_tree_store_set_column_types.n_columns hidden="1" gtk_tree_store_set_column_types.types array_length_pos="0.9" gtk_tree_sortable_get_sort_column_id.sort_column_id is_out="1" gtk_tree_sortable_get_sort_column_id.order is_out="1" +gtk_tree_sortable_set_default_sort_func.sort_func transfer_ownership="1" +gtk_tree_sortable_set_default_sort_func.destroy hidden="1" +gtk_tree_sortable_set_sort_func.sort_func transfer_ownership="1" +gtk_tree_sortable_set_sort_func.destroy hidden="1" GtkTreeSortable::sort_column_changed has_emitter="1" gtk_tree_view_column_cell_get_size.cell_area is_out="1" gtk_tree_view_column_cell_get_size.x_offset is_out="1" gtk_tree_view_column_cell_get_size.y_offset is_out="1" gtk_tree_view_column_cell_get_size.width is_out="1" gtk_tree_view_column_cell_get_size.height is_out="1" +gtk_tree_view_column_set_cell_data_func.func transfer_ownership="1" +gtk_tree_view_column_set_cell_data_func.func_data hidden="1" +gtk_tree_view_column_set_cell_data_func.destroy hidden="1" gtk_tree_view_get_background_area.rect is_out="1" gtk_tree_view_get_cell_area.rect is_out="1" gtk_tree_view_get_path_at_pos.path value_owned="1" nullable="1" @@ -427,6 +445,7 @@ gtk_tree_view_insert_column_with_attributes.title nullable="1" gtk_tree_view_set_model.model nullable="1" gtk_tree_view_scroll_to_cell.path nullable="1" gtk_tree_view_scroll_to_cell.column nullable="1" +gtk_tree_view_set_cursor.focus_column nullable="1" gtk_tree_view_set_drag_dest_row.path nullable="1" GtkTreeView::row_activated has_emitter="1" GtkTreeView::row_expanded has_emitter="1"