Commit fe8a946e authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

deprecate GtkDestroyNotify.

2008-06-18  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktypeutils.h: deprecate GtkDestroyNotify.

	* gtk/gtkactiongroup.[ch]
	* gtk/gtkcombobox.[ch]
	* gtk/gtkcontainer.[ch]
	* gtk/gtkliststore.[ch]
	* gtk/gtkmain.[ch]
	* gtk/gtkmenu.c
	* gtk/gtkstock.[ch]
	* gtk/gtktreedatalist.[ch]
	* gtk/gtktreemodelfilter.[ch]
	* gtk/gtktreemodelsort.[ch]
	* gtk/gtktreeprivate.h
	* gtk/gtktreeselection.[ch]
	* gtk/gtktreesortable.[ch]
	* gtk/gtktreestore.[ch]
	* gtk/gtktreeview.[ch]
	* gtk/gtktreeviewcolumn.[ch]: s/GtkDestroyNotify/GDestroyNotify/g.


svn path=/trunk/; revision=20448
parent 060948a4
2008-06-18 Michael Natterer <mitch@imendio.com>
* gtk/gtktypeutils.h: deprecate GtkDestroyNotify.
* gtk/gtkactiongroup.[ch]
* gtk/gtkcombobox.[ch]
* gtk/gtkcontainer.[ch]
* gtk/gtkliststore.[ch]
* gtk/gtkmain.[ch]
* gtk/gtkmenu.c
* gtk/gtkstock.[ch]
* gtk/gtktreedatalist.[ch]
* gtk/gtktreemodelfilter.[ch]
* gtk/gtktreemodelsort.[ch]
* gtk/gtktreeprivate.h
* gtk/gtktreeselection.[ch]
* gtk/gtktreesortable.[ch]
* gtk/gtktreestore.[ch]
* gtk/gtktreeview.[ch]
* gtk/gtktreeviewcolumn.[ch]: s/GtkDestroyNotify/GDestroyNotify/g.
2008-06-18 Michael Natterer <mitch@imendio.com>
* tests/testgtk.c: some more undeprecation.
......
......@@ -56,7 +56,7 @@ struct _GtkActionGroupPrivate
GtkTranslateFunc translate_func;
gpointer translate_data;
GtkDestroyNotify translate_notify;
GDestroyNotify translate_notify;
};
enum
......@@ -1247,9 +1247,9 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group
* @action_group: a #GtkActionGroup
* @func: a #GtkTranslateFunc
* @data: data to be passed to @func and @notify
* @notify: a #GtkDestroyNotify function to be called when @action_group is
* @notify: a #GDestroyNotify function to be called when @action_group is
* destroyed and when the translation function is changed again
*
*
* Sets a function to be used for translating the @label and @tooltip of
* #GtkActionGroupEntry<!-- -->s added by gtk_action_group_add_actions().
*
......@@ -1262,7 +1262,7 @@ void
gtk_action_group_set_translate_func (GtkActionGroup *action_group,
GtkTranslateFunc func,
gpointer data,
GtkDestroyNotify notify)
GDestroyNotify notify)
{
g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
......
......@@ -161,7 +161,7 @@ void gtk_action_group_add_radio_actions_full (GtkActionGroup
void gtk_action_group_set_translate_func (GtkActionGroup *action_group,
GtkTranslateFunc func,
gpointer data,
GtkDestroyNotify notify);
GDestroyNotify notify);
void gtk_action_group_set_translation_domain (GtkActionGroup *action_group,
const gchar *domain);
G_CONST_RETURN gchar *gtk_action_group_translate_string (GtkActionGroup *action_group,
......
......@@ -123,7 +123,7 @@ struct _GtkComboBoxPrivate
GtkTreeViewRowSeparatorFunc row_separator_func;
gpointer row_separator_data;
GtkDestroyNotify row_separator_destroy;
GDestroyNotify row_separator_destroy;
gchar *tearoff_title;
};
......@@ -5640,7 +5640,7 @@ void
gtk_combo_box_set_row_separator_func (GtkComboBox *combo_box,
GtkTreeViewRowSeparatorFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
......
......@@ -112,7 +112,7 @@ GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox
void gtk_combo_box_set_row_separator_func (GtkComboBox *combo_box,
GtkTreeViewRowSeparatorFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
/* convenience -- text */
GtkWidget *gtk_combo_box_new_text (void);
......
......@@ -1512,7 +1512,7 @@ gtk_container_foreach_full (GtkContainer *container,
GtkCallback callback,
GtkCallbackMarshal marshal,
gpointer callback_data,
GtkDestroyNotify notify)
GDestroyNotify notify)
{
g_return_if_fail (GTK_IS_CONTAINER (container));
......
......@@ -129,7 +129,7 @@ void gtk_container_foreach_full (GtkContainer *container,
GtkCallback callback,
GtkCallbackMarshal marshal,
gpointer callback_data,
GtkDestroyNotify notify);
GDestroyNotify notify);
#endif /* GTK_DISABLE_DEPRECATED */
GList* gtk_container_get_children (GtkContainer *container);
......
......@@ -111,11 +111,11 @@ static void gtk_list_store_set_sort_func (GtkTreeSortable *so
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
static void gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable);
......@@ -392,7 +392,7 @@ gtk_list_store_finalize (GObject *object)
if (list_store->default_sort_destroy)
{
GtkDestroyNotify d = list_store->default_sort_destroy;
GDestroyNotify d = list_store->default_sort_destroy;
list_store->default_sort_destroy = NULL;
d (list_store->default_sort_data);
......@@ -1831,7 +1831,7 @@ gtk_list_store_set_sort_func (GtkTreeSortable *sortable,
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GtkListStore *list_store = (GtkListStore *) sortable;
......@@ -1847,13 +1847,13 @@ static void
gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GtkListStore *list_store = (GtkListStore *) sortable;
if (list_store->default_sort_destroy)
{
GtkDestroyNotify d = list_store->default_sort_destroy;
GDestroyNotify d = list_store->default_sort_destroy;
list_store->default_sort_destroy = NULL;
d (list_store->default_sort_data);
......
......@@ -57,7 +57,7 @@ struct _GtkListStore
gint length;
GtkTreeIterCompareFunc default_sort_func;
gpointer default_sort_data;
GtkDestroyNotify default_sort_destroy;
GDestroyNotify default_sort_destroy;
guint columns_dirty : 1;
};
......
......@@ -127,14 +127,14 @@ struct _GtkQuitFunction
GtkCallbackMarshal marshal;
GtkFunction function;
gpointer data;
GtkDestroyNotify destroy;
GDestroyNotify destroy;
};
struct _GtkClosure
{
GtkCallbackMarshal marshal;
gpointer data;
GtkDestroyNotify destroy;
GDestroyNotify destroy;
};
struct _GtkKeySnooperData
......@@ -1867,7 +1867,7 @@ gtk_quit_add_full (guint main_level,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
static guint quit_id = 1;
GtkQuitFunction *quitf;
......@@ -1985,7 +1985,7 @@ gtk_timeout_add_full (guint32 interval,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
if (marshal)
{
......@@ -2024,7 +2024,7 @@ gtk_idle_add_full (gint priority,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
if (marshal)
{
......@@ -2078,7 +2078,7 @@ gtk_input_add_full (gint source,
GdkInputFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
if (marshal)
{
......
......@@ -167,7 +167,7 @@ guint gtk_quit_add_full (guint main_level,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_quit_remove (guint quit_handler_id);
void gtk_quit_remove_by_data (gpointer data);
#ifndef GTK_DISABLE_DEPRECATED
......@@ -178,7 +178,7 @@ guint gtk_timeout_add_full (guint32 interval,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_timeout_remove (guint timeout_handler_id);
guint gtk_idle_add (GtkFunction function,
......@@ -190,7 +190,7 @@ guint gtk_idle_add_full (gint priority,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_idle_remove (guint idle_handler_id);
void gtk_idle_remove_by_data (gpointer data);
guint gtk_input_add_full (gint source,
......@@ -198,7 +198,7 @@ guint gtk_input_add_full (gint source,
GdkInputFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_input_remove (guint input_handler_id);
#endif /* GTK_DISABLE_DEPRECATED */
......
......@@ -1033,8 +1033,9 @@ gtk_menu_attach_to_widget (GtkMenu *menu,
{
list = g_list_prepend (list, menu);
}
g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free);
g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list,
(GDestroyNotify) g_list_free);
if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL)
gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL);
......@@ -1086,7 +1087,8 @@ gtk_menu_detach (GtkMenu *menu)
list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS);
list = g_list_remove (list, menu);
if (list)
g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free);
g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list,
(GDestroyNotify) g_list_free);
else
g_object_set_data (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), NULL);
......
......@@ -47,7 +47,7 @@ struct _GtkStockTranslateFunc
{
GtkTranslateFunc func;
gpointer data;
GtkDestroyNotify notify;
GDestroyNotify notify;
};
static void
......@@ -410,7 +410,7 @@ static const GtkStockItem builtin_items [] =
* @domain: the translation domain for which @func shall be used
* @func: a #GtkTranslateFunc
* @data: data to pass to @func
* @notify: a #GtkDestroyNotify that is called when @data is
* @notify: a #GDestroyNotify that is called when @data is
* no longer needed
*
* Sets a function to be used for translating the @label of
......@@ -426,7 +426,7 @@ void
gtk_stock_set_translate_func (const gchar *domain,
GtkTranslateFunc func,
gpointer data,
GtkDestroyNotify notify)
GDestroyNotify notify)
{
GtkStockTranslateFunc *translate;
gchar *domainname;
......
......@@ -66,7 +66,7 @@ void gtk_stock_item_free (GtkStockItem *item);
void gtk_stock_set_translate_func (const gchar *domain,
GtkTranslateFunc func,
gpointer data,
GtkDestroyNotify notify);
GDestroyNotify notify);
/* Stock IDs (not all are stock items; some are images only) */
#define GTK_STOCK_DIALOG_AUTHENTICATION \
......
......@@ -483,7 +483,7 @@ _gtk_tree_data_list_header_free (GList *list)
if (header->destroy)
{
GtkDestroyNotify d = header->destroy;
GDestroyNotify d = header->destroy;
header->destroy = NULL;
d (header->data);
......@@ -515,7 +515,7 @@ _gtk_tree_data_list_set_header (GList *header_list,
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GList *list = header_list;
GtkTreeDataSortHeader *header = NULL;
......@@ -543,7 +543,7 @@ _gtk_tree_data_list_set_header (GList *header_list,
if (header->destroy)
{
GtkDestroyNotify d = header->destroy;
GDestroyNotify d = header->destroy;
header->destroy = NULL;
d (header->data);
......
......@@ -47,7 +47,7 @@ typedef struct _GtkTreeDataSortHeader
gint sort_column_id;
GtkTreeIterCompareFunc func;
gpointer data;
GtkDestroyNotify destroy;
GDestroyNotify destroy;
} GtkTreeDataSortHeader;
GtkTreeDataList *_gtk_tree_data_list_alloc (void);
......@@ -77,6 +77,6 @@ GList *_gtk_tree_data_list_set_header (GList *
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
#endif /* __GTK_TREE_DATA_LIST_H__ */
......@@ -91,13 +91,13 @@ struct _GtkTreeModelFilterPrivate
GtkTreeModelFilterVisibleFunc visible_func;
gpointer visible_data;
GtkDestroyNotify visible_destroy;
GDestroyNotify visible_destroy;
gint modify_n_columns;
GType *modify_types;
GtkTreeModelFilterModifyFunc modify_func;
gpointer modify_data;
GtkDestroyNotify modify_destroy;
GDestroyNotify modify_destroy;
gint visible_column;
......@@ -2890,7 +2890,7 @@ void
gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
GtkTreeModelFilterVisibleFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter));
g_return_if_fail (func != NULL);
......@@ -2898,7 +2898,7 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
if (filter->priv->visible_func)
{
GtkDestroyNotify d = filter->priv->visible_destroy;
GDestroyNotify d = filter->priv->visible_destroy;
filter->priv->visible_destroy = NULL;
d (filter->priv->visible_data);
......@@ -2936,7 +2936,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter,
GType *types,
GtkTreeModelFilterModifyFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter));
g_return_if_fail (func != NULL);
......@@ -2944,7 +2944,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter,
if (filter->priv->modify_destroy)
{
GtkDestroyNotify d = filter->priv->modify_destroy;
GDestroyNotify d = filter->priv->modify_destroy;
filter->priv->modify_destroy = NULL;
d (filter->priv->modify_data);
......
......@@ -75,13 +75,13 @@ GtkTreeModel *gtk_tree_model_filter_new (GtkTreeModel
void gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
GtkTreeModelFilterVisibleFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter *filter,
gint n_columns,
GType *types,
GtkTreeModelFilterModifyFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_tree_model_filter_set_visible_column (GtkTreeModelFilter *filter,
gint column);
......
......@@ -201,11 +201,11 @@ static void gtk_tree_model_sort_set_sort_func (GtkTreeSortable
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
static void gtk_tree_model_sort_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
static gboolean gtk_tree_model_sort_has_default_sort_func (GtkTreeSortable *sortable);
/* Private functions (sort funcs, level handling and other utils) */
......@@ -1356,7 +1356,7 @@ gtk_tree_model_sort_set_sort_func (GtkTreeSortable *sortable,
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) sortable;
......@@ -1372,13 +1372,13 @@ static void
gtk_tree_model_sort_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *)sortable;
if (tree_model_sort->default_sort_destroy)
{
GtkDestroyNotify d = tree_model_sort->default_sort_destroy;
GDestroyNotify d = tree_model_sort->default_sort_destroy;
tree_model_sort->default_sort_destroy = NULL;
d (tree_model_sort->default_sort_data);
......@@ -2398,7 +2398,7 @@ gtk_tree_model_sort_reset_default_sort_func (GtkTreeModelSort *tree_model_sort)
if (tree_model_sort->default_sort_destroy)
{
GtkDestroyNotify d = tree_model_sort->default_sort_destroy;
GDestroyNotify d = tree_model_sort->default_sort_destroy;
tree_model_sort->default_sort_destroy = NULL;
d (tree_model_sort->default_sort_data);
......
......@@ -58,7 +58,7 @@ struct _GtkTreeModelSort
/* default sort */
GtkTreeIterCompareFunc default_sort_func;
gpointer default_sort_data;
GtkDestroyNotify default_sort_destroy;
GDestroyNotify default_sort_destroy;
/* signal ids */
guint changed_id;
......
......@@ -159,14 +159,14 @@ struct _GtkTreeViewPrivate
GtkTreeViewColumnDropFunc column_drop_func;
gpointer column_drop_func_data;
GtkDestroyNotify column_drop_func_data_destroy;
GDestroyNotify column_drop_func_data_destroy;
GList *column_drag_info;
GtkTreeViewColumnReorder *cur_reorder;
/* ATK Hack */
GtkTreeDestroyCountFunc destroy_count_func;
gpointer destroy_count_data;
GtkDestroyNotify destroy_count_destroy;
GDestroyNotify destroy_count_destroy;
/* Scroll timeout (e.g. during dnd) */
guint scroll_timeout;
......@@ -245,7 +245,7 @@ struct _GtkTreeViewPrivate
GtkTreeViewSearchPositionFunc search_position_func;
GtkTreeViewSearchEqualFunc search_equal_func;
gpointer search_user_data;
GtkDestroyNotify search_destroy;
GDestroyNotify search_destroy;
gpointer search_position_user_data;
GDestroyNotify search_position_destroy;
GtkWidget *search_window;
......@@ -257,7 +257,7 @@ struct _GtkTreeViewPrivate
GtkTreeViewRowSeparatorFunc row_separator_func;
gpointer row_separator_data;
GtkDestroyNotify row_separator_destroy;
GDestroyNotify row_separator_destroy;
gint level_indentation;
......
......@@ -77,7 +77,7 @@ gtk_tree_selection_finalize (GObject *object)
if (selection->destroy)
{
GtkDestroyNotify d = selection->destroy;
GDestroyNotify d = selection->destroy;
selection->destroy = NULL;
d (selection->user_data);
......@@ -256,14 +256,14 @@ void
gtk_tree_selection_set_select_function (GtkTreeSelection *selection,
GtkTreeSelectionFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
g_return_if_fail (func != NULL);
if (selection->destroy)
{
GtkDestroyNotify d = selection->destroy;
GDestroyNotify d = selection->destroy;
selection->destroy = NULL;
d (selection->user_data);
......
......@@ -58,7 +58,7 @@ struct _GtkTreeSelection
GtkSelectionMode type;
GtkTreeSelectionFunc user_func;
gpointer user_data;
GtkDestroyNotify destroy;
GDestroyNotify destroy;
};
struct _GtkTreeSelectionClass
......@@ -83,7 +83,7 @@ GtkSelectionMode gtk_tree_selection_get_mode (GtkTreeSelection
void gtk_tree_selection_set_select_function (GtkTreeSelection *selection,
GtkTreeSelectionFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
gpointer gtk_tree_selection_get_user_data (GtkTreeSelection *selection);
GtkTreeView* gtk_tree_selection_get_tree_view (GtkTreeSelection *selection);
......
......@@ -165,7 +165,7 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable,
gint sort_column_id,
GtkTreeIterCompareFunc sort_func,
gpointer user_data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GtkTreeSortableIface *iface;
......@@ -202,7 +202,7 @@ void
gtk_tree_sortable_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc sort_func,
gpointer user_data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GtkTreeSortableIface *iface;
......
......@@ -68,11 +68,11 @@ struct _GtkTreeSortableIface
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void (* set_default_sort_func) (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
gboolean (* has_default_sort_func) (GtkTreeSortable *sortable);
};
......@@ -90,14 +90,13 @@ void gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortab
gint sort_column_id,
GtkTreeIterCompareFunc sort_func,
gpointer user_data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_tree_sortable_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc sort_func,
gpointer user_data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
gboolean gtk_tree_sortable_has_default_sort_func (GtkTreeSortable *sortable);
G_END_DECLS
#endif /* __GTK_TREE_SORTABLE_H__ */
......@@ -110,11 +110,11 @@ static void gtk_tree_store_set_sort_func (GtkTreeSortable *
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
static void gtk_tree_store_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
static gboolean gtk_tree_store_has_default_sort_func (GtkTreeSortable *sortable);
......@@ -431,7 +431,7 @@ gtk_tree_store_finalize (GObject *object)
if (tree_store->default_sort_destroy)
{
GtkDestroyNotify d = tree_store->default_sort_destroy;
GDestroyNotify d = tree_store->default_sort_destroy;
tree_store->default_sort_destroy = NULL;
d (tree_store->default_sort_data);
......@@ -3139,7 +3139,7 @@ gtk_tree_store_set_sort_func (GtkTreeSortable *sortable,
gint sort_column_id,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
......@@ -3155,13 +3155,13 @@ static void
gtk_tree_store_set_default_sort_func (GtkTreeSortable *sortable,
GtkTreeIterCompareFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
if (tree_store->default_sort_destroy)
{
GtkDestroyNotify d = tree_store->default_sort_destroy;
GDestroyNotify d = tree_store->default_sort_destroy;
tree_store->default_sort_destroy = NULL;
d (tree_store->default_sort_data);
......
......@@ -56,7 +56,7 @@ struct _GtkTreeStore
GType *column_headers;
GtkTreeIterCompareFunc default_sort_func;
gpointer default_sort_data;
GtkDestroyNotify default_sort_destroy;
GDestroyNotify default_sort_destroy;
guint columns_dirty : 1;
};
......
......@@ -11496,7 +11496,7 @@ void
gtk_tree_view_set_column_drag_function (GtkTreeView *tree_view,
GtkTreeViewColumnDropFunc func,
gpointer user_data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
......@@ -13779,7 +13779,7 @@ void
gtk_tree_view_set_destroy_count_func (GtkTreeView *tree_view,
GtkTreeDestroyCountFunc func,
gpointer data,
GtkDestroyNotify destroy)
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
......@@ -13917,7 +13917,7 @@ void
gtk_tree_view_set_search_equal_func (GtkTreeView *tree_view,
GtkTreeViewSearchEqualFunc search_equal_func,
gpointer search_user_data,
GtkDestroyNotify search_destroy)
GDestroyNotify search_destroy)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
g_return_if_fail (search_equal_func != NULL);
......@@ -14982,10 +14982,10 @@ gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view)
* Since: 2.6
**/
void
gtk_tree_view_set_row_separator_func (GtkTreeView *tree_view,
GtkTreeViewRowSeparatorFunc func,
gpointer data,
GtkDestroyNotify destroy)
gtk_tree_view_set_row_separator_func (GtkTreeView *tree_view,
GtkTreeViewRowSeparatorFunc func,
gpointer data,
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
......
......@@ -197,7 +197,7 @@ GtkTreeViewColumn *gtk_tree_view_get_expander_column (GtkTreeView
void gtk_tree_view_set_column_drag_function (GtkTreeView *tree_view,
GtkTreeViewColumnDropFunc func,
gpointer user_data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
/* Actions */
void gtk_tree_view_scroll_to_point (GtkTreeView *tree_view,
......@@ -319,7 +319,7 @@ GtkTreeViewSearchEqualFunc gtk_tree_view_get_search_equal_func (GtkTreeView
void gtk_tree_view_set_search_equal_func (GtkTreeView *tree_view,
GtkTreeViewSearchEqualFunc search_equal_func,
gpointer search_user_data,
GtkDestroyNotify search_destroy);
GDestroyNotify search_destroy);
GtkEntry *gtk_tree_view_get_search_entry (GtkTreeView *tree_view);
void gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
......@@ -371,7 +371,7 @@ typedef void (* GtkTreeDestroyCountFunc) (GtkTreeView *tree_view,
void gtk_tree_view_set_destroy_count_func (GtkTreeView *tree_view,
GtkTreeDestroyCountFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_tree_view_set_fixed_height_mode (GtkTreeView *tree_view,
gboolean enable);
......@@ -392,7 +392,7 @@ GtkTreeViewRowSeparatorFunc gtk_tree_view_get_row_separator_func (GtkTreeView
void gtk_tree_view_set_row_separator_func (GtkTreeView *tree_view,
GtkTreeViewRowSeparatorFunc func,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
GtkTreeViewGridLines gtk_tree_view_get_grid_lines (GtkTreeView *tree_view);
void gtk_tree_view_set_grid_lines (GtkTreeView *tree_view,
......
......@@ -67,7 +67,7 @@ struct _GtkTreeViewColumnCellInfo
GSList *attributes;
GtkTreeCellDataFunc func;