nullable and generic type fixes, patch by Daniel Svensson

2008-04-24  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/gtk+-2.0/: nullable and generic type fixes,
	  patch by Daniel Svensson

	* vapi/gtk+-2.0.vapi: regenerated

svn path=/trunk/; revision=1313

diff --git a/ChangeLog b/ChangeLog
index b2a0baf0dff14bb8c0fda73719235e4a29cc21ff..adcfa7966a709e00179445fbef5fc407a228a8e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-24  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/gtk+-2.0/: nullable and generic type fixes,
+         patch by Daniel Svensson
+
+       * vapi/gtk+-2.0.vapi: regenerated
+
 2008-04-23  Jürg Billeter  <j@bitron.ch>
 
        * vala/valaparser.vala: re-add support for pre- and postconditions

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 88ad20121538b6af21c267cdb232270f05e56271..6896e6bb46d0d40a987a0ae4bc554e1a7d744a15 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -2347,7 +2347,7 @@ namespace Gtk {
                public CellView.with_text (string text);
                public void set_background_color (Gdk.Color color);
                public void set_displayed_row (Gtk.TreePath path);
-               public void set_model (Gtk.TreeModel model);
+               public void set_model (Gtk.TreeModel? model);
                [NoAccessorMethod]
                public weak string background { set; }
                [NoAccessorMethod]
@@ -2490,7 +2490,7 @@ namespace Gtk {
                public void set_add_tearoffs (bool add_tearoffs);
                public void set_column_span_column (int column_span);
                public void set_focus_on_click (bool focus_on_click);
-               public void set_model (Gtk.TreeModel model);
+               public void set_model (Gtk.TreeModel? model);
                public void set_row_separator_func (Gtk.TreeViewRowSeparatorFunc func, void* data, Gtk.DestroyNotify destroy);
                public void set_row_span_column (int row_span);
                public void set_title (string title);
@@ -2753,7 +2753,7 @@ namespace Gtk {
                public void set_inline_selection (bool inline_selection);
                public void set_match_func (Gtk.EntryCompletionMatchFunc func, void* func_data, GLib.DestroyNotify func_notify);
                public void set_minimum_key_length (int length);
-               public void set_model (Gtk.TreeModel model);
+               public void set_model (Gtk.TreeModel? model);
                public void set_popup_completion (bool popup_completion);
                public void set_popup_set_width (bool popup_set_width);
                public void set_popup_single_match (bool popup_single_match);
@@ -3126,7 +3126,7 @@ namespace Gtk {
                public void set_item_width (int item_width);
                public void set_margin (int margin);
                public void set_markup_column (int column);
-               public void set_model (Gtk.TreeModel model);
+               public void set_model (Gtk.TreeModel? model);
                public void set_orientation (Gtk.Orientation orientation);
                public void set_pixbuf_column (int column);
                public void set_reorderable (bool reorderable);
@@ -3222,7 +3222,7 @@ namespace Gtk {
        public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable {
                public weak Gtk.Widget get_image ();
                public ImageMenuItem ();
-               public ImageMenuItem.from_stock (string stock_id, Gtk.AccelGroup accel_group);
+               public ImageMenuItem.from_stock (string stock_id, Gtk.AccelGroup? accel_group);
                public ImageMenuItem.with_label (string label);
                public ImageMenuItem.with_mnemonic (string label);
                public void set_image (Gtk.Widget image);
@@ -3456,7 +3456,7 @@ namespace Gtk {
                public weak string get_title ();
                public Menu ();
                public void popdown ();
-               public void popup (Gtk.Widget parent_menu_shell, Gtk.Widget parent_menu_item, Gtk.MenuPositionFunc func, uint button, uint activate_time);
+               public void popup (Gtk.Widget? parent_menu_shell, Gtk.Widget? parent_menu_item, Gtk.MenuPositionFunc? func, uint button, uint activate_time);
                public void reorder_child (Gtk.Widget child, int position);
                public void reposition ();
                public void set_accel_group (Gtk.AccelGroup accel_group);
@@ -5302,7 +5302,7 @@ namespace Gtk {
                public int count_selected_rows ();
                public Gtk.SelectionMode get_mode ();
                public bool get_selected (out weak Gtk.TreeModel model, out Gtk.TreeIter iter);
-               public GLib.List get_selected_rows (out weak Gtk.TreeModel model);
+               public GLib.List<Gtk.TreePath> get_selected_rows (out weak Gtk.TreeModel model);
                public weak Gtk.TreeView get_tree_view ();
                public void* get_user_data ();
                public bool iter_is_selected (Gtk.TreeIter iter);
@@ -5417,7 +5417,7 @@ namespace Gtk {
                public bool get_visible_range (out weak Gtk.TreePath start_path, out weak Gtk.TreePath end_path);
                public void get_visible_rect (out Gdk.Rectangle visible_rect);
                public int insert_column (Gtk.TreeViewColumn column, int position);
-               public int insert_column_with_attributes (int position, string title, Gtk.CellRenderer cell, ...);
+               public int insert_column_with_attributes (int position, string? title, Gtk.CellRenderer cell, ...);
                public int insert_column_with_data_func (int position, string title, Gtk.CellRenderer cell, Gtk.TreeCellDataFunc func, void* data, GLib.DestroyNotify dnotify);
                public bool is_rubber_banding_active ();
                public void map_expanded_rows (Gtk.TreeViewMappingFunc func, void* data);
@@ -5425,13 +5425,13 @@ namespace Gtk {
                public TreeView ();
                public TreeView.with_model (Gtk.TreeModel model);
                public int remove_column (Gtk.TreeViewColumn column);
-               public void scroll_to_cell (Gtk.TreePath path, Gtk.TreeViewColumn column, bool use_align, float row_align, float col_align);
+               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_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);
+               public void set_drag_dest_row (Gtk.TreePath? path, Gtk.TreeViewDropPosition pos);
                public void set_enable_search (bool enable_search);
                public void set_enable_tree_lines (bool enabled);
                public void set_expander_column (Gtk.TreeViewColumn column);
@@ -5550,7 +5550,7 @@ namespace Gtk {
                public weak Gtk.Widget get_widget ();
                public int get_width ();
                public TreeViewColumn ();
-               public TreeViewColumn.with_attributes (string title, Gtk.CellRenderer cell, ...);
+               public TreeViewColumn.with_attributes (string? title, Gtk.CellRenderer cell, ...);
                public void pack_end (Gtk.CellRenderer cell, bool expand);
                public void pack_start (Gtk.CellRenderer cell, bool expand);
                public void queue_resize ();

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index eb8461a1ef1fe1476ebbf71f0d39042a1b9ad89b..e8fbc415a8849e070cc949b5f57b64151c35727e 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -60,6 +60,7 @@ gtk_cell_renderer_get_size.width is_out="1"
 gtk_cell_renderer_get_size.height is_out="1"
 GtkCellRenderer::editing_canceled has_emitter="1"
 gtk_cell_view_get_size_of_row.requisition is_out="1"
+gtk_cell_view_set_model.model nullable="1"
 GtkCheckMenuItem::toggled has_emitter="1"
 GtkCList::select_all has_emitter="1"
 GtkCList::select_row has_emitter="1"
@@ -70,6 +71,7 @@ gtk_color_button_get_color.color is_out="1"
 gtk_color_selection_get_current_color.color is_out="1"
 gtk_color_selection_get_previous_color.color is_out="1"
 gtk_combo_box_get_active_iter.iter is_out="1"
+gtk_combo_box_set_model.model nullable="1"
 GtkComboBox::popdown has_emitter="1"
 GtkComboBox::popup has_emitter="1"
 GtkContainer::add has_emitter="1"
@@ -84,6 +86,7 @@ GtkDialog.action_area type_name="HButtonBox"
 GtkEditable::delete_text has_emitter="1"
 GtkEditable::insert_text has_emitter="1"
 GtkEntryCompletion::insert_prefix has_emitter="1"
+gtk_entry_completion_set_model.model nullable="1"
 gtk_false hidden="1"
 GtkHandleBox.child_detached hidden="1"
 gtk_get_option_group transfer_ownership="1"
@@ -91,8 +94,10 @@ gtk_icon_info_get_embedded_rect.rectangle is_out="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_set_model.model nullable="1"
 gtk_icon_view_unselect_all hidden="1" experimental="1"
 GtkImage.data hidden="1"
+gtk_image_menu_item_new_from_stock.accel_group nullable="1"
 GtkIMContext::delete_surrounding has_emitter="1"
 gtk_init.argc hidden="1"
 gtk_init.argv is_array="1" is_ref="1" array_length_pos="0.9"
@@ -127,6 +132,9 @@ gtk_list_store_set_column_types.n_columns hidden="1"
 gtk_list_store_set_column_types.types array_length_pos="0.9"
 gtk_list_store_set ellipsis="1" sentinel="-1"
 gtk_menu_popup.data hidden="1"
+gtk_menu_popup.func nullable="1"
+gtk_menu_popup.parent_menu_shell nullable="1"
+gtk_menu_popup.parent_menu_item nullable="1"
 GtkMenuItem::activate has_emitter="1"
 GtkMenuItem::toggle_size_allocate has_emitter="1"
 GtkMenuItem::toggle_size_request has_emitter="1"
@@ -263,7 +271,7 @@ gtk_tree_path_copy transfer_ownership="1"
 GtkTreePath is_value_type="0"
 gtk_tree_row_reference_reordered.new_order is_array="1"
 gtk_tree_selection_get_selected.iter is_out="1"
-gtk_tree_selection_get_selected_rows transfer_ownership="1"
+gtk_tree_selection_get_selected_rows transfer_ownership="1" type_arguments="TreePath"
 gtk_tree_store_new ellipsis="1"
 gtk_tree_store_append.iter is_out="1"
 gtk_tree_store_append.parent nullable="1"
@@ -303,11 +311,17 @@ gtk_tree_view_get_drag_dest_row.pos is_out="1"
 gtk_tree_view_get_tooltip_context.iter is_out="1"
 gtk_tree_view_get_visible_rect.visible_rect is_out="1"
 gtk_tree_view_insert_column_with_attributes ellipsis="1"
+gtk_tree_view_insert_column_with_attributes.title nullable="1"
+gtk_tree_view_scroll_to_cell.path nullable="1"
+gtk_tree_view_scroll_to_cell.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"
 GtkTreeViewColumn::clicked has_emitter="1"
 gtk_tree_view_column_new_with_attributes ellipsis="1"
+gtk_tree_view_column_new_with_attributes.title nullable="1"
 gtk_tree_view_column_set_attributes ellipsis="1"
+gtk_tree_view_column_set_model.model nullable="1"
 gtk_true hidden="1"
 GtkWidget::can_activate_accel has_emitter="1"
 gtk_widget_destroy hidden="1"