Commit d1871831 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

made the <widget>_signals[] arrays of type guint rather than gint. made

Mon Mar  9 15:48:10 1998  Tim Janik  <timj@gimp.org>

        * Signal signedness and naming corrections, plus GtkType fixes:

        * gtk/gtkadjustment.c:
        * gtk/gtkbutton.c:
        * gtk/gtkcheckmenuitem.c:
        * gtk/gtkclist.c:
        * gtk/gtkcolorsel.c:
        * gtk/gtkcontainer.c:
        * gtk/gtkcurve.c:
        * gtk/gtkdata.c:
        * gtk/gtkeditable.c:
        * gtk/gtkentry.c:
        * gtk/gtkhandlebox.c:
        * gtk/gtkinputdialog.c:
        * gtk/gtkitem.c:
        * gtk/gtklist.c:
        * gtk/gtkmenuitem.c:
        * gtk/gtkmenushell.c:
        * gtk/gtknotebook.c:
        * gtk/gtkstatusbar.c:
        * gtk/gtktoolbar.c:
        * gtk/gtktree.c:
        * gtk/gtktreeitem.c:
        * gtk/gtkwidget.c:
        * gtk/gtktogglebutton.c:
        * gtk/gtkwindow.c:
        made the <widget>_signals[] arrays of type guint rather than gint.
        * gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.

        * gtk/gtkcombo.h:
        handler ids need to be of type guint (entry_change_id, list_change_id).

        * gtk/gtkaccelerator.c:
        changed signal_num to signal_id and typed it guint.

        * gtk/gtkmain.c: made gtk_ndebug_keys a guint.

        * gtk/gtkmenu.h:
        * gtk/gtkmenu.c:
        (gtk_menu_popup): made button a guint.
        (gtk_menu_set_active): made index a guint.

        * gtk/gtkmenuitem.h:
        * gtk/gtkmenuitem.c:
        made accelerator_signal a guint.

        * gtk/gtkoptionmenu.h:
        * gtk/gtkoptionmenu.c:
        (gtk_option_menu_set_history): made index a guint.

        * gtk/gtksignal.h:
        * gtk/gtksignal.c:
        * gtk/gtkobject.h:
        * gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
        than gints. also made some conversions from guint to GtkType, left over
        from when the fundamental-types system was introduced.

        * gtk/gtkobject.h:
        * gtk/gtkobject.c: made object_data_id_index and obj_count guints.
        made *signals and nsignals guints in GtkObjectClass.
parent 2a8d32a7
Mon Mar 9 15:48:10 1998 Tim Janik <timj@gimp.org>
* Signal signedness and naming corrections, plus GtkType fixes:
* gtk/gtkadjustment.c:
* gtk/gtkbutton.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkclist.c:
* gtk/gtkcolorsel.c:
* gtk/gtkcontainer.c:
* gtk/gtkcurve.c:
* gtk/gtkdata.c:
* gtk/gtkeditable.c:
* gtk/gtkentry.c:
* gtk/gtkhandlebox.c:
* gtk/gtkinputdialog.c:
* gtk/gtkitem.c:
* gtk/gtklist.c:
* gtk/gtkmenuitem.c:
* gtk/gtkmenushell.c:
* gtk/gtknotebook.c:
* gtk/gtkstatusbar.c:
* gtk/gtktoolbar.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
* gtk/gtkwidget.c:
* gtk/gtktogglebutton.c:
* gtk/gtkwindow.c:
made the <widget>_signals[] arrays of type guint rather than gint.
* gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.
* gtk/gtkcombo.h:
handler ids need to be of type guint (entry_change_id, list_change_id).
* gtk/gtkaccelerator.c:
changed signal_num to signal_id and typed it guint.
* gtk/gtkmain.c: made gtk_ndebug_keys a guint.
* gtk/gtkmenu.h:
* gtk/gtkmenu.c:
(gtk_menu_popup): made button a guint.
(gtk_menu_set_active): made index a guint.
* gtk/gtkmenuitem.h:
* gtk/gtkmenuitem.c:
made accelerator_signal a guint.
* gtk/gtkoptionmenu.h:
* gtk/gtkoptionmenu.c:
(gtk_option_menu_set_history): made index a guint.
* gtk/gtksignal.h:
* gtk/gtksignal.c:
* gtk/gtkobject.h:
* gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
than gints. also made some conversions from guint to GtkType, left over
from when the fundamental-types system was introduced.
* gtk/gtkobject.h:
* gtk/gtkobject.c: made object_data_id_index and obj_count guints.
made *signals and nsignals guints in GtkObjectClass.
Mon Mar 9 13:36:53 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtkfaq.sgml:
......
Mon Mar 9 15:48:10 1998 Tim Janik <timj@gimp.org>
* Signal signedness and naming corrections, plus GtkType fixes:
* gtk/gtkadjustment.c:
* gtk/gtkbutton.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkclist.c:
* gtk/gtkcolorsel.c:
* gtk/gtkcontainer.c:
* gtk/gtkcurve.c:
* gtk/gtkdata.c:
* gtk/gtkeditable.c:
* gtk/gtkentry.c:
* gtk/gtkhandlebox.c:
* gtk/gtkinputdialog.c:
* gtk/gtkitem.c:
* gtk/gtklist.c:
* gtk/gtkmenuitem.c:
* gtk/gtkmenushell.c:
* gtk/gtknotebook.c:
* gtk/gtkstatusbar.c:
* gtk/gtktoolbar.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
* gtk/gtkwidget.c:
* gtk/gtktogglebutton.c:
* gtk/gtkwindow.c:
made the <widget>_signals[] arrays of type guint rather than gint.
* gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.
* gtk/gtkcombo.h:
handler ids need to be of type guint (entry_change_id, list_change_id).
* gtk/gtkaccelerator.c:
changed signal_num to signal_id and typed it guint.
* gtk/gtkmain.c: made gtk_ndebug_keys a guint.
* gtk/gtkmenu.h:
* gtk/gtkmenu.c:
(gtk_menu_popup): made button a guint.
(gtk_menu_set_active): made index a guint.
* gtk/gtkmenuitem.h:
* gtk/gtkmenuitem.c:
made accelerator_signal a guint.
* gtk/gtkoptionmenu.h:
* gtk/gtkoptionmenu.c:
(gtk_option_menu_set_history): made index a guint.
* gtk/gtksignal.h:
* gtk/gtksignal.c:
* gtk/gtkobject.h:
* gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
than gints. also made some conversions from guint to GtkType, left over
from when the fundamental-types system was introduced.
* gtk/gtkobject.h:
* gtk/gtkobject.c: made object_data_id_index and obj_count guints.
made *signals and nsignals guints in GtkObjectClass.
Mon Mar 9 13:36:53 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtkfaq.sgml:
......
Mon Mar 9 15:48:10 1998 Tim Janik <timj@gimp.org>
* Signal signedness and naming corrections, plus GtkType fixes:
* gtk/gtkadjustment.c:
* gtk/gtkbutton.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkclist.c:
* gtk/gtkcolorsel.c:
* gtk/gtkcontainer.c:
* gtk/gtkcurve.c:
* gtk/gtkdata.c:
* gtk/gtkeditable.c:
* gtk/gtkentry.c:
* gtk/gtkhandlebox.c:
* gtk/gtkinputdialog.c:
* gtk/gtkitem.c:
* gtk/gtklist.c:
* gtk/gtkmenuitem.c:
* gtk/gtkmenushell.c:
* gtk/gtknotebook.c:
* gtk/gtkstatusbar.c:
* gtk/gtktoolbar.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
* gtk/gtkwidget.c:
* gtk/gtktogglebutton.c:
* gtk/gtkwindow.c:
made the <widget>_signals[] arrays of type guint rather than gint.
* gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.
* gtk/gtkcombo.h:
handler ids need to be of type guint (entry_change_id, list_change_id).
* gtk/gtkaccelerator.c:
changed signal_num to signal_id and typed it guint.
* gtk/gtkmain.c: made gtk_ndebug_keys a guint.
* gtk/gtkmenu.h:
* gtk/gtkmenu.c:
(gtk_menu_popup): made button a guint.
(gtk_menu_set_active): made index a guint.
* gtk/gtkmenuitem.h:
* gtk/gtkmenuitem.c:
made accelerator_signal a guint.
* gtk/gtkoptionmenu.h:
* gtk/gtkoptionmenu.c:
(gtk_option_menu_set_history): made index a guint.
* gtk/gtksignal.h:
* gtk/gtksignal.c:
* gtk/gtkobject.h:
* gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
than gints. also made some conversions from guint to GtkType, left over
from when the fundamental-types system was introduced.
* gtk/gtkobject.h:
* gtk/gtkobject.c: made object_data_id_index and obj_count guints.
made *signals and nsignals guints in GtkObjectClass.
Mon Mar 9 13:36:53 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtkfaq.sgml:
......
Mon Mar 9 15:48:10 1998 Tim Janik <timj@gimp.org>
* Signal signedness and naming corrections, plus GtkType fixes:
* gtk/gtkadjustment.c:
* gtk/gtkbutton.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkclist.c:
* gtk/gtkcolorsel.c:
* gtk/gtkcontainer.c:
* gtk/gtkcurve.c:
* gtk/gtkdata.c:
* gtk/gtkeditable.c:
* gtk/gtkentry.c:
* gtk/gtkhandlebox.c:
* gtk/gtkinputdialog.c:
* gtk/gtkitem.c:
* gtk/gtklist.c:
* gtk/gtkmenuitem.c:
* gtk/gtkmenushell.c:
* gtk/gtknotebook.c:
* gtk/gtkstatusbar.c:
* gtk/gtktoolbar.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
* gtk/gtkwidget.c:
* gtk/gtktogglebutton.c:
* gtk/gtkwindow.c:
made the <widget>_signals[] arrays of type guint rather than gint.
* gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.
* gtk/gtkcombo.h:
handler ids need to be of type guint (entry_change_id, list_change_id).
* gtk/gtkaccelerator.c:
changed signal_num to signal_id and typed it guint.
* gtk/gtkmain.c: made gtk_ndebug_keys a guint.
* gtk/gtkmenu.h:
* gtk/gtkmenu.c:
(gtk_menu_popup): made button a guint.
(gtk_menu_set_active): made index a guint.
* gtk/gtkmenuitem.h:
* gtk/gtkmenuitem.c:
made accelerator_signal a guint.
* gtk/gtkoptionmenu.h:
* gtk/gtkoptionmenu.c:
(gtk_option_menu_set_history): made index a guint.
* gtk/gtksignal.h:
* gtk/gtksignal.c:
* gtk/gtkobject.h:
* gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
than gints. also made some conversions from guint to GtkType, left over
from when the fundamental-types system was introduced.
* gtk/gtkobject.h:
* gtk/gtkobject.c: made object_data_id_index and obj_count guints.
made *signals and nsignals guints in GtkObjectClass.
Mon Mar 9 13:36:53 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtkfaq.sgml:
......
Mon Mar 9 15:48:10 1998 Tim Janik <timj@gimp.org>
* Signal signedness and naming corrections, plus GtkType fixes:
* gtk/gtkadjustment.c:
* gtk/gtkbutton.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkclist.c:
* gtk/gtkcolorsel.c:
* gtk/gtkcontainer.c:
* gtk/gtkcurve.c:
* gtk/gtkdata.c:
* gtk/gtkeditable.c:
* gtk/gtkentry.c:
* gtk/gtkhandlebox.c:
* gtk/gtkinputdialog.c:
* gtk/gtkitem.c:
* gtk/gtklist.c:
* gtk/gtkmenuitem.c:
* gtk/gtkmenushell.c:
* gtk/gtknotebook.c:
* gtk/gtkstatusbar.c:
* gtk/gtktoolbar.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
* gtk/gtkwidget.c:
* gtk/gtktogglebutton.c:
* gtk/gtkwindow.c:
made the <widget>_signals[] arrays of type guint rather than gint.
* gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.
* gtk/gtkcombo.h:
handler ids need to be of type guint (entry_change_id, list_change_id).
* gtk/gtkaccelerator.c:
changed signal_num to signal_id and typed it guint.
* gtk/gtkmain.c: made gtk_ndebug_keys a guint.
* gtk/gtkmenu.h:
* gtk/gtkmenu.c:
(gtk_menu_popup): made button a guint.
(gtk_menu_set_active): made index a guint.
* gtk/gtkmenuitem.h:
* gtk/gtkmenuitem.c:
made accelerator_signal a guint.
* gtk/gtkoptionmenu.h:
* gtk/gtkoptionmenu.c:
(gtk_option_menu_set_history): made index a guint.
* gtk/gtksignal.h:
* gtk/gtksignal.c:
* gtk/gtkobject.h:
* gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
than gints. also made some conversions from guint to GtkType, left over
from when the fundamental-types system was introduced.
* gtk/gtkobject.h:
* gtk/gtkobject.c: made object_data_id_index and obj_count guints.
made *signals and nsignals guints in GtkObjectClass.
Mon Mar 9 13:36:53 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtkfaq.sgml:
......
Mon Mar 9 15:48:10 1998 Tim Janik <timj@gimp.org>
* Signal signedness and naming corrections, plus GtkType fixes:
* gtk/gtkadjustment.c:
* gtk/gtkbutton.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkclist.c:
* gtk/gtkcolorsel.c:
* gtk/gtkcontainer.c:
* gtk/gtkcurve.c:
* gtk/gtkdata.c:
* gtk/gtkeditable.c:
* gtk/gtkentry.c:
* gtk/gtkhandlebox.c:
* gtk/gtkinputdialog.c:
* gtk/gtkitem.c:
* gtk/gtklist.c:
* gtk/gtkmenuitem.c:
* gtk/gtkmenushell.c:
* gtk/gtknotebook.c:
* gtk/gtkstatusbar.c:
* gtk/gtktoolbar.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
* gtk/gtkwidget.c:
* gtk/gtktogglebutton.c:
* gtk/gtkwindow.c:
made the <widget>_signals[] arrays of type guint rather than gint.
* gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.
* gtk/gtkcombo.h:
handler ids need to be of type guint (entry_change_id, list_change_id).
* gtk/gtkaccelerator.c:
changed signal_num to signal_id and typed it guint.
* gtk/gtkmain.c: made gtk_ndebug_keys a guint.
* gtk/gtkmenu.h:
* gtk/gtkmenu.c:
(gtk_menu_popup): made button a guint.
(gtk_menu_set_active): made index a guint.
* gtk/gtkmenuitem.h:
* gtk/gtkmenuitem.c:
made accelerator_signal a guint.
* gtk/gtkoptionmenu.h:
* gtk/gtkoptionmenu.c:
(gtk_option_menu_set_history): made index a guint.
* gtk/gtksignal.h:
* gtk/gtksignal.c:
* gtk/gtkobject.h:
* gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
than gints. also made some conversions from guint to GtkType, left over
from when the fundamental-types system was introduced.
* gtk/gtkobject.h:
* gtk/gtkobject.c: made object_data_id_index and obj_count guints.
made *signals and nsignals guints in GtkObjectClass.
Mon Mar 9 13:36:53 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtkfaq.sgml:
......
Mon Mar 9 15:48:10 1998 Tim Janik <timj@gimp.org>
* Signal signedness and naming corrections, plus GtkType fixes:
* gtk/gtkadjustment.c:
* gtk/gtkbutton.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkclist.c:
* gtk/gtkcolorsel.c:
* gtk/gtkcontainer.c:
* gtk/gtkcurve.c:
* gtk/gtkdata.c:
* gtk/gtkeditable.c:
* gtk/gtkentry.c:
* gtk/gtkhandlebox.c:
* gtk/gtkinputdialog.c:
* gtk/gtkitem.c:
* gtk/gtklist.c:
* gtk/gtkmenuitem.c:
* gtk/gtkmenushell.c:
* gtk/gtknotebook.c:
* gtk/gtkstatusbar.c:
* gtk/gtktoolbar.c:
* gtk/gtktree.c:
* gtk/gtktreeitem.c:
* gtk/gtkwidget.c:
* gtk/gtktogglebutton.c:
* gtk/gtkwindow.c:
made the <widget>_signals[] arrays of type guint rather than gint.
* gtk/gtkwidget.c (gtk_widget_get_ancestor): made widget_type a GtkType.
* gtk/gtkcombo.h:
handler ids need to be of type guint (entry_change_id, list_change_id).
* gtk/gtkaccelerator.c:
changed signal_num to signal_id and typed it guint.
* gtk/gtkmain.c: made gtk_ndebug_keys a guint.
* gtk/gtkmenu.h:
* gtk/gtkmenu.c:
(gtk_menu_popup): made button a guint.
(gtk_menu_set_active): made index a guint.
* gtk/gtkmenuitem.h:
* gtk/gtkmenuitem.c:
made accelerator_signal a guint.
* gtk/gtkoptionmenu.h:
* gtk/gtkoptionmenu.c:
(gtk_option_menu_set_history): made index a guint.
* gtk/gtksignal.h:
* gtk/gtksignal.c:
* gtk/gtkobject.h:
* gtk/gtkobject.c: changed a bunch of prototypes to take guints rather
than gints. also made some conversions from guint to GtkType, left over
from when the fundamental-types system was introduced.
* gtk/gtkobject.h:
* gtk/gtkobject.c: made object_data_id_index and obj_count guints.
made *signals and nsignals guints in GtkObjectClass.
Mon Mar 9 13:36:53 GMT 1998 Tony Gale <gale@gimp.org>
* docs/gtkfaq.sgml:
......
Mon Mar 9 15:02:21 1998 Tim Janik <timj@gimp.org>
* glib.h: changed *_length functions to return guint.
changed *_nth functions to take guint as argument.
* glist.c: adapted g_list_length and g_list_length.
* gslist.c: adapted g_slist_length and g_slist_length.
Mon Mar 2 17:51:18 1998 Owen Taylor <owt1@cornell.edu>
* glib.h gutils.c : changed g_strcasecmp
......
......@@ -439,12 +439,12 @@ GList* g_list_remove_link (GList *list,
GList *link);
GList* g_list_reverse (GList *list);
GList* g_list_nth (GList *list,
gint n);
guint n);
GList* g_list_find (GList *list,
gpointer data);
GList* g_list_last (GList *list);
GList* g_list_first (GList *list);
gint g_list_length (GList *list);
guint g_list_length (GList *list);
void g_list_foreach (GList *list,
GFunc func,
gpointer user_data);
......@@ -476,11 +476,11 @@ GSList* g_slist_remove_link (GSList *list,
GSList *link);
GSList* g_slist_reverse (GSList *list);
GSList* g_slist_nth (GSList *list,
gint n);
guint n);
GSList* g_slist_find (GSList *list,
gpointer data);
GSList* g_slist_last (GSList *list);
gint g_slist_length (GSList *list);
guint g_slist_length (GSList *list);
void g_slist_foreach (GSList *list,
GFunc func,
gpointer user_data);
......
......@@ -291,7 +291,7 @@ g_list_reverse (GList *list)
GList*
g_list_nth (GList *list,
gint n)
guint n)
{
while ((n-- > 0) && list)
list = list->next;
......@@ -337,10 +337,10 @@ g_list_first (GList *list)
return list;
}
gint
guint
g_list_length (GList *list)
{
gint length;
guint length;
length = 0;
while (list)
......
......@@ -280,7 +280,7 @@ g_slist_reverse (GSList *list)
GSList*
g_slist_nth (GSList *list,
gint n)
guint n)
{
while ((n-- > 0) && list)
list = list->next;
......@@ -314,10 +314,10 @@ g_slist_last (GSList *list)
return list;
}
gint
guint
g_slist_length (GSList *list)
{
gint length;
guint length;
length = 0;
while (list)
......
......@@ -27,7 +27,7 @@ struct _GtkAcceleratorEntry
{
guint8 modifiers;
GtkObject *object;
gint signal_num;
guint signal_id;
};
......@@ -37,7 +37,7 @@ static void gtk_accelerator_table_clean (GtkAcceleratorTable *table);
static GtkAcceleratorTable *default_table = NULL;
static GSList *tables = NULL;
static guint8 gtk_accelerator_table_default_mod_mask = ~0;
static guint8 gtk_accelerator_table_default_mod_mask = (guint8) ~0;
GtkAcceleratorTable*
......@@ -63,13 +63,13 @@ gtk_accelerator_table_find (GtkObject *object,
GtkAcceleratorEntry *entry;
GSList *tmp_list;
GList *entries;
gint signal_num;
guint signal_id;
guint hash;
g_return_val_if_fail (object != NULL, NULL);
g_return_val_if_fail (signal_name != NULL, NULL);
signal_num = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
signal_id = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
hash = (guint) accelerator_key;
tmp_list = tables;
......@@ -85,7 +85,7 @@ gtk_accelerator_table_find (GtkObject *object,
entries = entries->next;
if ((entry->object == object) &&
(entry->signal_num == signal_num) &&
(entry->signal_id == signal_id) &&
((entry->modifiers & table->modifier_mask) ==
(accelerator_mods & table->modifier_mask)))
return table;
......@@ -128,7 +128,7 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
GtkAcceleratorEntry *entry;
GList *entries;
gchar *signame;
gint signal_num;
guint signal_id;
guint hash;
g_return_if_fail (object != NULL);
......@@ -140,8 +140,8 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
table = default_table;
}
signal_num = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
g_return_if_fail (signal_num != 0);
signal_id = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
g_return_if_fail (signal_id != 0);
hash = (guint) accelerator_key;
entries = table->entries[hash];
......@@ -155,7 +155,7 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
{
if (GTK_IS_WIDGET (entry->object))
{
signame = gtk_signal_name (entry->signal_num);
signame = gtk_signal_name (entry->signal_id);
gtk_signal_emit_by_name (entry->object,
"remove_accelerator",
signame);
......@@ -163,7 +163,7 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
entry->modifiers = accelerator_mods;
entry->object = object;
entry->signal_num = signal_num;
entry->signal_id = signal_id;
return;
}
......@@ -173,7 +173,7 @@ gtk_accelerator_table_install (GtkAcceleratorTable *table,
entry = g_new (GtkAcceleratorEntry, 1);
entry->modifiers = accelerator_mods;
entry->object = object;
entry->signal_num = signal_num;
entry->signal_id = signal_id;
table->entries[hash] = g_list_prepend (table->entries[hash], entry);
}
......@@ -186,7 +186,7 @@ gtk_accelerator_table_remove (GtkAcceleratorTable *table,
GtkAcceleratorEntry *entry;
GList *entries;
GList *temp_list;
gint signal_num;
guint signal_id;
gint i;
g_return_if_fail (object != NULL);
......@@ -198,8 +198,8 @@ gtk_accelerator_table_remove (GtkAcceleratorTable *table,
table = default_table;
}
signal_num = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
g_return_if_fail (signal_num != 0);
signal_id = gtk_signal_lookup (signal_name, GTK_OBJECT_TYPE (object));
g_return_if_fail (signal_id != 0);
for (i = 0; i < 256; i++)
{
......@@ -209,7 +209,7 @@ gtk_accelerator_table_remove (GtkAcceleratorTable *table,
{
entry = entries->data;
if ((entry->object == object) && (entry->signal_num == signal_num))
if ((entry->object == object) && (entry->signal_id == signal_id))
{
g_free (entry);
......@@ -259,7 +259,7 @@ gtk_accelerator_table_check (GtkAcceleratorTable *table,
if ((entry->modifiers & table->modifier_mask) ==
(accelerator_mods & table->modifier_mask))
{
gtk_signal_emit (entry->object, entry->signal_num);
gtk_signal_emit (entry->object, entry->signal_id);
return TRUE;
}
......@@ -280,7 +280,7 @@ gtk_accelerator_table_check (GtkAcceleratorTable *table,
(GTK_IS_WIDGET (entry->object) &&
GTK_WIDGET_SENSITIVE (entry->object)))
{
gtk_signal_emit (entry->object, entry->signal_num);
gtk_signal_emit (entry->object, entry->signal_id);
return TRUE;
}
......
......@@ -30,7 +30,7 @@ static void gtk_adjustment_class_init (GtkAdjustmentClass *klass);
static void gtk_adjustment_init (GtkAdjustment *adjustment);
static gint adjustment_signals[LAST_SIGNAL] = { 0 };
static guint adjustment_signals[LAST_SIGNAL] = { 0 };
guint
......
......@@ -89,7 +89,7 @@ static void gtk_real_button_leave (GtkButton *button);
static GtkContainerClass *parent_class;
static gint button_signals[LAST_SIGNAL] = { 0 };
static guint button_signals[LAST_SIGNAL] = { 0 };
guint
......
......@@ -43,7 +43,7 @@ static void gtk_real_check_menu_item_draw_indicator (GtkCheckMenuItem *chec
static GtkMenuItemClass *parent_class = NULL;
static gint check_menu_item_signals[LAST_SIGNAL] = { 0 };
static guint check_menu_item_signals[LAST_SIGNAL] = { 0 };
guint
......
......@@ -277,7 +277,7 @@ static void gtk_clist_marshal_signal_2 (GtkObject * object,
static void add_style_data (GtkCList * clist);
static GtkContainerClass *parent_class = NULL;
static gint clist_signals[LAST_SIGNAL] = {0};
static guint clist_signals[LAST_SIGNAL] = {0};
guint
......
......@@ -164,7 +164,7 @@ static GtkVBoxClass *color_selection_parent_class = NULL;
static GtkWindowClass *color_selection_dialog_parent_class = NULL;
static gint color_selection_signals[LAST_SIGNAL] = {0};
static guint color_selection_signals[LAST_SIGNAL] = {0};
static const gchar *value_index_key = "gtk-value-index";
......
......@@ -43,8 +43,8 @@ struct _GtkCombo {
GtkWidget *popwin;
GtkWidget *list;
gint entry_change_id;
gint list_change_id;
guint entry_change_id;
guint list_change_id;
guint value_in_list:1;
guint ok_if_empty:1;
......