diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 15 | ||||
| -rw-r--r-- | docs/reference/ChangeLog | 4 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 60 | ||||
| -rw-r--r-- | gtk/gtkenums.h | 2 | ||||
| -rw-r--r-- | gtk/gtkiconfactory.c | 8 | ||||
| -rw-r--r-- | gtk/gtknotebook.c | 2 | ||||
| -rw-r--r-- | gtk/gtktreestore.c | 60 | ||||
| -rw-r--r-- | gtk/gtktreestore.h | 4 | ||||
| -rw-r--r-- | gtk/gtktreeviewcolumn.c | 2 | ||||
| -rw-r--r-- | gtk/gtkwindow.c | 8 |
15 files changed, 194 insertions, 46 deletions
@@ -1,3 +1,18 @@ +2002-10-11 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): + * gtk/gtknotebook.c (gtk_notebook_get_n_pages): + * gtk/gtkwindow.c (gtk_window_set_icon_from_file): + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_focus_cell): Fix + doc comments. + + * gtk/gtktreestore.c: + * gtk/gtktreestore.h: Consistently name first parameter + tree_store, and make header and implementation agree on parameter + names to silence gtk-doc. + + * gtk/gtkenums.h (enum): Comment typo fix. + Thu Oct 10 15:13:48 2002 Manish Singh <yosh@gimp.org> * gtk/gtkimcontext.[ch] gtk/gtkimcontextsimple.[ch] gtk/gtkimmodule.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c5ee1bc50a..cee8831328 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +2002-10-11 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): + * gtk/gtknotebook.c (gtk_notebook_get_n_pages): + * gtk/gtkwindow.c (gtk_window_set_icon_from_file): + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_focus_cell): Fix + doc comments. + + * gtk/gtktreestore.c: + * gtk/gtktreestore.h: Consistently name first parameter + tree_store, and make header and implementation agree on parameter + names to silence gtk-doc. + + * gtk/gtkenums.h (enum): Comment typo fix. + Thu Oct 10 15:13:48 2002 Manish Singh <yosh@gimp.org> * gtk/gtkimcontext.[ch] gtk/gtkimcontextsimple.[ch] gtk/gtkimmodule.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c5ee1bc50a..cee8831328 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +2002-10-11 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): + * gtk/gtknotebook.c (gtk_notebook_get_n_pages): + * gtk/gtkwindow.c (gtk_window_set_icon_from_file): + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_focus_cell): Fix + doc comments. + + * gtk/gtktreestore.c: + * gtk/gtktreestore.h: Consistently name first parameter + tree_store, and make header and implementation agree on parameter + names to silence gtk-doc. + + * gtk/gtkenums.h (enum): Comment typo fix. + Thu Oct 10 15:13:48 2002 Manish Singh <yosh@gimp.org> * gtk/gtkimcontext.[ch] gtk/gtkimcontextsimple.[ch] gtk/gtkimmodule.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c5ee1bc50a..cee8831328 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +2002-10-11 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): + * gtk/gtknotebook.c (gtk_notebook_get_n_pages): + * gtk/gtkwindow.c (gtk_window_set_icon_from_file): + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_focus_cell): Fix + doc comments. + + * gtk/gtktreestore.c: + * gtk/gtktreestore.h: Consistently name first parameter + tree_store, and make header and implementation agree on parameter + names to silence gtk-doc. + + * gtk/gtkenums.h (enum): Comment typo fix. + Thu Oct 10 15:13:48 2002 Manish Singh <yosh@gimp.org> * gtk/gtkimcontext.[ch] gtk/gtkimcontextsimple.[ch] gtk/gtkimmodule.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c5ee1bc50a..cee8831328 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +2002-10-11 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): + * gtk/gtknotebook.c (gtk_notebook_get_n_pages): + * gtk/gtkwindow.c (gtk_window_set_icon_from_file): + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_focus_cell): Fix + doc comments. + + * gtk/gtktreestore.c: + * gtk/gtktreestore.h: Consistently name first parameter + tree_store, and make header and implementation agree on parameter + names to silence gtk-doc. + + * gtk/gtkenums.h (enum): Comment typo fix. + Thu Oct 10 15:13:48 2002 Manish Singh <yosh@gimp.org> * gtk/gtkimcontext.[ch] gtk/gtkimcontextsimple.[ch] gtk/gtkimmodule.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c5ee1bc50a..cee8831328 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +2002-10-11 Matthias Clasen <maclas@gmx.de> + + * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): + * gtk/gtknotebook.c (gtk_notebook_get_n_pages): + * gtk/gtkwindow.c (gtk_window_set_icon_from_file): + * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_focus_cell): Fix + doc comments. + + * gtk/gtktreestore.c: + * gtk/gtktreestore.h: Consistently name first parameter + tree_store, and make header and implementation agree on parameter + names to silence gtk-doc. + + * gtk/gtkenums.h (enum): Comment typo fix. + Thu Oct 10 15:13:48 2002 Manish Singh <yosh@gimp.org> * gtk/gtkimcontext.[ch] gtk/gtkimcontextsimple.[ch] gtk/gtkimmodule.c diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index b43d8bad43..5401976a3c 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +2002-10-11 Matthias Clasen <maclas@gmx.de> + + * gtk/gtk-sections.txt: Add some missing symbols. + 2002-10-04 Matthias Clasen <maclas@gmx.de> * gtk/running.sgml: Document GDK_PIXBUF_MODULE_FILE. diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 433d2f46c7..fb1cafa36b 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -11,6 +11,7 @@ gtk_accel_group_unref gtk_accel_group_connect gtk_accel_group_connect_by_path GtkAccelGroupActivate +GtkAccelGroupFindFunc gtk_accel_group_disconnect gtk_accel_group_disconnect_key gtk_accel_group_query @@ -1578,6 +1579,7 @@ gtk_menu_shell_prepend gtk_menu_shell_insert gtk_menu_shell_deactivate gtk_menu_shell_select_item +gtk_menu_shell_select_first gtk_menu_shell_deselect gtk_menu_shell_activate_item GtkMenuDirectionType @@ -1658,6 +1660,7 @@ gtk_notebook_popup_disable gtk_notebook_get_current_page gtk_notebook_get_menu_label gtk_notebook_get_nth_page +gtk_notebook_get_n_pages gtk_notebook_get_tab_label gtk_notebook_query_tab_label_packing gtk_notebook_set_homogeneous_tabs @@ -2132,6 +2135,7 @@ GTK_SETTINGS_GET_CLASS GTK_TYPE_SETTINGS <SUBSECTION Private> gtk_settings_get_type +GtkSettingsPropertyValue </SECTION> <SECTION> @@ -2826,6 +2830,7 @@ GtkTreeModelForeachFunc GtkTreeModelFlags gtk_tree_path_new gtk_tree_path_new_from_string +gtk_tree_path_new_from_indices gtk_tree_path_to_string gtk_tree_path_new_first gtk_tree_path_new_root @@ -2847,6 +2852,7 @@ gtk_tree_row_reference_new_proxy gtk_tree_row_reference_get_path gtk_tree_row_reference_valid gtk_tree_row_reference_free +gtk_tree_row_reference_copy gtk_tree_row_reference_inserted gtk_tree_row_reference_deleted gtk_tree_row_reference_reordered @@ -2867,6 +2873,7 @@ gtk_tree_model_iter_has_child gtk_tree_model_iter_n_children gtk_tree_model_iter_nth_child gtk_tree_model_iter_parent +gtk_tree_model_get_string_from_iter gtk_tree_model_ref_node gtk_tree_model_unref_node gtk_tree_model_get @@ -2884,6 +2891,7 @@ GTK_TYPE_TREE_MODEL GTK_TREE_MODEL_GET_IFACE GTK_TYPE_TREE_ITER GTK_TYPE_TREE_PATH +GTK_TYPE_TREE_ROW_REFERENCE <SUBSECTION Private> gtk_tree_model_get_type gtk_tree_iter_get_type @@ -2902,6 +2910,7 @@ gtk_tree_model_sort_convert_path_to_child_path gtk_tree_model_sort_convert_iter_to_child_iter gtk_tree_model_sort_reset_default_sort_func gtk_tree_model_sort_clear_cache +gtk_tree_model_sort_iter_is_valid <SUBSECTION Standard> GTK_TREE_MODEL_SORT GTK_IS_TREE_MODEL_SORT @@ -2926,6 +2935,8 @@ gtk_tree_selection_get_user_data gtk_tree_selection_get_tree_view gtk_tree_selection_get_selected gtk_tree_selection_selected_foreach +gtk_tree_selection_get_selected_rows +gtk_tree_selection_count_selected_rows gtk_tree_selection_select_path gtk_tree_selection_unselect_path gtk_tree_selection_path_is_selected @@ -2935,6 +2946,7 @@ gtk_tree_selection_iter_is_selected gtk_tree_selection_select_all gtk_tree_selection_unselect_all gtk_tree_selection_select_range +gtk_tree_selection_unselect_range <SUBSECTION Standard> GTK_TREE_SELECTION GTK_IS_TREE_SELECTION @@ -3015,6 +3027,10 @@ gtk_tree_store_append gtk_tree_store_is_ancestor gtk_tree_store_iter_depth gtk_tree_store_clear +gtk_tree_store_iter_is_valid +gtk_tree_store_reorder +gtk_tree_store_swap +gtk_tree_store_move <SUBSECTION Standard> GTK_TREE_STORE GTK_IS_TREE_STORE @@ -3077,6 +3093,7 @@ gtk_tree_view_column_get_sort_order gtk_tree_view_column_cell_set_cell_data gtk_tree_view_column_cell_get_size gtk_tree_view_column_cell_is_visible +gtk_tree_view_column_focus_cell <SUBSECTION Standard> GTK_TREE_VIEW_COLUMN GTK_IS_TREE_VIEW_COLUMN @@ -3126,10 +3143,12 @@ gtk_tree_view_set_column_drag_function gtk_tree_view_scroll_to_point gtk_tree_view_scroll_to_cell gtk_tree_view_set_cursor +gtk_tree_view_set_cursor_on_cell gtk_tree_view_get_cursor gtk_tree_view_row_activated gtk_tree_view_expand_all gtk_tree_view_collapse_all +gtk_tree_view_expand_to_path gtk_tree_view_expand_row gtk_tree_view_collapse_row gtk_tree_view_map_expanded_rows @@ -3301,6 +3320,10 @@ gtk_list_store_insert_after gtk_list_store_prepend gtk_list_store_append gtk_list_store_clear +gtk_list_store_iter_is_valid +gtk_list_store_reorder +gtk_list_store_swap +gtk_list_store_move <SUBSECTION Standard> GTK_LIST_STORE GTK_IS_LIST_STORE @@ -3674,6 +3697,8 @@ gtk_window_stick gtk_window_unstick gtk_window_maximize gtk_window_unmaximize +gtk_window_fullscreen +gtk_window_unfullscreen gtk_window_begin_resize_drag gtk_window_begin_move_drag gtk_window_set_decorated @@ -3682,6 +3707,8 @@ gtk_window_set_has_frame gtk_window_set_mnemonic_modifier gtk_window_set_role gtk_window_set_type_hint +gtk_window_set_skip_taskbar_hint +gtk_window_set_skip_pager_hint gtk_window_get_decorated gtk_window_get_default_icon_list gtk_window_get_default_size @@ -3698,13 +3725,17 @@ gtk_window_get_size gtk_window_get_title gtk_window_get_transient_for gtk_window_get_type_hint +gtk_window_get_skip_taskbar_hint +gtk_window_get_skip_pager_hint gtk_window_move gtk_window_parse_geometry gtk_window_reshow_with_initial_size gtk_window_resize gtk_window_set_default_icon_list +gtk_window_set_default_icon_from_file gtk_window_set_icon gtk_window_set_icon_list +gtk_window_set_icon_from_file <SUBSECTION Standard> GTK_WINDOW GTK_IS_WINDOW @@ -3764,6 +3795,7 @@ gtk_main_iteration_do gtk_main_do_event GtkModuleInitFunc +GtkModuleDisplayInitFunc <SUBSECTION> gtk_true @@ -4026,10 +4058,6 @@ gtk_selection_data_free <SUBSECTION Standard> GTK_TYPE_SELECTION_DATA <SUBSECTION Private> -gtk_selection_incr_event -gtk_selection_notify -gtk_selection_property_notify -gtk_selection_request gtk_selection_data_copy gtk_selection_data_get_type </SECTION> @@ -4055,6 +4083,12 @@ gtk_clipboard_request_text gtk_clipboard_wait_for_contents gtk_clipboard_wait_for_text gtk_clipboard_wait_is_text_available +<SUBSECTION Standard> +GTK_CLIPBOARD +GTK_TYPE_CLIPBOARD +GTK_IS_CLIPBOARD +<SUBSECTION Private> +gtk_clipboard_get_type </SECTION> <SECTION> @@ -4206,6 +4240,22 @@ gtk_type_enum_find_value gtk_type_flags_find_value <SUBSECTION Private> GTK_TYPE_IDENTIFIER +GTK_TYPE_UINT +GTK_TYPE_ULONG +GTK_TYPE_LONG +GTK_TYPE_STRING +GTK_TYPE_INT +GTK_TYPE_NONE +GTK_TYPE_FLOAT +GTK_TYPE_FLAGS +GTK_TYPE_ENUM +GTK_TYPE_UCHAR +GTK_TYPE_POINTER +GTK_TYPE_BOOL +GTK_TYPE_CHAR +GTK_TYPE_BOXED +GTK_TYPE_DOUBLE +GTK_TYPE_INVALID gtk_identifier_get_type </SECTION> @@ -4294,6 +4344,7 @@ GTK_STOCK_CANCEL GTK_STOCK_CDROM GTK_STOCK_CLEAR GTK_STOCK_CLOSE +GTK_STOCK_COLOR_PICKER GTK_STOCK_CONVERT GTK_STOCK_COPY GTK_STOCK_CUT @@ -4383,6 +4434,7 @@ gtk_icon_set_ref gtk_icon_set_render_icon gtk_icon_set_unref gtk_icon_size_lookup +gtk_icon_size_lookup_for_settings gtk_icon_size_register gtk_icon_size_register_alias gtk_icon_size_from_name diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index 44da0244e5..9eafc17412 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -425,7 +425,7 @@ typedef enum GTK_SORT_DESCENDING } GtkSortType; -/* Style for gtk input method preeeit/status */ +/* Style for gtk input method preedit/status */ typedef enum { GTK_IM_PREEDIT_NOTHING, diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 290aeb5691..37a6a0d399 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -1188,7 +1188,7 @@ icon_size_lookup_intern (GtkSettings *settings, /** * gtk_icon_size_lookup_for_settings: - * @GtkSettings: a #GtkSettings object, used to determine + * @settings: a #GtkSettings object, used to determine * which set of user preferences to used. * @size: an icon size * @width: location to store icon width @@ -1210,12 +1210,12 @@ icon_size_lookup_intern (GtkSettings *settings, gboolean gtk_icon_size_lookup_for_settings (GtkSettings *settings, GtkIconSize size, - gint *widthp, - gint *heightp) + gint *width, + gint *height) { g_return_val_if_fail (GTK_IS_SETTINGS (settings), FALSE); - return icon_size_lookup_intern (settings, size, widthp, heightp); + return icon_size_lookup_intern (settings, size, width, height); } /** diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 2bba4d9c15..e0d27da7f9 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -4154,7 +4154,7 @@ gtk_notebook_get_nth_page (GtkNotebook *notebook, } /** - * gtk_notebook_get_nth_page: + * gtk_notebook_get_n_pages: * @notebook: a #GtkNotebook * * Gets the number of pages in a notebook. diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 4b9441c080..dadd119a18 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -1878,16 +1878,16 @@ gtk_tree_store_reorder_func (gconstpointer a, /** * gtk_tree_store_reorder: - * @store: A #GtkTreeStore. + * @tree_store: A #GtkTreeStore. * @parent: A #GtkTreeIter. * @new_order: An integer array indication the new order for the list. * - * Reorders the children of @parent in @store to follow the order + * Reorders the children of @parent in @tree_store to follow the order * indicated by @new_order. Note that this function only works with * unsorted stores. **/ void -gtk_tree_store_reorder (GtkTreeStore *store, +gtk_tree_store_reorder (GtkTreeStore *tree_store, GtkTreeIter *parent, gint *new_order) { @@ -1896,13 +1896,13 @@ gtk_tree_store_reorder (GtkTreeStore *store, GtkTreePath *path; SortTuple *sort_array; - g_return_if_fail (GTK_IS_TREE_STORE (store)); - g_return_if_fail (!GTK_TREE_STORE_IS_SORTED (store)); - g_return_if_fail (parent == NULL || VALID_ITER (parent, store)); + g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + g_return_if_fail (!GTK_TREE_STORE_IS_SORTED (tree_store)); + g_return_if_fail (parent == NULL || VALID_ITER (parent, tree_store)); g_return_if_fail (new_order != NULL); if (!parent) - level = G_NODE (store->root)->children; + level = G_NODE (tree_store->root)->children; else level = G_NODE (parent->user_data)->children; @@ -1944,14 +1944,14 @@ gtk_tree_store_reorder (GtkTreeStore *store, if (parent) G_NODE (parent->user_data)->children = sort_array[0].node; else - G_NODE (store->root)->children = sort_array[0].node; + G_NODE (tree_store->root)->children = sort_array[0].node; /* emit signal */ if (parent) - path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), parent); + path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), parent); else path = gtk_tree_path_new (); - gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store), path, + gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), path, parent, new_order); gtk_tree_path_free (path); g_free (sort_array); @@ -1959,15 +1959,15 @@ gtk_tree_store_reorder (GtkTreeStore *store, /** * gtk_tree_store_swap: - * @store: A #GtkTreeStore. + * @tree_store: A #GtkTreeStore. * @a: A #GtkTreeIter. * @b: Another #GtkTreeIter. * - * Swaps @a and @b in the same level of @store. Note that this function + * Swaps @a and @b in the same level of @tree_store. Note that this function * only works with unsorted stores. **/ void -gtk_tree_store_swap (GtkTreeStore *store, +gtk_tree_store_swap (GtkTreeStore *tree_store, GtkTreeIter *a, GtkTreeIter *b) { @@ -1976,9 +1976,9 @@ gtk_tree_store_swap (GtkTreeStore *store, GtkTreePath *path_a, *path_b; GtkTreeIter parent; - g_return_if_fail (GTK_IS_TREE_STORE (store)); - g_return_if_fail (VALID_ITER (a, store)); - g_return_if_fail (VALID_ITER (b, store)); + g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + g_return_if_fail (VALID_ITER (a, tree_store)); + g_return_if_fail (VALID_ITER (b, tree_store)); node_a = G_NODE (a->user_data); node_b = G_NODE (b->user_data); @@ -1987,8 +1987,8 @@ gtk_tree_store_swap (GtkTreeStore *store, if (node_a == node_b) return; - path_a = gtk_tree_model_get_path (GTK_TREE_MODEL (store), a); - path_b = gtk_tree_model_get_path (GTK_TREE_MODEL (store), b); + path_a = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), a); + path_b = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), b); g_return_if_fail (path_a && path_b); @@ -2004,7 +2004,7 @@ gtk_tree_store_swap (GtkTreeStore *store, return; } - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &parent, path_a); + gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent, path_a); parent_node = G_NODE (parent.user_data); gtk_tree_path_free (path_b); @@ -2059,7 +2059,7 @@ gtk_tree_store_swap (GtkTreeStore *store, else order[i] = i; - gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store), path_a, + gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), path_a, &parent, order); gtk_tree_path_free (path_a); g_free (order); @@ -2067,16 +2067,16 @@ gtk_tree_store_swap (GtkTreeStore *store, /** * gtk_tree_store_move: - * @store: A #GtkTreeStore. + * @tree_store: A #GtkTreeStore. * @iter: A #GtkTreeIter. * @position: A #GtkTreePath. * - * Moves @iter in @store to the position before @position. @iter and + * Moves @iter in @tree_store to the position before @position. @iter and * @position should be in the same level. Note that this function only * works with unsorted stores. **/ void -gtk_tree_store_move (GtkTreeStore *store, +gtk_tree_store_move (GtkTreeStore *tree_store, GtkTreeIter *iter, GtkTreePath *position) { @@ -2085,13 +2085,13 @@ gtk_tree_store_move (GtkTreeStore *store, GtkTreePath *path, *tmppath; GtkTreeIter parent, new_iter; - g_return_if_fail (GTK_IS_TREE_STORE (store)); - g_return_if_fail (!GTK_TREE_STORE_IS_SORTED (store)); - g_return_if_fail (VALID_ITER (iter, store)); + g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + g_return_if_fail (!GTK_TREE_STORE_IS_SORTED (tree_store)); + g_return_if_fail (VALID_ITER (iter, tree_store)); g_return_if_fail (position != NULL); /* sanity checks */ - path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), iter); + path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter); if (!gtk_tree_path_compare (path, position)) { @@ -2121,9 +2121,9 @@ gtk_tree_store_move (GtkTreeStore *store, } gtk_tree_path_free (tmppath); - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &parent, path); + gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent, path); - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &new_iter, position); + gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &new_iter, position); new_prev = G_NODE (new_iter.user_data)->prev; new_next = G_NODE (new_iter.user_data); @@ -2177,7 +2177,7 @@ gtk_tree_store_move (GtkTreeStore *store, order[i] = i; path = gtk_tree_path_new (); - gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store), + gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), path, NULL, order); gtk_tree_path_free (path); g_free (order); diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h index 988e7f034f..d8a5f9d297 100644 --- a/gtk/gtktreestore.h +++ b/gtk/gtktreestore.h @@ -120,10 +120,10 @@ gboolean gtk_tree_store_iter_is_valid (GtkTreeStore *tree_store, void gtk_tree_store_reorder (GtkTreeStore *tree_store, GtkTreeIter *parent, gint *new_order); -void gtk_tree_store_swap (GtkTreeStore *store, +void gtk_tree_store_swap (GtkTreeStore *tree_store, GtkTreeIter *a, GtkTreeIter *b); -void gtk_tree_store_move (GtkTreeStore *store, +void gtk_tree_store_move (GtkTreeStore *tree_store, GtkTreeIter *iter, GtkTreePath *position); diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 34c5d3b832..df055b95ce 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -3110,7 +3110,7 @@ gtk_tree_view_column_cell_is_visible (GtkTreeViewColumn *tree_column) /** * gtk_tree_view_column_focus_cell: - * @tree_view: A #GtkTreeView + * @tree_column: A #GtkTreeViewColumn * @cell: A #GtkCellRenderer * * Sets the current keyboard focus to be at @cell, if the column contains diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index a1ca14cc7f..b3682d184a 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2619,13 +2619,15 @@ load_pixbuf_verbosely (const char *filename, /** * gtk_window_set_icon_from_file: * @window: a #GtkWindow - * @list: a list of #GdkPixbuf + * @filename: location of icon file * @err: location to store error, or %NULL. * - * Sets the icon for @wi - * had gtk_window_set_icon_list() called on them as a single file. + * Sets the icon for @window. * Warns on failure if @err is %NULL. * + * This function is equivalent to calling gtk_window_set_icon() + * with a pixbuf created by loading the image from @filename. + * * Returns: %TRUE if setting the icon succeeded. **/ gboolean |