AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk/gtkclist.[ch] gtk/gtkctree.[ch] gtk/gtkitemfactory.[ch]

Browse Source 
2008-08-04  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkclist.[ch]
	* gtk/gtkctree.[ch]
	* gtk/gtkitemfactory.[ch]
	* gtk/gtkobject.[ch]
	* gtk/gtksignal.[ch]: s/GtkDestroyNotify/GDestroyNotify/g


svn path=/trunk/; revision=20967
This commit is contained in:
Michael Natterer 2008-08-04 14:13:56 +00:00 committed by Michael Natterer
parent cd8bca1c64
commit 906db67f37
11 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-08-04 Michael Natterer <mitch@imendio.com>
* gtk/gtkclist.[ch]
* gtk/gtkctree.[ch]
* gtk/gtkitemfactory.[ch]
* gtk/gtkobject.[ch]
* gtk/gtksignal.[ch]: s/GtkDestroyNotify/GDestroyNotify/g
2008-08-04 Sven Neumann <sven@gimp.org>
* gtk/gtklinkbutton.c (gtk_link_button_set_uri): update the link

8
gtk/gtkclist.c
View File

@ -3071,10 +3071,10 @@ gtk_clist_set_row_data (GtkCList *clist,
}
void
gtk_clist_set_row_data_full (GtkCList *clist,
gint row,
gpointer data,
GtkDestroyNotify destroy)
gtk_clist_set_row_data_full (GtkCList *clist,
gint row,
gpointer data,
GDestroyNotify destroy)
{
GtkCListRow *clist_row;

10
gtk/gtkclist.h
View File

@ -352,7 +352,7 @@ struct _GtkCListRow
GtkStyle *style;
gpointer data;
GtkDestroyNotify destroy;
GDestroyNotify destroy;
guint fg_set : 1;
guint bg_set : 1;
@ -699,10 +699,10 @@ void gtk_clist_set_row_data (GtkCList *clist,
gpointer data);
/* sets a data pointer for a given row with destroy notification */
void gtk_clist_set_row_data_full (GtkCList *clist,
gint row,
gpointer data,
GtkDestroyNotify destroy);
void gtk_clist_set_row_data_full (GtkCList *clist,
gint row,
gpointer data,
GDestroyNotify destroy);
/* returns the data set for a row */
gpointer gtk_clist_get_row_data (GtkCList *clist,

12
gtk/gtkctree.c
View File

@ -3267,7 +3267,7 @@ row_delete (GtkCTree *ctree,
if (ctree_row->row.destroy)
{
GtkDestroyNotify dnotify = ctree_row->row.destroy;
GDestroyNotify dnotify = ctree_row->row.destroy;
gpointer ddata = ctree_row->row.data;
ctree_row->row.destroy = NULL;
@ -5131,12 +5131,12 @@ gtk_ctree_node_set_row_data (GtkCTree *ctree,
}
void
gtk_ctree_node_set_row_data_full (GtkCTree *ctree,
GtkCTreeNode *node,
gpointer data,
GtkDestroyNotify destroy)
gtk_ctree_node_set_row_data_full (GtkCTree *ctree,
GtkCTreeNode *node,
gpointer data,
GDestroyNotify destroy)
{
GtkDestroyNotify dnotify;
GDestroyNotify dnotify;
gpointer ddata;
g_return_if_fail (GTK_IS_CTREE (ctree));

2
gtk/gtkctree.h
View File

@ -392,7 +392,7 @@ void gtk_ctree_node_set_row_data (GtkCTree *ctree,
void gtk_ctree_node_set_row_data_full (GtkCTree *ctree,
GtkCTreeNode *node,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
gpointer gtk_ctree_node_get_row_data (GtkCTree *ctree,
GtkCTreeNode *node);
void gtk_ctree_node_moveto (GtkCTree *ctree,

14
gtk/gtkitemfactory.c
View File

@ -1482,7 +1482,7 @@ gtk_item_factory_popup (GtkItemFactory *ifactory,
* gtk_item_factory_popup_with_data:
* @ifactory: a #GtkItemFactory of type #GTK_TYPE_MENU (see gtk_item_factory_new())
* @popup_data: data available for callbacks while the menu is posted
* @destroy: a #GtkDestroyNotify function to be called on @popup_data when
* @destroy: a #GDestroyNotify function to be called on @popup_data when
* the menu is unposted
* @x: the x position
* @y: the y position
@ -1510,7 +1510,7 @@ gtk_item_factory_popup (GtkItemFactory *ifactory,
void
gtk_item_factory_popup_with_data (GtkItemFactory *ifactory,
gpointer popup_data,
GtkDestroyNotify destroy,
GDestroyNotify destroy,
guint x,
guint y,
guint mouse_button,
@ -1558,7 +1558,7 @@ gtk_item_factory_popup_with_data (GtkItemFactory *ifactory,
* @ifactory: a #GtkItemFactory
* @func: the #GtkTranslateFunc function to be used to translate path elements
* @data: data to pass to @func and @notify
* @notify: a #GtkDestroyNotify function to be called when @ifactory is
* @notify: a #GDestroyNotify function to be called when @ifactory is
* destroyed and when the translation function is changed again
*
* Sets a function to be used for translating the path elements before they
@ -1567,10 +1567,10 @@ gtk_item_factory_popup_with_data (GtkItemFactory *ifactory,
* Deprecated: 2.4: Use #GtkUIManager instead.
*/
void
gtk_item_factory_set_translate_func (GtkItemFactory *ifactory,
GtkTranslateFunc func,
gpointer data,
GtkDestroyNotify notify)
gtk_item_factory_set_translate_func (GtkItemFactory *ifactory,
GtkTranslateFunc func,
gpointer data,
GDestroyNotify notify)
{
g_return_if_fail (ifactory != NULL);

6
gtk/gtkitemfactory.h
View File

@ -73,7 +73,7 @@ struct _GtkItemFactory
GtkTranslateFunc translate_func;
gpointer translate_data;
GtkDestroyNotify translate_notify;
GDestroyNotify translate_notify;
};
struct _GtkItemFactoryClass
@ -184,7 +184,7 @@ void gtk_item_factory_popup (GtkItemFactory *ifactory,
guint32 time_);
void gtk_item_factory_popup_with_data(GtkItemFactory *ifactory,
gpointer popup_data,
GtkDestroyNotify destroy,
GDestroyNotify destroy,
guint x,
guint y,
guint mouse_button,
@ -194,7 +194,7 @@ gpointer gtk_item_factory_popup_data_from_widget (GtkWidget *widget);
void gtk_item_factory_set_translate_func (GtkItemFactory *ifactory,
GtkTranslateFunc func,
gpointer data,
GtkDestroyNotify notify);
GDestroyNotify notify);
/* Compatibility functions for deprecated GtkMenuFactory code
*/

34
gtk/gtkobject.c
View File

@ -520,15 +520,15 @@ typedef struct _GtkWeakRef GtkWeakRef;
struct _GtkWeakRef
{
GtkWeakRef *next;
GtkDestroyNotify notify;
gpointer data;
GtkWeakRef *next;
GDestroyNotify notify;
gpointer data;
};
void
gtk_object_weakref (GtkObject *object,
GtkDestroyNotify notify,
gpointer data)
gtk_object_weakref (GtkObject *object,
GDestroyNotify notify,
gpointer data)
{
GtkWeakRef *weak;
@ -546,9 +546,9 @@ gtk_object_weakref (GtkObject *object,
}
void
gtk_object_weakunref (GtkObject *object,
GtkDestroyNotify notify,
gpointer data)
gtk_object_weakunref (GtkObject *object,
GDestroyNotify notify,
gpointer data)
{
GtkWeakRef *weaks, *w, **wp;
@ -664,10 +664,10 @@ gtk_object_set_data (GtkObject *object,
}
void
gtk_object_set_data_by_id_full (GtkObject *object,
GQuark data_id,
gpointer data,
GtkDestroyNotify destroy)
gtk_object_set_data_by_id_full (GtkObject *object,
GQuark data_id,
gpointer data,
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_OBJECT (object));
@ -675,10 +675,10 @@ gtk_object_set_data_by_id_full (GtkObject *object,
}
void
gtk_object_set_data_full (GtkObject *object,
const gchar *key,
gpointer data,
GtkDestroyNotify destroy)
gtk_object_set_data_full (GtkObject *object,
const gchar *key,
gpointer data,
GDestroyNotify destroy)
{
g_return_if_fail (GTK_IS_OBJECT (object));
g_return_if_fail (key != NULL);

8
gtk/gtkobject.h
View File

@ -141,10 +141,10 @@ GtkObject* gtk_object_new (GtkType type,
GtkObject* gtk_object_ref (GtkObject *object);
void gtk_object_unref (GtkObject *object);
void gtk_object_weakref (GtkObject *object,
GtkDestroyNotify notify,
GDestroyNotify notify,
gpointer data);
void gtk_object_weakunref (GtkObject *object,
GtkDestroyNotify notify,
GDestroyNotify notify,
gpointer data);
/* Set 'data' to the "object_data" field of the object. The
@ -165,7 +165,7 @@ void gtk_object_set_data (GtkObject *object,
void gtk_object_set_data_full (GtkObject *object,
const gchar *key,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
void gtk_object_remove_data (GtkObject *object,
const gchar *key);
gpointer gtk_object_get_data (GtkObject *object,
@ -192,7 +192,7 @@ void gtk_object_set_data_by_id (GtkObject *object,
void gtk_object_set_data_by_id_full (GtkObject *object,
GQuark data_id,
gpointer data,
GtkDestroyNotify destroy);
GDestroyNotify destroy);
gpointer gtk_object_get_data_by_id (GtkObject *object,
GQuark data_id);
void gtk_object_remove_data_by_id (GtkObject *object,

2
gtk/gtksignal.c
View File

@ -138,7 +138,7 @@ gtk_signal_connect_full (GtkObject *object,
GtkSignalFunc func,
GtkCallbackMarshal unsupported,
gpointer data,
GtkDestroyNotify destroy_func,
GDestroyNotify destroy_func,
gint object_signal,
gint after)
{

2
gtk/gtksignal.h
View File

@ -121,7 +121,7 @@ gulong gtk_signal_connect_full (GtkObject *object,
GtkSignalFunc func,
GtkCallbackMarshal unsupported,
gpointer data,
GtkDestroyNotify destroy_func,
GDestroyNotify destroy_func,
gint object_signal,
gint after);
void gtk_signal_emitv (GtkObject *object,