AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 05:50:10 +00:00
Code Issues Projects Releases Wiki Activity

changed handler tags to be of type guint, reflecting the internal tag

Browse Source 
Thu Mar 12 10:49:38 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtkmain.h:
        * gtk/gtkmain.c: changed handler tags to be of type guint, reflecting
        the internal tag handling.

        * gtk/gtkcurve.h: macro fixups.
This commit is contained in:
Tim Janik 1998-03-12 18:00:45 +00:00 committed by Tim Janik
parent d19d3c5dca
commit 4f3495f955
11 changed files with 171 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Thu Mar 12 10:49:38 1998 Tim Janik <timj@gimp.org>
* gtk/gtkmain.h:
* gtk/gtkmain.c: changed handler tags to be of type guint, reflecting
the internal tag handling.
* gtk/gtkcurve.h: macro fixups.
Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
* gtkitem.c:

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
Thu Mar 12 10:49:38 1998 Tim Janik <timj@gimp.org>
* gtk/gtkmain.h:
* gtk/gtkmain.c: changed handler tags to be of type guint, reflecting
the internal tag handling.
* gtk/gtkcurve.h: macro fixups.
Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
* gtkitem.c:

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Thu Mar 12 10:49:38 1998 Tim Janik <timj@gimp.org>
* gtk/gtkmain.h:
* gtk/gtkmain.c: changed handler tags to be of type guint, reflecting
the internal tag handling.
* gtk/gtkcurve.h: macro fixups.
Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
* gtkitem.c:

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
Thu Mar 12 10:49:38 1998 Tim Janik <timj@gimp.org>
* gtk/gtkmain.h:
* gtk/gtkmain.c: changed handler tags to be of type guint, reflecting
the internal tag handling.
* gtk/gtkcurve.h: macro fixups.
Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
* gtkitem.c:

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Thu Mar 12 10:49:38 1998 Tim Janik <timj@gimp.org>
* gtk/gtkmain.h:
* gtk/gtkmain.c: changed handler tags to be of type guint, reflecting
the internal tag handling.
* gtk/gtkcurve.h: macro fixups.
Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
* gtkitem.c:

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Thu Mar 12 10:49:38 1998 Tim Janik <timj@gimp.org>
* gtk/gtkmain.h:
* gtk/gtkmain.c: changed handler tags to be of type guint, reflecting
the internal tag handling.
* gtk/gtkcurve.h: macro fixups.
Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
* gtkitem.c:

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Thu Mar 12 10:49:38 1998 Tim Janik <timj@gimp.org>
* gtk/gtkmain.h:
* gtk/gtkmain.c: changed handler tags to be of type guint, reflecting
the internal tag handling.
* gtk/gtkcurve.h: macro fixups.
Thu Mar 12 08:55:34 1998 Tim Janik <timj@gimp.org>
* gtkitem.c:

6
gtk/gtkcurve.h
View File

@ -27,9 +27,9 @@ extern "C" {
#endif /* __cplusplus */
#define GTK_CURVE(obj) GTK_CHECK_CAST (obj, gtk_curve_get_type (), GtkCurve)
#define GTK_CURVE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_curve_get_type, GtkCurveClass)
#define GTK_IS_CURVE(obj) GTK_CHECK_TYPE (obj, gtk_curve_get_type ())
#define GTK_CURVE(obj) (GTK_CHECK_CAST ((obj), gtk_curve_get_type (), GtkCurve))
#define GTK_CURVE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), gtk_curve_get_type (), GtkCurveClass))
#define GTK_IS_CURVE(obj) (GTK_CHECK_TYPE ((obj), gtk_curve_get_type ()))
typedef struct _GtkCurve GtkCurve;

58
gtk/gtkmain.c
View File

@ -52,7 +52,7 @@ struct _GtkInitFunction
struct _GtkQuitFunction
{
gint tag;
guint id;
guint main_level;
GtkCallbackMarshal marshal;
GtkFunction function;
@ -62,7 +62,7 @@ struct _GtkQuitFunction
struct _GtkTimeoutFunction
{
gint tag;
guint tag;
guint32 start;
guint32 interval;
guint32 originterval;
@ -74,7 +74,7 @@ struct _GtkTimeoutFunction
struct _GtkIdleFunction
{
gint tag;
guint tag;
gint priority;
GtkCallbackMarshal marshal;
GtkFunction function;
@ -93,7 +93,7 @@ struct _GtkKeySnooperData
{
GtkKeySnoopFunc func;
gpointer func_data;
gint id;
guint id;
};
static void gtk_exit_func (void);
@ -677,7 +677,7 @@ gtk_init_add (GtkFunction function,
init_functions = g_list_prepend (init_functions, init);
}
gint
guint
gtk_key_snooper_install (GtkKeySnoopFunc snooper,
gpointer func_data)
{
@ -696,7 +696,7 @@ gtk_key_snooper_install (GtkKeySnoopFunc snooper,
}
void
gtk_key_snooper_remove (gint snooper_id)
gtk_key_snooper_remove (guint snooper_id)
{
GtkKeySnooperData *data = NULL;
GSList *slist;
@ -735,14 +735,14 @@ gtk_invoke_key_snoopers (GtkWidget *grab_widget,
return return_val;
}
gint
guint
gtk_timeout_add_full (guint32 interval,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy)
{
static gint timeout_tag = 1;
static guint timeout_tag = 1;
GtkTimeoutFunction *timeoutf;
g_return_val_if_fail ((function != NULL) || (marshal != NULL), 0);
@ -778,7 +778,7 @@ gtk_timeout_destroy (GtkTimeoutFunction *timeoutf)
g_mem_chunk_free (timeout_mem_chunk, timeoutf);
}
gint
guint
gtk_timeout_add (guint32 interval,
GtkFunction function,
gpointer data)
@ -786,7 +786,7 @@ gtk_timeout_add (guint32 interval,
return gtk_timeout_add_full (interval, function, FALSE, data, NULL);
}
gint
guint
gtk_timeout_add_interp (guint32 interval,
GtkCallbackMarshal function,
gpointer data,
@ -796,7 +796,7 @@ gtk_timeout_add_interp (guint32 interval,
}
void
gtk_timeout_remove (gint tag)
gtk_timeout_remove (guint tag)
{
GtkTimeoutFunction *timeoutf;
GList *tmp_list;
@ -850,14 +850,14 @@ gtk_idle_compare (gpointer a, gpointer b)
? -1 : 1;
}
gint
guint
gtk_quit_add_full (guint main_level,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy)
{
static gint quit_tag = 1;
static guint quit_id = 1;
GtkQuitFunction *quitf;
g_return_val_if_fail ((function != NULL) || (marshal != NULL), 0);
@ -868,7 +868,7 @@ gtk_quit_add_full (guint main_level,
quitf = g_chunk_new (GtkQuitFunction, quit_mem_chunk);
quitf->tag = quit_tag++;
quitf->id = quit_id++;
quitf->main_level = main_level;
quitf->function = function;
quitf->marshal = marshal;
@ -877,17 +877,17 @@ gtk_quit_add_full (guint main_level,
quit_functions = g_list_prepend (quit_functions, quitf);
return quitf->tag;
return quitf->id;
}
gint
guint
gtk_idle_add_full (gint priority,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy)
{
static gint idle_tag = 1;
static guint idle_tag = 1;
GtkIdleFunction *idlef;
g_return_val_if_fail ((function != NULL) || (marshal != NULL), 0);
@ -910,7 +910,7 @@ gtk_idle_add_full (gint priority,
return idlef->tag;
}
gint
guint
gtk_idle_add_interp (GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy)
@ -934,7 +934,7 @@ gtk_quit_destroy (GtkQuitFunction *quitf)
g_mem_chunk_free (quit_mem_chunk, quitf);
}
gint
guint
gtk_quit_add (guint main_level,
GtkFunction function,
gpointer data)
@ -942,14 +942,14 @@ gtk_quit_add (guint main_level,
return gtk_quit_add_full (main_level, function, NULL, data, NULL);
}
gint
guint
gtk_idle_add (GtkFunction function,
gpointer data)
{
return gtk_idle_add_full (GTK_PRIORITY_DEFAULT, function, NULL, data, NULL);
}
gint
guint
gtk_idle_add_priority (gint priority,
GtkFunction function,
gpointer data)
@ -958,7 +958,7 @@ gtk_idle_add_priority (gint priority,
}
void
gtk_quit_remove (gint tag)
gtk_quit_remove (guint id)
{
GtkQuitFunction *quitf;
GList *tmp_list;
@ -968,7 +968,7 @@ gtk_quit_remove (gint tag)
{
quitf = tmp_list->data;
if (quitf->tag == tag)
if (quitf->id == id)
{
quit_functions = g_list_remove_link (quit_functions, tmp_list);
g_list_free (tmp_list);
@ -1006,7 +1006,7 @@ gtk_quit_remove_by_data (gpointer data)
}
void
gtk_idle_remove (gint tag)
gtk_idle_remove (guint tag)
{
GtkIdleFunction *idlef;
GList *tmp_list;
@ -1113,7 +1113,7 @@ gtk_destroy_input_function (GtkInputFunction *input)
g_free (input);
}
gint
guint
gtk_input_add_full (gint source,
GdkInputCondition condition,
GdkInputFunction function,
@ -1123,7 +1123,9 @@ gtk_input_add_full (gint source,
{
if (marshal)
{
GtkInputFunction *input = g_new (GtkInputFunction, 1);
GtkInputFunction *input;
input = g_new (GtkInputFunction, 1);
input->callback = marshal;
input->data = data;
input->destroy = destroy;
@ -1138,7 +1140,7 @@ gtk_input_add_full (gint source,
return gdk_input_add_full (source, condition, function, data, destroy);
}
gint
guint
gtk_input_add_interp (gint source,
GdkInputCondition condition,
GtkCallbackMarshal callback,
@ -1149,7 +1151,7 @@ gtk_input_add_interp (gint source,
}
void
gtk_input_remove (gint tag)
gtk_input_remove (guint tag)
{
gdk_input_remove (tag);
}

32
gtk/gtkmain.h
View File

@ -65,57 +65,57 @@ void gtk_grab_remove (GtkWidget *widget);
void gtk_init_add (GtkFunction function,
gpointer data);
gint gtk_quit_add (guint main_level,
guint gtk_quit_add (guint main_level,
GtkFunction function,
gpointer data);
gint gtk_quit_add_full (guint main_level,
guint gtk_quit_add_full (guint main_level,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
void gtk_quit_remove (gint tag);
void gtk_quit_remove (guint quit_handler_id);
void gtk_quit_remove_by_data (gpointer data);
gint gtk_timeout_add_full (guint32 interval,
guint gtk_timeout_add_full (guint32 interval,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
gint gtk_timeout_add (guint32 interval,
guint gtk_timeout_add (guint32 interval,
GtkFunction function,
gpointer data);
gint gtk_timeout_add_interp (guint32 interval,
guint gtk_timeout_add_interp (guint32 interval,
GtkCallbackMarshal function,
gpointer data,
GtkDestroyNotify notify);
void gtk_timeout_remove (gint tag);
void gtk_timeout_remove (guint timeout_handler_id);
gint gtk_idle_add (GtkFunction function,
guint gtk_idle_add (GtkFunction function,
gpointer data);
gint gtk_idle_add_priority (gint priority,
guint gtk_idle_add_priority (gint priority,
GtkFunction function,
gpointer data);
gint gtk_idle_add_full (gint priority,
guint gtk_idle_add_full (gint priority,
GtkFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
gint gtk_idle_add_interp (GtkCallbackMarshal marshal,
guint gtk_idle_add_interp (GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
void gtk_idle_remove (gint tag);
void gtk_idle_remove (guint idle_handler_id);
void gtk_idle_remove_by_data (gpointer data);
gint gtk_input_add_full (gint source,
guint gtk_input_add_full (gint source,
GdkInputCondition condition,
GdkInputFunction function,
GtkCallbackMarshal marshal,
gpointer data,
GtkDestroyNotify destroy);
void gtk_input_remove (gint tag);
void gtk_input_remove (guint input_handler_id);
gint gtk_key_snooper_install (GtkKeySnoopFunc snooper,
guint gtk_key_snooper_install (GtkKeySnoopFunc snooper,
gpointer func_data);
void gtk_key_snooper_remove (gint snooper_id);
void gtk_key_snooper_remove (guint snooper_handler_id);
GdkEvent* gtk_get_current_event (void);
GtkWidget* gtk_get_event_widget (GdkEvent *event);

3
gtk/gtknotebook.c
View File

@ -260,8 +260,7 @@ gtk_notebook_destroy (GtkObject *object)
if (notebook->menu)
gtk_notebook_popup_disable (notebook);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
void