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.
This commit is contained in:
@ -80,21 +80,21 @@ GtkArg* gtk_object_collect_args (guint *nargs,
|
||||
va_list args1,
|
||||
va_list args2);
|
||||
|
||||
static gint object_signals[LAST_SIGNAL] = { 0 };
|
||||
static guint object_signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
static gint object_data_init = TRUE;
|
||||
static GHashTable *object_data_ht = NULL;
|
||||
static GMemChunk *object_data_mem_chunk = NULL;
|
||||
static GSList *object_data_id_list = NULL;
|
||||
static gint object_data_id_index = 0;
|
||||
static guint object_data_id_index = 0;
|
||||
|
||||
static GHashTable *arg_info_ht = NULL;
|
||||
|
||||
static const char *user_data_key = "user_data";
|
||||
static const gchar *user_data_key = "user_data";
|
||||
|
||||
|
||||
#ifdef G_ENABLE_DEBUG
|
||||
static gint obj_count = 0;
|
||||
static guint obj_count = 0;
|
||||
static GHashTable *living_objs_ht = NULL;
|
||||
static void
|
||||
gtk_object_debug_foreach (gpointer key, gpointer value, gpointer user_data)
|
||||
@ -335,11 +335,11 @@ gtk_object_get_arg (GtkObject *object,
|
||||
|
||||
void
|
||||
gtk_object_class_add_signals (GtkObjectClass *class,
|
||||
gint *signals,
|
||||
gint nsignals)
|
||||
guint *signals,
|
||||
guint nsignals)
|
||||
{
|
||||
gint *new_signals;
|
||||
gint i;
|
||||
guint *new_signals;
|
||||
guint i;
|
||||
|
||||
g_return_if_fail (class != NULL);
|
||||
|
||||
@ -362,18 +362,18 @@ gtk_object_class_add_signals (GtkObjectClass *class,
|
||||
* results:
|
||||
*****************************************/
|
||||
|
||||
gint
|
||||
guint
|
||||
gtk_object_class_add_user_signal (GtkObjectClass *class,
|
||||
const gchar *name,
|
||||
GtkSignalMarshaller marshaller,
|
||||
GtkType return_val,
|
||||
gint nparams,
|
||||
guint nparams,
|
||||
...)
|
||||
{
|
||||
GtkType *params;
|
||||
guint i;
|
||||
va_list args;
|
||||
gint signal_id;
|
||||
guint signal_id;
|
||||
|
||||
g_return_val_if_fail (class != NULL, 0);
|
||||
|
||||
@ -575,7 +575,7 @@ gtk_object_notify_weaks (gpointer data)
|
||||
*****************************************/
|
||||
|
||||
GtkObject*
|
||||
gtk_object_new (guint type,
|
||||
gtk_object_new (GtkType type,
|
||||
...)
|
||||
{
|
||||
GtkObject *obj;
|
||||
@ -608,7 +608,7 @@ gtk_object_new (guint type,
|
||||
*****************************************/
|
||||
|
||||
GtkObject*
|
||||
gtk_object_newv (guint type,
|
||||
gtk_object_newv (GtkType type,
|
||||
guint nargs,
|
||||
GtkArg *args)
|
||||
{
|
||||
@ -956,11 +956,11 @@ gtk_object_add_arg_type (const char *arg_name,
|
||||
*****************************************/
|
||||
|
||||
GtkType
|
||||
gtk_object_get_arg_type (const char *arg_name)
|
||||
gtk_object_get_arg_type (const gchar *arg_name)
|
||||
{
|
||||
GtkArgInfo *info;
|
||||
char buffer[1024];
|
||||
char *t;
|
||||
gchar buffer[1024];
|
||||
gchar *t;
|
||||
|
||||
if (!arg_info_ht)
|
||||
return GTK_TYPE_INVALID;
|
||||
|
||||
Reference in New Issue
Block a user