1997-11-24 22:37:52 +00:00
|
|
|
/* GTK - The GIMP Toolkit
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
1998-04-13 02:02:47 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
1997-11-24 22:37:52 +00:00
|
|
|
*/
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <string.h>
|
1998-01-30 23:47:09 +00:00
|
|
|
#include <stdio.h>
|
1998-01-31 08:15:57 +00:00
|
|
|
#include <stdlib.h>
|
1997-11-24 22:37:52 +00:00
|
|
|
#include "gtkobject.h"
|
|
|
|
#include "gtksignal.h"
|
|
|
|
|
|
|
|
|
1998-05-07 11:12:57 +00:00
|
|
|
#define GTK_OBJECT_DATA_ID_BLOCK_SIZE (1024)
|
|
|
|
#define GTK_OBJECT_DATA_BLOCK_SIZE (1024)
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
enum {
|
|
|
|
DESTROY,
|
|
|
|
LAST_SIGNAL
|
|
|
|
};
|
1998-01-16 00:49:51 +00:00
|
|
|
enum {
|
|
|
|
ARG_0,
|
|
|
|
ARG_USER_DATA,
|
1998-01-18 11:09:04 +00:00
|
|
|
ARG_SIGNAL,
|
|
|
|
ARG_OBJECT_SIGNAL
|
1998-01-16 00:49:51 +00:00
|
|
|
};
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
|
|
|
|
typedef struct _GtkObjectData GtkObjectData;
|
|
|
|
typedef struct _GtkArgInfo GtkArgInfo;
|
|
|
|
|
|
|
|
struct _GtkObjectData
|
|
|
|
{
|
|
|
|
guint id;
|
|
|
|
gpointer data;
|
1998-02-13 05:11:16 +00:00
|
|
|
GtkDestroyNotify destroy;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkObjectData *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct _GtkArgInfo
|
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
gchar *name;
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkType type;
|
1998-01-16 00:49:51 +00:00
|
|
|
GtkType class_type;
|
1998-02-21 13:33:20 +00:00
|
|
|
guint arg_flags;
|
1998-01-16 00:49:51 +00:00
|
|
|
guint arg_id;
|
1998-01-24 20:02:19 +00:00
|
|
|
guint seq_id;
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
1998-06-28 07:46:10 +00:00
|
|
|
void gtk_object_init_type (void);
|
|
|
|
static void gtk_object_base_class_init (GtkObjectClass *klass);
|
|
|
|
static void gtk_object_class_init (GtkObjectClass *klass);
|
|
|
|
static void gtk_object_init (GtkObject *object);
|
|
|
|
static void gtk_object_set_arg (GtkObject *object,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
|
|
|
static void gtk_object_get_arg (GtkObject *object,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id);
|
|
|
|
static void gtk_object_shutdown (GtkObject *object);
|
|
|
|
static void gtk_object_real_destroy (GtkObject *object);
|
|
|
|
static void gtk_object_finalize (GtkObject *object);
|
|
|
|
static void gtk_object_notify_weaks (GtkObject *object);
|
|
|
|
|
|
|
|
GtkArg* gtk_object_collect_args (guint *nargs,
|
|
|
|
GtkType (*) (const gchar*),
|
|
|
|
va_list args1,
|
|
|
|
va_list args2);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-03-09 15:16:28 +00:00
|
|
|
static guint object_signals[LAST_SIGNAL] = { 0 };
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
static GHashTable *arg_info_ht = NULL;
|
|
|
|
|
1998-03-09 15:16:28 +00:00
|
|
|
static const gchar *user_data_key = "user_data";
|
1998-03-14 04:43:14 +00:00
|
|
|
static guint user_data_key_id = 0;
|
1998-05-01 04:23:59 +00:00
|
|
|
static const gchar *weakrefs_key = "gtk-weakrefs";
|
|
|
|
static guint weakrefs_key_id = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-05-07 11:12:57 +00:00
|
|
|
static GtkObjectData *gtk_object_data_free_list = NULL;
|
|
|
|
|
|
|
|
#define GTK_OBJECT_DATA_DESTROY( odata ) { \
|
|
|
|
if (odata->destroy) \
|
|
|
|
odata->destroy (odata->data); \
|
|
|
|
odata->next = gtk_object_data_free_list; \
|
|
|
|
gtk_object_data_free_list = odata; \
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-03-07 23:20:56 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
1998-03-09 15:16:28 +00:00
|
|
|
static guint obj_count = 0;
|
1998-03-07 23:20:56 +00:00
|
|
|
static GHashTable *living_objs_ht = NULL;
|
|
|
|
static void
|
|
|
|
gtk_object_debug_foreach (gpointer key, gpointer value, gpointer user_data)
|
|
|
|
{
|
|
|
|
GtkObject *object;
|
|
|
|
|
|
|
|
object = (GtkObject*) value;
|
1998-03-14 08:15:23 +00:00
|
|
|
g_print ("GTK-DEBUG: %p: %s ref_count=%d%s%s\n",
|
1998-03-07 23:20:56 +00:00
|
|
|
object,
|
|
|
|
gtk_type_name (GTK_OBJECT_TYPE (object)),
|
|
|
|
object->ref_count,
|
|
|
|
GTK_OBJECT_FLOATING (object) ? " (floating)" : "",
|
|
|
|
GTK_OBJECT_DESTROYED (object) ? " (destroyed)" : "");
|
|
|
|
}
|
1998-01-30 23:47:09 +00:00
|
|
|
static void
|
|
|
|
gtk_object_debug (void)
|
|
|
|
{
|
1998-03-07 23:20:56 +00:00
|
|
|
g_hash_table_foreach (living_objs_ht, gtk_object_debug_foreach, NULL);
|
|
|
|
|
1998-03-14 08:15:23 +00:00
|
|
|
g_print ("GTK-DEBUG: living objects count = %d\n", obj_count);
|
1998-01-30 23:47:09 +00:00
|
|
|
}
|
1998-03-07 23:20:56 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|
1998-01-30 23:47:09 +00:00
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
/****************************************************
|
|
|
|
* GtkObject type, class and instance initialization
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
1998-03-14 04:43:14 +00:00
|
|
|
****************************************************/
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
void
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_object_init_type (void)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkType object_type = 0;
|
|
|
|
GtkTypeInfo object_info =
|
|
|
|
{
|
|
|
|
"GtkObject",
|
|
|
|
sizeof (GtkObject),
|
|
|
|
sizeof (GtkObjectClass),
|
|
|
|
(GtkClassInitFunc) gtk_object_class_init,
|
|
|
|
(GtkObjectInitFunc) gtk_object_init,
|
1998-06-28 07:46:10 +00:00
|
|
|
/* reversed_1 */ NULL,
|
|
|
|
/* reversed_2 */ NULL,
|
|
|
|
(GtkClassInitFunc) gtk_object_base_class_init,
|
1997-11-24 22:37:52 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
object_type = gtk_type_unique (0, &object_info);
|
|
|
|
g_assert (object_type == GTK_TYPE_OBJECT);
|
1998-01-30 23:47:09 +00:00
|
|
|
|
1998-02-19 06:21:27 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
|
|
|
if (gtk_debug_flags & GTK_DEBUG_OBJECTS)
|
|
|
|
ATEXIT (gtk_object_debug);
|
|
|
|
#endif /* G_ENABLE_DEBUG */
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
GtkType
|
1998-05-03 22:41:32 +00:00
|
|
|
gtk_object_get_type (void)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
return GTK_TYPE_OBJECT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-06-28 07:46:10 +00:00
|
|
|
gtk_object_base_class_init (GtkObjectClass *class)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-28 07:46:10 +00:00
|
|
|
/* reset instance specific fields that don't get inhrited */
|
1997-11-24 22:37:52 +00:00
|
|
|
class->signals = NULL;
|
|
|
|
class->nsignals = 0;
|
1998-01-23 10:38:29 +00:00
|
|
|
class->n_args = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-06-28 07:46:10 +00:00
|
|
|
/* reset instance specifc methods that don't get inherited */
|
|
|
|
class->get_arg = NULL;
|
|
|
|
class->set_arg = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_object_class_init (GtkObjectClass *class)
|
|
|
|
{
|
1998-02-19 07:18:42 +00:00
|
|
|
gtk_object_add_arg_type ("GtkObject::user_data",
|
|
|
|
GTK_TYPE_POINTER,
|
|
|
|
GTK_ARG_READWRITE,
|
|
|
|
ARG_USER_DATA);
|
|
|
|
gtk_object_add_arg_type ("GtkObject::signal",
|
|
|
|
GTK_TYPE_SIGNAL,
|
|
|
|
GTK_ARG_WRITABLE,
|
|
|
|
ARG_SIGNAL);
|
|
|
|
gtk_object_add_arg_type ("GtkObject::object_signal",
|
|
|
|
GTK_TYPE_SIGNAL,
|
|
|
|
GTK_ARG_WRITABLE,
|
|
|
|
ARG_OBJECT_SIGNAL);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
object_signals[DESTROY] =
|
|
|
|
gtk_signal_new ("destroy",
|
|
|
|
GTK_RUN_LAST,
|
|
|
|
class->type,
|
|
|
|
GTK_SIGNAL_OFFSET (GtkObjectClass, destroy),
|
|
|
|
gtk_signal_default_marshaller,
|
|
|
|
GTK_TYPE_NONE, 0);
|
|
|
|
|
|
|
|
gtk_object_class_add_signals (class, object_signals, LAST_SIGNAL);
|
|
|
|
|
1998-06-28 07:46:10 +00:00
|
|
|
class->get_arg = gtk_object_get_arg;
|
|
|
|
class->set_arg = gtk_object_set_arg;
|
1998-03-14 04:43:14 +00:00
|
|
|
class->shutdown = gtk_object_shutdown;
|
1998-01-30 23:47:09 +00:00
|
|
|
class->destroy = gtk_object_real_destroy;
|
|
|
|
class->finalize = gtk_object_finalize;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_object_init (GtkObject *object)
|
|
|
|
{
|
GTK_RESIZE_NEEDED is a private flag now.
Mon Feb 2 04:15:08 1998 Tim Janik <timj@gimp.org>
* gtk/gtkcontainer.h:
* gtk/gtkcontainer.c: GTK_RESIZE_NEEDED is a private flag now.
(gtk_container_register_toplevel): new function.
(gtk_container_unregister_toplevel): new function.
* gtk/gtkmain.c: GTK_LEAVE_PENDING is a private flag now.
* gtk/gtkmenu.c: call gtk_container_register_toplevel in
gtk_menu_class_init instead of this dirty gtk_widget_set_parent(,NULL)
hack. new default handler gtk_menu_destroy for calling
gtk_container_unregister_toplevel. removed GTK_ANCHORED, GTK_UNMAPPED.
* gtk/gtkobject.h: macro cleanups, added GTK_DESTROYED flag.
* gtk/gtkobject.c: only emit DESTROY signal if !GTK_OBJECT_DESTROYED
(object).
* gtk/gtkprivate.h: new file that will not be automatically included.
it holds the private flags for GtkWidget along with it's SET/UNSET
and examination macros.
* gtk/gtkwidget.c: private flags: GTK_RESIZE_NEEDED, GTK_REDRAW_PENDING,
GTK_RESIZE_PENDING, GTK_IN_REPARENT, GTK_USER_STYLE. GTK_ANCHORED is
replaced by GTK_TOPLEVEL. added missing UNSET for GTK_IN_REPARENT.
removed the gtk_widget_set_parent(, NULL) hack for toplevels.
upon destroy free memory for widgets with GTK_WIDGET_HAS_SHAPE_MASK.
* gtk/gtkwidget.h: split up the widget flags into a public and a private
portion. added an extra field private_flags to GtkWidget without making
it bigger by using an alignment gap of 16 bit. macro cleanups.
* gtk/gtkwindow.c: removed GTK_ANCHORED. new function gtk_window_destroy
for calling gtk_container_unregister_toplevel. removed the
gtk_widget_set_parent(,NULL), call gtk_container_register_toplevel
instead. remove GTK_UNMAPPED. GTK_RESIZE_NEEDED is private now.
* gtk/gtksignal.c (gtk_signal_disconnect): removed a bug on
removal that cut off the handler list -> living_objects == 0
with testgtk. made some warnings more descriptive.
new function gtk_signal_connect_object_while_alive, which
will automatically destroy the connection once one of the objects
is destroyed. didn't include this before removal of the above
mentioned bug.
* reflected refcounting revolution in ChangeLog
1998-02-02 04:54:25 +00:00
|
|
|
GTK_OBJECT_FLAGS (object) = GTK_FLOATING;
|
|
|
|
|
1998-01-30 23:47:09 +00:00
|
|
|
object->ref_count = 1;
|
1997-11-24 22:37:52 +00:00
|
|
|
object->object_data = NULL;
|
1998-01-30 23:47:09 +00:00
|
|
|
|
1998-02-19 06:21:27 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
|
|
|
if (gtk_debug_flags & GTK_DEBUG_OBJECTS)
|
|
|
|
{
|
|
|
|
obj_count++;
|
1998-03-07 23:20:56 +00:00
|
|
|
|
|
|
|
if (!living_objs_ht)
|
1998-06-09 23:18:11 +00:00
|
|
|
living_objs_ht = g_hash_table_new (g_direct_hash, NULL);
|
1998-03-07 23:20:56 +00:00
|
|
|
|
|
|
|
g_hash_table_insert (living_objs_ht, object, object);
|
1998-02-19 06:21:27 +00:00
|
|
|
}
|
|
|
|
#endif /* G_ENABLE_DEBUG */
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
/********************************************
|
|
|
|
* Functions to end a GtkObject's life time
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
1998-03-14 04:43:14 +00:00
|
|
|
********************************************/
|
|
|
|
void
|
|
|
|
gtk_object_destroy (GtkObject *object)
|
|
|
|
{
|
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
|
|
|
|
|
|
|
if (!GTK_OBJECT_DESTROYED (object))
|
|
|
|
{
|
|
|
|
/* we will hold a reference on the object in this place, so
|
|
|
|
* to ease all classes shutdown and destroy implementations.
|
|
|
|
* i.e. they don't have to bother about referencing at all.
|
|
|
|
*/
|
|
|
|
gtk_object_ref (object);
|
|
|
|
object->klass->shutdown (object);
|
|
|
|
gtk_object_unref (object);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_object_shutdown (GtkObject *object)
|
|
|
|
{
|
|
|
|
GTK_OBJECT_SET_FLAGS (object, GTK_DESTROYED);
|
|
|
|
gtk_signal_emit (object, object_signals[DESTROY]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_object_real_destroy (GtkObject *object)
|
|
|
|
{
|
1998-05-08 23:20:48 +00:00
|
|
|
if (GTK_OBJECT_CONNECTED (object))
|
|
|
|
gtk_signal_handlers_destroy (object);
|
1998-03-14 04:43:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_object_finalize (GtkObject *object)
|
|
|
|
{
|
1998-05-01 04:23:59 +00:00
|
|
|
gtk_object_notify_weaks (object);
|
|
|
|
|
1998-05-07 11:12:57 +00:00
|
|
|
while (object->object_data)
|
1998-03-14 04:43:14 +00:00
|
|
|
{
|
1998-05-07 11:12:57 +00:00
|
|
|
GtkObjectData *odata;
|
|
|
|
|
|
|
|
odata = object->object_data;
|
|
|
|
object->object_data = odata->next;
|
|
|
|
GTK_OBJECT_DATA_DESTROY (odata);
|
1998-03-14 04:43:14 +00:00
|
|
|
}
|
|
|
|
|
1998-05-14 21:13:18 +00:00
|
|
|
gtk_type_free (GTK_OBJECT_TYPE (object), object);
|
1998-03-14 04:43:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* GtkObject argument handlers
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
static void
|
1998-01-16 00:49:51 +00:00
|
|
|
gtk_object_set_arg (GtkObject *object,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-01-16 00:49:51 +00:00
|
|
|
switch (arg_id)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-01-16 00:49:51 +00:00
|
|
|
case ARG_USER_DATA:
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_object_set_user_data (object, GTK_VALUE_POINTER (*arg));
|
1998-01-16 00:49:51 +00:00
|
|
|
break;
|
|
|
|
case ARG_SIGNAL:
|
1998-01-18 11:09:04 +00:00
|
|
|
if ((arg->name[9 + 2 + 6] != ':') || (arg->name[9 + 2 + 7] != ':'))
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-28 07:46:10 +00:00
|
|
|
g_warning ("gtk_object_set_arg(): invalid signal argument: \"%s\"\n", arg->name);
|
1997-11-24 22:37:52 +00:00
|
|
|
return;
|
|
|
|
}
|
1998-01-18 11:09:04 +00:00
|
|
|
gtk_signal_connect (object, arg->name + 9 + 2 + 6 + 2,
|
1997-11-24 22:37:52 +00:00
|
|
|
(GtkSignalFunc) GTK_VALUE_SIGNAL (*arg).f,
|
|
|
|
GTK_VALUE_SIGNAL (*arg).d);
|
1998-01-16 00:49:51 +00:00
|
|
|
break;
|
1998-01-18 11:09:04 +00:00
|
|
|
case ARG_OBJECT_SIGNAL:
|
|
|
|
if ((arg->name[9 + 2 + 13] != ':') || (arg->name[9 + 2 + 14] != ':'))
|
|
|
|
{
|
1998-06-28 07:46:10 +00:00
|
|
|
g_warning ("gtk_object_set_arg(): invalid signal argument: \"%s\"\n", arg->name);
|
1998-01-18 11:09:04 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
gtk_signal_connect_object (object, arg->name + 9 + 2 + 13 + 2,
|
|
|
|
(GtkSignalFunc) GTK_VALUE_SIGNAL (*arg).f,
|
|
|
|
(GtkObject*) GTK_VALUE_SIGNAL (*arg).d);
|
|
|
|
break;
|
1998-01-21 23:03:11 +00:00
|
|
|
default:
|
|
|
|
break;
|
1998-01-17 07:52:38 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_object_get_arg (GtkObject *object,
|
|
|
|
GtkArg *arg,
|
|
|
|
guint arg_id)
|
|
|
|
{
|
|
|
|
switch (arg_id)
|
|
|
|
{
|
|
|
|
case ARG_USER_DATA:
|
|
|
|
GTK_VALUE_POINTER (*arg) = gtk_object_get_user_data (object);
|
|
|
|
break;
|
|
|
|
case ARG_SIGNAL:
|
1998-01-18 11:09:04 +00:00
|
|
|
case ARG_OBJECT_SIGNAL:
|
1998-01-16 00:49:51 +00:00
|
|
|
default:
|
1998-01-17 07:52:38 +00:00
|
|
|
arg->type = GTK_TYPE_INVALID;
|
|
|
|
break;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_class_add_signals:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_class_add_signals (GtkObjectClass *class,
|
1998-03-09 15:16:28 +00:00
|
|
|
guint *signals,
|
|
|
|
guint nsignals)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-03-09 15:16:28 +00:00
|
|
|
guint *new_signals;
|
|
|
|
guint i;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
g_return_if_fail (class != NULL);
|
|
|
|
|
1998-03-17 19:03:52 +00:00
|
|
|
new_signals = g_new (guint, class->nsignals + nsignals);
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < class->nsignals; i++)
|
|
|
|
new_signals[i] = class->signals[i];
|
|
|
|
for (i = 0; i < nsignals; i++)
|
|
|
|
new_signals[class->nsignals + i] = signals[i];
|
|
|
|
|
1998-01-29 20:44:14 +00:00
|
|
|
g_free (class->signals);
|
1997-11-24 22:37:52 +00:00
|
|
|
class->signals = new_signals;
|
|
|
|
class->nsignals += nsignals;
|
|
|
|
}
|
|
|
|
|
1998-03-09 15:16:28 +00:00
|
|
|
guint
|
1998-01-29 20:44:14 +00:00
|
|
|
gtk_object_class_add_user_signal (GtkObjectClass *class,
|
|
|
|
const gchar *name,
|
|
|
|
GtkSignalMarshaller marshaller,
|
|
|
|
GtkType return_val,
|
1998-03-09 15:16:28 +00:00
|
|
|
guint nparams,
|
1998-01-29 20:44:14 +00:00
|
|
|
...)
|
|
|
|
{
|
|
|
|
GtkType *params;
|
|
|
|
guint i;
|
|
|
|
va_list args;
|
1998-03-09 15:16:28 +00:00
|
|
|
guint signal_id;
|
1998-01-29 20:44:14 +00:00
|
|
|
|
|
|
|
g_return_val_if_fail (class != NULL, 0);
|
|
|
|
|
|
|
|
if (nparams > 0)
|
|
|
|
{
|
|
|
|
params = g_new (GtkType, nparams);
|
|
|
|
|
|
|
|
va_start (args, nparams);
|
|
|
|
|
|
|
|
for (i = 0; i < nparams; i++)
|
|
|
|
params[i] = va_arg (args, GtkType);
|
|
|
|
|
|
|
|
va_end (args);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
params = NULL;
|
|
|
|
|
|
|
|
signal_id = gtk_signal_newv (name,
|
|
|
|
0,
|
|
|
|
class->type,
|
|
|
|
0,
|
|
|
|
marshaller,
|
|
|
|
return_val,
|
|
|
|
nparams,
|
|
|
|
params);
|
|
|
|
|
|
|
|
g_free (params);
|
|
|
|
|
|
|
|
if (signal_id)
|
|
|
|
gtk_object_class_add_signals (class, &signal_id, 1);
|
|
|
|
|
|
|
|
return signal_id;
|
|
|
|
}
|
|
|
|
|
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
guint
|
1998-06-09 07:11:55 +00:00
|
|
|
gtk_object_class_user_signal_new (GtkObjectClass *class,
|
|
|
|
const gchar *name,
|
|
|
|
GtkSignalRunType signal_flags,
|
|
|
|
GtkSignalMarshaller marshaller,
|
|
|
|
GtkType return_val,
|
|
|
|
guint nparams,
|
|
|
|
...)
|
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
{
|
|
|
|
GtkType *params;
|
|
|
|
guint i;
|
|
|
|
va_list args;
|
|
|
|
guint signal_id;
|
|
|
|
|
|
|
|
g_return_val_if_fail (class != NULL, 0);
|
|
|
|
|
|
|
|
if (nparams > 0)
|
|
|
|
{
|
|
|
|
params = g_new (GtkType, nparams);
|
|
|
|
|
|
|
|
va_start (args, nparams);
|
|
|
|
|
|
|
|
for (i = 0; i < nparams; i++)
|
|
|
|
params[i] = va_arg (args, GtkType);
|
|
|
|
|
|
|
|
va_end (args);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
params = NULL;
|
|
|
|
|
|
|
|
signal_id = gtk_signal_newv (name,
|
1998-06-09 07:11:55 +00:00
|
|
|
signal_flags,
|
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org>
* gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment.
* gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from,
this should eventually be done by gentypeinfo.el somewhen.
* gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays.
* gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the
enum values of an enum type.
* gtk/gtk.defs:
* gtk/gtkcurve.h:
* gtk/gtkobject.h:
* gtk/gtkprivate.h:
* gtk/gtkwidget.h:
* gtk/gtkenums.h:
brought enum/flags definitions in sync, added a few more enum
definitions for bindings and pattern matching.
* some more macro and GtkType fixups in various places.
* gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used
as a key-release modifier for the binding system.
Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it
was a stale list pointer that is already present in GtkMenuShell.
* gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal
GtkMenuShell::selection_done which is emitted after the menu shell
poped down again and all possible menu items have been activated.
Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue
before activation of the menuitem, so the menu is actually taken off the
screen prior to any menu item activation.
* gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation
for NULL nodes.
* gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator
installation for the menu items, since we use dynamic menus.
Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmenufactory.c: adaptions to use the new accel groups. people
should *really* use GtkItemFactory. this is only for preserving source
compatibility where possible, use of GtkMenuFactory is deprecated as of
now.
* gtk/gtkobject.h (gtk_object_class_add_user_signal): new function
to create user signals of type GTK_RUN_NO_RECURSE. don't know why i
missed this possibility when i added gtk_object_class_add_user_signal
in late january.
* gtk/gtkmain.c (gtk_init): ignore subsequent function calls.
Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.h:
* gtk/gtkaccelgroup.c: new implementation of the accelerator concept.
* gtk/gtkaccellabel.h:
* gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features
display of the accelerators associated with a certain widget.
* gtk/gtkitemfactory.h:
* gtk/gtkitemfactory.c: new widget, item factory with automatic rc
parsing and accelerator handling.
* gtk/gtkmenu.c (gtk_menu_reposition): new function to care for
positioning a menu.
(gtk_menu_map): removed the allocation code.
(gtk_menu_size_allocate): care for redrawing of children and resize
our widget->window correctly.
(gtk_menu_key_press): feature the new accelerator groups.
* gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the
submenu if neccessary.
* gtk/gtkmenuitem.c:
* gtk/gtkcheckmenuitem.c:
* gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label()
function variants.
* gdk/gdk.c:
(gdk_keyval_from_name):
(gdk_keyval_name): new functions for keyval<->key-name associations.
(gdk_keyval_to_upper):
(gdk_keyval_to_lower):
(gdk_keyval_is_upper):
(gdk_keyval_is_lower): new functions to check/translate keyvalues with
regards to their cases.
Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a
widget's class path.
(gtk_widget_path): new function to calculate a widget's name path.
* gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up
pattern matching, features reversed pattern matches.
1998-06-07 06:48:56 +00:00
|
|
|
class->type,
|
|
|
|
0,
|
|
|
|
marshaller,
|
|
|
|
return_val,
|
|
|
|
nparams,
|
|
|
|
params);
|
|
|
|
|
|
|
|
g_free (params);
|
|
|
|
|
|
|
|
if (signal_id)
|
|
|
|
gtk_object_class_add_signals (class, &signal_id, 1);
|
|
|
|
|
|
|
|
return signal_id;
|
|
|
|
}
|
|
|
|
|
1998-06-09 07:11:55 +00:00
|
|
|
guint
|
|
|
|
gtk_object_class_user_signal_newv (GtkObjectClass *class,
|
|
|
|
const gchar *name,
|
|
|
|
GtkSignalRunType signal_flags,
|
|
|
|
GtkSignalMarshaller marshaller,
|
|
|
|
GtkType return_val,
|
|
|
|
guint nparams,
|
|
|
|
GtkType *params)
|
|
|
|
{
|
|
|
|
guint signal_id;
|
|
|
|
|
|
|
|
g_return_val_if_fail (class != NULL, 0);
|
|
|
|
|
|
|
|
if (nparams > 0)
|
|
|
|
g_return_val_if_fail (params != NULL, 0);
|
|
|
|
|
|
|
|
signal_id = gtk_signal_newv (name,
|
|
|
|
signal_flags,
|
|
|
|
class->type,
|
|
|
|
0,
|
|
|
|
marshaller,
|
|
|
|
return_val,
|
|
|
|
nparams,
|
|
|
|
params);
|
|
|
|
|
|
|
|
if (signal_id)
|
|
|
|
gtk_object_class_add_signals (class, &signal_id, 1);
|
|
|
|
|
|
|
|
return signal_id;
|
|
|
|
}
|
|
|
|
|
1998-01-30 23:47:09 +00:00
|
|
|
/*****************************************
|
|
|
|
* gtk_object_sink:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_sink (GtkObject *object)
|
|
|
|
{
|
1998-02-03 21:36:06 +00:00
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
|
|
|
|
1998-01-30 23:47:09 +00:00
|
|
|
if (GTK_OBJECT_FLOATING (object))
|
|
|
|
{
|
|
|
|
GTK_OBJECT_UNSET_FLAGS (object, GTK_FLOATING);
|
|
|
|
gtk_object_unref (object);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* Weak references.
|
|
|
|
*
|
|
|
|
* Weak refs are very similar to the old "destroy" signal. They allow
|
|
|
|
* one to register a callback that is called when the weakly
|
1998-02-07 04:59:23 +00:00
|
|
|
* referenced object is finalized.
|
1998-01-30 23:47:09 +00:00
|
|
|
*
|
|
|
|
* They are not implemented as a signal because they really are
|
1998-05-01 04:23:59 +00:00
|
|
|
* special and need to be used with great care. Unlike signals, which
|
1998-01-30 23:47:09 +00:00
|
|
|
* should be able to execute any code whatsoever.
|
|
|
|
*
|
|
|
|
* A weakref callback is not allowed to retain a reference to the
|
1998-05-01 04:23:59 +00:00
|
|
|
* object. Object data keys may be retrieved in a weak reference
|
|
|
|
* callback.
|
1998-01-30 23:47:09 +00:00
|
|
|
*
|
1998-05-01 04:23:59 +00:00
|
|
|
* A weakref callback is called at most once.
|
1998-01-30 23:47:09 +00:00
|
|
|
*
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
typedef struct _GtkWeakRef GtkWeakRef;
|
|
|
|
|
|
|
|
struct _GtkWeakRef
|
|
|
|
{
|
|
|
|
GtkWeakRef *next;
|
|
|
|
GtkDestroyNotify notify;
|
|
|
|
gpointer data;
|
|
|
|
};
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_weakref (GtkObject *object,
|
|
|
|
GtkDestroyNotify notify,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GtkWeakRef *weak;
|
|
|
|
|
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (notify != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
|
|
|
|
1998-05-01 04:23:59 +00:00
|
|
|
if (!weakrefs_key_id)
|
1998-06-19 02:07:47 +00:00
|
|
|
weakrefs_key_id = g_quark_from_static_string (weakrefs_key);
|
1998-05-01 04:23:59 +00:00
|
|
|
|
1998-01-30 23:47:09 +00:00
|
|
|
weak = g_new (GtkWeakRef, 1);
|
1998-05-01 04:23:59 +00:00
|
|
|
weak->next = gtk_object_get_data_by_id (object, weakrefs_key_id);
|
1998-01-30 23:47:09 +00:00
|
|
|
weak->notify = notify;
|
|
|
|
weak->data = data;
|
1998-05-01 04:23:59 +00:00
|
|
|
gtk_object_set_data_by_id (object, weakrefs_key_id, weak);
|
1998-01-30 23:47:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_weakunref (GtkObject *object,
|
|
|
|
GtkDestroyNotify notify,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GtkWeakRef *weaks, *w, **wp;
|
|
|
|
|
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
|
|
|
|
1998-05-01 04:23:59 +00:00
|
|
|
if (!weakrefs_key_id)
|
|
|
|
return;
|
|
|
|
|
|
|
|
weaks = gtk_object_get_data_by_id (object, weakrefs_key_id);
|
1998-01-30 23:47:09 +00:00
|
|
|
for (wp = &weaks; *wp; wp = &(*wp)->next)
|
|
|
|
{
|
|
|
|
w = *wp;
|
|
|
|
if (w->notify == notify && w->data == data)
|
|
|
|
{
|
|
|
|
if (w == weaks)
|
1998-05-01 04:23:59 +00:00
|
|
|
gtk_object_set_data_by_id (object, weakrefs_key_id, w->next);
|
1998-01-30 23:47:09 +00:00
|
|
|
else
|
|
|
|
*wp = w->next;
|
|
|
|
g_free (w);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-05-01 04:23:59 +00:00
|
|
|
gtk_object_notify_weaks (GtkObject *object)
|
1998-01-30 23:47:09 +00:00
|
|
|
{
|
1998-05-01 04:23:59 +00:00
|
|
|
if (weakrefs_key_id)
|
1998-01-30 23:47:09 +00:00
|
|
|
{
|
1998-05-01 04:23:59 +00:00
|
|
|
GtkWeakRef *w1, *w2;
|
|
|
|
|
|
|
|
w1 = gtk_object_get_data_by_id (object, weakrefs_key_id);
|
|
|
|
|
|
|
|
while (w1)
|
|
|
|
{
|
|
|
|
w1->notify (w1->data);
|
|
|
|
w2 = w1->next;
|
|
|
|
g_free (w1);
|
|
|
|
w1 = w2;
|
|
|
|
}
|
1998-01-30 23:47:09 +00:00
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_new:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
GtkObject*
|
1998-03-09 15:16:28 +00:00
|
|
|
gtk_object_new (GtkType type,
|
1997-11-24 22:37:52 +00:00
|
|
|
...)
|
|
|
|
{
|
|
|
|
GtkObject *obj;
|
|
|
|
GtkArg *args;
|
1998-01-16 05:11:10 +00:00
|
|
|
guint nargs;
|
1997-11-24 22:37:52 +00:00
|
|
|
va_list args1;
|
|
|
|
va_list args2;
|
|
|
|
|
|
|
|
obj = gtk_type_new (type);
|
|
|
|
|
|
|
|
va_start (args1, type);
|
|
|
|
va_start (args2, type);
|
|
|
|
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
args = gtk_object_collect_args (&nargs, gtk_object_get_arg_type, args1, args2);
|
1997-11-24 22:37:52 +00:00
|
|
|
gtk_object_setv (obj, nargs, args);
|
|
|
|
g_free (args);
|
|
|
|
|
|
|
|
va_end (args1);
|
|
|
|
va_end (args2);
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_newv:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
GtkObject*
|
1998-03-09 15:16:28 +00:00
|
|
|
gtk_object_newv (GtkType type,
|
1998-01-16 05:11:10 +00:00
|
|
|
guint nargs,
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkArg *args)
|
|
|
|
{
|
|
|
|
gpointer obj;
|
|
|
|
|
|
|
|
obj = gtk_type_new (type);
|
|
|
|
gtk_object_setv (obj, nargs, args);
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
1998-01-16 05:11:10 +00:00
|
|
|
/*****************************************
|
|
|
|
* gtk_object_getv:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_getv (GtkObject *object,
|
|
|
|
guint nargs,
|
|
|
|
GtkArg *args)
|
|
|
|
{
|
1998-03-15 21:14:28 +00:00
|
|
|
guint i;
|
1998-01-16 05:11:10 +00:00
|
|
|
|
|
|
|
g_return_if_fail (object != NULL);
|
1998-03-15 21:14:28 +00:00
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
1998-01-16 05:11:10 +00:00
|
|
|
|
|
|
|
if (!arg_info_ht)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (i = 0; i < nargs; i++)
|
|
|
|
{
|
|
|
|
GtkArgInfo *info;
|
|
|
|
gchar *lookup_name;
|
|
|
|
gchar *d;
|
1998-06-28 07:46:10 +00:00
|
|
|
GtkObjectClass *oclass;
|
1998-01-16 05:11:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* hm, the name cutting shouldn't be needed on gets, but what the heck...
|
|
|
|
*/
|
|
|
|
lookup_name = g_strdup (args[i].name);
|
|
|
|
d = strchr (lookup_name, ':');
|
|
|
|
if (d && d[1] == ':')
|
|
|
|
{
|
|
|
|
d = strchr (d + 2, ':');
|
|
|
|
if (d)
|
|
|
|
*d = 0;
|
|
|
|
|
|
|
|
info = g_hash_table_lookup (arg_info_ht, lookup_name);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
info = NULL;
|
|
|
|
|
|
|
|
if (!info)
|
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("gtk_object_getv(): invalid arg name: \"%s\"\n",
|
|
|
|
lookup_name);
|
1998-01-16 05:11:10 +00:00
|
|
|
args[i].type = GTK_TYPE_INVALID;
|
|
|
|
g_free (lookup_name);
|
|
|
|
continue;
|
|
|
|
}
|
1998-05-08 23:20:48 +00:00
|
|
|
else if (!gtk_type_is_a (object->klass->type, info->class_type))
|
1998-01-18 11:09:04 +00:00
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("gtk_object_getv(): invalid arg for %s: \"%s\"\n",
|
|
|
|
gtk_type_name (object->klass->type), lookup_name);
|
1998-01-18 11:09:04 +00:00
|
|
|
args[i].type = GTK_TYPE_INVALID;
|
|
|
|
g_free (lookup_name);
|
|
|
|
continue;
|
|
|
|
}
|
1998-03-15 21:14:28 +00:00
|
|
|
else if (! (info->arg_flags & GTK_ARG_READABLE))
|
1998-02-19 07:18:42 +00:00
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("gtk_object_getv(): arg is not supplied for read-access: \"%s\"\n",
|
|
|
|
lookup_name);
|
1998-02-19 07:18:42 +00:00
|
|
|
args[i].type = GTK_TYPE_INVALID;
|
|
|
|
g_free (lookup_name);
|
|
|
|
continue;
|
|
|
|
}
|
1998-01-16 05:11:10 +00:00
|
|
|
else
|
|
|
|
g_free (lookup_name);
|
|
|
|
|
|
|
|
args[i].type = info->type;
|
1998-06-28 07:46:10 +00:00
|
|
|
|
|
|
|
oclass = gtk_type_class (info->class_type);
|
|
|
|
if (oclass && oclass->get_arg)
|
|
|
|
oclass->get_arg (object, &args[i], info->arg_id);
|
|
|
|
else
|
|
|
|
args[i].type = GTK_TYPE_INVALID;
|
|
|
|
|
|
|
|
#if 0
|
1998-01-16 05:11:10 +00:00
|
|
|
gtk_type_get_arg (object, info->class_type, &args[i], info->arg_id);
|
1998-06-28 07:46:10 +00:00
|
|
|
#endif
|
1998-01-16 05:11:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-01-17 05:31:13 +00:00
|
|
|
/*****************************************
|
|
|
|
* gtk_object_query_args:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
struct _GtkQueryArgData
|
|
|
|
{
|
|
|
|
GList *arg_list;
|
|
|
|
GtkType class_type;
|
|
|
|
};
|
|
|
|
typedef struct _GtkQueryArgData GtkQueryArgData;
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_query_arg_foreach (gpointer key,
|
|
|
|
gpointer value,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
register GtkArgInfo *info;
|
|
|
|
register GtkQueryArgData *data;
|
|
|
|
|
|
|
|
info = value;
|
|
|
|
data = user_data;
|
|
|
|
|
|
|
|
if (info->class_type == data->class_type)
|
|
|
|
data->arg_list = g_list_prepend (data->arg_list, info);
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkArg*
|
|
|
|
gtk_object_query_args (GtkType class_type,
|
1998-02-21 13:33:20 +00:00
|
|
|
guint32 **arg_flags,
|
1998-01-17 05:31:13 +00:00
|
|
|
guint *nargs)
|
|
|
|
{
|
|
|
|
GtkArg *args;
|
|
|
|
GtkQueryArgData query_data;
|
|
|
|
|
1998-02-21 13:33:20 +00:00
|
|
|
if (arg_flags)
|
|
|
|
*arg_flags = NULL;
|
1998-01-17 05:31:13 +00:00
|
|
|
g_return_val_if_fail (nargs != NULL, NULL);
|
|
|
|
*nargs = 0;
|
1998-06-16 05:20:05 +00:00
|
|
|
g_return_val_if_fail (gtk_type_is_a (class_type, GTK_TYPE_OBJECT), NULL);
|
1998-01-17 05:31:13 +00:00
|
|
|
|
|
|
|
if (!arg_info_ht)
|
|
|
|
return NULL;
|
|
|
|
|
1998-02-07 04:59:23 +00:00
|
|
|
/* make sure the types class has been initialized, because
|
|
|
|
* the argument setup happens in the gtk_*_class_init() functions.
|
|
|
|
*/
|
|
|
|
gtk_type_class (class_type);
|
|
|
|
|
1998-01-17 05:31:13 +00:00
|
|
|
query_data.arg_list = NULL;
|
|
|
|
query_data.class_type = class_type;
|
|
|
|
g_hash_table_foreach (arg_info_ht, gtk_query_arg_foreach, &query_data);
|
|
|
|
|
|
|
|
if (query_data.arg_list)
|
|
|
|
{
|
|
|
|
register GList *list;
|
1998-01-24 20:02:19 +00:00
|
|
|
register guint len;
|
1998-01-17 05:31:13 +00:00
|
|
|
|
|
|
|
list = query_data.arg_list;
|
1998-01-24 20:02:19 +00:00
|
|
|
len = 1;
|
|
|
|
while (list->next)
|
|
|
|
{
|
|
|
|
len++;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
g_assert (len == ((GtkObjectClass*) gtk_type_class (class_type))->n_args); /* paranoid */
|
|
|
|
|
|
|
|
args = g_new0 (GtkArg, len);
|
|
|
|
*nargs = len;
|
1998-02-21 13:33:20 +00:00
|
|
|
if (arg_flags)
|
|
|
|
*arg_flags = g_new (guint32, len);
|
1998-01-17 05:31:13 +00:00
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
GtkArgInfo *info;
|
|
|
|
|
|
|
|
info = list->data;
|
1998-01-24 20:02:19 +00:00
|
|
|
list = list->prev;
|
1998-01-17 05:31:13 +00:00
|
|
|
|
1998-01-24 20:02:19 +00:00
|
|
|
g_assert (info->seq_id > 0 && info->seq_id <= len); /* paranoid */
|
1998-01-17 05:31:13 +00:00
|
|
|
|
1998-01-24 20:02:19 +00:00
|
|
|
args[info->seq_id - 1].type = info->type;
|
|
|
|
args[info->seq_id - 1].name = info->name;
|
1998-02-21 13:33:20 +00:00
|
|
|
if (arg_flags)
|
|
|
|
(*arg_flags)[info->seq_id - 1] = info->arg_flags;
|
1998-01-24 20:02:19 +00:00
|
|
|
}
|
|
|
|
while (list);
|
1998-01-17 05:31:13 +00:00
|
|
|
|
|
|
|
g_list_free (query_data.arg_list);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
args = NULL;
|
|
|
|
|
|
|
|
return args;
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
/*****************************************
|
|
|
|
* gtk_object_set:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
void
|
1998-01-16 05:11:10 +00:00
|
|
|
gtk_object_set (GtkObject *object,
|
1997-11-24 22:37:52 +00:00
|
|
|
...)
|
|
|
|
{
|
|
|
|
GtkArg *args;
|
1998-01-16 05:11:10 +00:00
|
|
|
guint nargs;
|
1997-11-24 22:37:52 +00:00
|
|
|
va_list args1;
|
|
|
|
va_list args2;
|
|
|
|
|
1998-01-16 05:11:10 +00:00
|
|
|
g_return_if_fail (object != NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-01-16 05:11:10 +00:00
|
|
|
va_start (args1, object);
|
|
|
|
va_start (args2, object);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
args = gtk_object_collect_args (&nargs, gtk_object_get_arg_type, args1, args2);
|
1998-01-16 05:11:10 +00:00
|
|
|
gtk_object_setv (object, nargs, args);
|
1997-11-24 22:37:52 +00:00
|
|
|
g_free (args);
|
|
|
|
|
|
|
|
va_end (args1);
|
|
|
|
va_end (args2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_setv:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
void
|
1998-01-18 11:09:04 +00:00
|
|
|
gtk_object_setv (GtkObject *object,
|
1998-01-16 05:11:10 +00:00
|
|
|
guint nargs,
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkArg *args)
|
|
|
|
{
|
1998-03-15 21:14:28 +00:00
|
|
|
guint i;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-01-18 11:09:04 +00:00
|
|
|
g_return_if_fail (object != NULL);
|
1998-03-15 21:14:28 +00:00
|
|
|
g_return_if_fail (GTK_OBJECT (object));
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-01-16 00:49:51 +00:00
|
|
|
if (!arg_info_ht)
|
|
|
|
return;
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
for (i = 0; i < nargs; i++)
|
|
|
|
{
|
1998-01-16 00:49:51 +00:00
|
|
|
GtkArgInfo *info;
|
|
|
|
gchar *lookup_name;
|
|
|
|
gchar *d;
|
1998-01-16 05:11:10 +00:00
|
|
|
gboolean arg_ok;
|
1998-06-28 07:46:10 +00:00
|
|
|
GtkObjectClass *oclass;
|
1998-01-16 00:49:51 +00:00
|
|
|
|
|
|
|
lookup_name = g_strdup (args[i].name);
|
|
|
|
d = strchr (lookup_name, ':');
|
|
|
|
if (d && d[1] == ':')
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-01-16 00:49:51 +00:00
|
|
|
d = strchr (d + 2, ':');
|
|
|
|
if (d)
|
|
|
|
*d = 0;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-01-16 00:49:51 +00:00
|
|
|
info = g_hash_table_lookup (arg_info_ht, lookup_name);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
info = NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-01-16 05:11:10 +00:00
|
|
|
arg_ok = TRUE;
|
|
|
|
|
1998-01-16 00:49:51 +00:00
|
|
|
if (!info)
|
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("gtk_object_setv(): invalid arg name: \"%s\"\n",
|
|
|
|
lookup_name);
|
1998-01-16 05:11:10 +00:00
|
|
|
arg_ok = FALSE;
|
|
|
|
}
|
|
|
|
else if (info->type != args[i].type)
|
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("gtk_object_setv(): invalid arg type for: \"%s\"\n",
|
|
|
|
lookup_name);
|
1998-01-16 05:11:10 +00:00
|
|
|
arg_ok = FALSE;
|
1998-01-16 00:49:51 +00:00
|
|
|
}
|
1998-05-08 23:20:48 +00:00
|
|
|
else if (!gtk_type_is_a (object->klass->type, info->class_type))
|
1998-01-18 11:09:04 +00:00
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("gtk_object_setv(): invalid arg for %s: \"%s\"\n",
|
|
|
|
gtk_type_name (object->klass->type), lookup_name);
|
1998-01-18 11:09:04 +00:00
|
|
|
arg_ok = FALSE;
|
|
|
|
}
|
1998-03-15 21:14:28 +00:00
|
|
|
else if (! (info->arg_flags & GTK_ARG_WRITABLE))
|
1998-02-19 07:18:42 +00:00
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("gtk_object_setv(): arg is not supplied for write-access: \"%s\"\n",
|
|
|
|
lookup_name);
|
1998-02-19 07:18:42 +00:00
|
|
|
arg_ok = FALSE;
|
|
|
|
}
|
1998-01-16 05:11:10 +00:00
|
|
|
|
1998-01-16 00:49:51 +00:00
|
|
|
g_free (lookup_name);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-01-16 05:11:10 +00:00
|
|
|
if (!arg_ok)
|
|
|
|
continue;
|
|
|
|
|
1998-06-28 07:46:10 +00:00
|
|
|
oclass = gtk_type_class (info->class_type);
|
|
|
|
if (oclass && oclass->set_arg)
|
|
|
|
oclass->set_arg (object, &args[i], info->arg_id);
|
|
|
|
|
|
|
|
#if 0
|
1998-01-18 11:09:04 +00:00
|
|
|
gtk_type_set_arg (object, info->class_type, &args[i], info->arg_id);
|
1998-06-28 07:46:10 +00:00
|
|
|
#endif
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_add_arg_type:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_add_arg_type (const char *arg_name,
|
1998-01-16 00:49:51 +00:00
|
|
|
GtkType arg_type,
|
1998-02-21 13:33:20 +00:00
|
|
|
guint arg_flags,
|
1998-01-16 00:49:51 +00:00
|
|
|
guint arg_id)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkArgInfo *info;
|
1998-01-16 00:49:51 +00:00
|
|
|
gchar class_part[1024];
|
|
|
|
gchar *arg_part;
|
|
|
|
GtkType class_type;
|
|
|
|
|
1998-02-19 07:18:42 +00:00
|
|
|
g_return_if_fail (arg_name != NULL);
|
|
|
|
g_return_if_fail (arg_type > GTK_TYPE_NONE);
|
1998-01-16 00:49:51 +00:00
|
|
|
g_return_if_fail (arg_id > 0);
|
1998-02-21 13:33:20 +00:00
|
|
|
g_return_if_fail ((arg_flags & GTK_ARG_READWRITE) != 0);
|
1998-06-16 05:20:05 +00:00
|
|
|
g_return_if_fail ((arg_flags & GTK_ARG_CHILD_ARG) == 0);
|
1998-01-16 00:49:51 +00:00
|
|
|
|
1998-06-16 05:20:05 +00:00
|
|
|
arg_flags &= GTK_ARG_MASK;
|
|
|
|
|
1998-01-16 00:49:51 +00:00
|
|
|
arg_part = strchr (arg_name, ':');
|
|
|
|
if (!arg_part || (arg_part[0] != ':') || (arg_part[1] != ':'))
|
|
|
|
{
|
|
|
|
g_warning ("invalid arg name: \"%s\"\n", arg_name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
strncpy (class_part, arg_name, (glong) (arg_part - arg_name));
|
|
|
|
class_part[(glong) (arg_part - arg_name)] = '\0';
|
|
|
|
|
|
|
|
class_type = gtk_type_from_name (class_part);
|
|
|
|
if (!class_type)
|
|
|
|
{
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("gtk_object_add_arg_type(): invalid class name in arg: \"%s\"\n", arg_name);
|
1998-01-16 00:49:51 +00:00
|
|
|
return;
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
info = g_new (GtkArgInfo, 1);
|
1998-01-16 00:49:51 +00:00
|
|
|
info->name = g_strdup (arg_name);
|
1997-11-24 22:37:52 +00:00
|
|
|
info->type = arg_type;
|
1998-01-16 00:49:51 +00:00
|
|
|
info->class_type = class_type;
|
1998-06-16 05:20:05 +00:00
|
|
|
info->arg_flags = arg_flags;
|
1998-01-16 00:49:51 +00:00
|
|
|
info->arg_id = arg_id;
|
1998-01-24 20:02:19 +00:00
|
|
|
info->seq_id = ++((GtkObjectClass*) gtk_type_class (class_type))->n_args;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
if (!arg_info_ht)
|
1998-01-18 15:12:01 +00:00
|
|
|
arg_info_ht = g_hash_table_new (g_str_hash, g_str_equal);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
g_hash_table_insert (arg_info_ht, info->name, info);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_get_arg_type:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
GtkType
|
1998-03-09 15:16:28 +00:00
|
|
|
gtk_object_get_arg_type (const gchar *arg_name)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkArgInfo *info;
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
gchar buffer[128];
|
1998-03-09 15:16:28 +00:00
|
|
|
gchar *t;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-05-12 00:34:28 +00:00
|
|
|
g_return_val_if_fail (arg_name != NULL, 0);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
if (!arg_info_ht)
|
|
|
|
return GTK_TYPE_INVALID;
|
|
|
|
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
if (!arg_name || strlen (arg_name) > 120)
|
1998-05-12 00:34:28 +00:00
|
|
|
{
|
|
|
|
/* security audit
|
|
|
|
*/
|
|
|
|
g_warning ("gtk_object_get_arg_type(): argument `arg_name' exceeds maximum size.");
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
return GTK_TYPE_INVALID;
|
1998-05-12 00:34:28 +00:00
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
t = strchr (arg_name, ':');
|
|
|
|
if (!t || (t[0] != ':') || (t[1] != ':'))
|
|
|
|
{
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
g_warning ("gtk_object_get_arg_type(): invalid arg name: \"%s\"\n", arg_name);
|
1997-11-24 22:37:52 +00:00
|
|
|
return GTK_TYPE_INVALID;
|
|
|
|
}
|
|
|
|
|
|
|
|
t = strchr (t + 2, ':');
|
|
|
|
if (t)
|
|
|
|
{
|
|
|
|
strncpy (buffer, arg_name, (long) (t - arg_name));
|
|
|
|
buffer[(long) (t - arg_name)] = '\0';
|
|
|
|
arg_name = buffer;
|
|
|
|
}
|
|
|
|
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
info = g_hash_table_lookup (arg_info_ht, arg_name);
|
1997-11-24 22:37:52 +00:00
|
|
|
if (info)
|
|
|
|
return info->type;
|
|
|
|
|
|
|
|
return GTK_TYPE_INVALID;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
1998-03-14 04:43:14 +00:00
|
|
|
* GtkObject object_data mechanism
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
|
|
|
*****************************************/
|
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
void
|
|
|
|
gtk_object_set_data_by_id (GtkObject *object,
|
1998-06-19 02:07:47 +00:00
|
|
|
GQuark data_id,
|
1998-03-14 04:43:14 +00:00
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
g_return_if_fail (data_id > 0);
|
|
|
|
|
|
|
|
gtk_object_set_data_by_id_full (object, data_id, data, NULL);
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
void
|
1998-02-13 05:11:16 +00:00
|
|
|
gtk_object_set_data (GtkObject *object,
|
|
|
|
const gchar *key,
|
|
|
|
gpointer data)
|
|
|
|
{
|
1998-03-14 04:43:14 +00:00
|
|
|
g_return_if_fail (key != NULL);
|
|
|
|
|
|
|
|
gtk_object_set_data_by_id_full (object, gtk_object_data_force_id (key), data, NULL);
|
1998-02-13 05:11:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1998-03-14 04:43:14 +00:00
|
|
|
gtk_object_set_data_by_id_full (GtkObject *object,
|
1998-06-19 02:07:47 +00:00
|
|
|
GQuark data_id,
|
1998-03-14 04:43:14 +00:00
|
|
|
gpointer data,
|
|
|
|
GtkDestroyNotify destroy)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkObjectData *odata;
|
1998-03-14 04:43:14 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
1998-03-14 04:43:14 +00:00
|
|
|
g_return_if_fail (data_id > 0);
|
1998-05-07 11:12:57 +00:00
|
|
|
|
|
|
|
odata = object->object_data;
|
1997-11-24 22:37:52 +00:00
|
|
|
if (!data)
|
|
|
|
{
|
1998-05-11 15:30:05 +00:00
|
|
|
GtkObjectData *prev;
|
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
prev = NULL;
|
|
|
|
|
|
|
|
while (odata)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-03-14 04:43:14 +00:00
|
|
|
if (odata->id == data_id)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-03-14 04:43:14 +00:00
|
|
|
if (prev)
|
|
|
|
prev->next = odata->next;
|
1998-05-07 11:12:57 +00:00
|
|
|
else
|
1998-03-14 04:43:14 +00:00
|
|
|
object->object_data = odata->next;
|
|
|
|
|
1998-05-07 11:12:57 +00:00
|
|
|
GTK_OBJECT_DATA_DESTROY (odata);
|
1998-06-19 02:07:47 +00:00
|
|
|
return;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-03-14 04:43:14 +00:00
|
|
|
|
|
|
|
prev = odata;
|
|
|
|
odata = odata->next;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
while (odata)
|
|
|
|
{
|
1998-03-14 04:43:14 +00:00
|
|
|
if (odata->id == data_id)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-06-19 02:07:47 +00:00
|
|
|
register GtkDestroyNotify dfunc;
|
|
|
|
register gpointer ddata;
|
|
|
|
|
|
|
|
dfunc = odata->destroy;
|
|
|
|
ddata = odata->data;
|
1998-02-13 05:11:16 +00:00
|
|
|
odata->destroy = destroy;
|
1998-06-19 02:07:47 +00:00
|
|
|
odata->data = data;
|
|
|
|
|
|
|
|
/* we need to have updated all structures prior to
|
|
|
|
* invokation of the destroy function
|
|
|
|
*/
|
|
|
|
if (dfunc)
|
|
|
|
dfunc (ddata);
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
return;
|
|
|
|
}
|
1998-05-11 15:30:05 +00:00
|
|
|
|
1998-06-19 02:07:47 +00:00
|
|
|
odata = odata->next;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-03-14 04:43:14 +00:00
|
|
|
|
1998-05-07 11:12:57 +00:00
|
|
|
if (gtk_object_data_free_list)
|
|
|
|
{
|
|
|
|
odata = gtk_object_data_free_list;
|
|
|
|
gtk_object_data_free_list = odata->next;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GtkObjectData *odata_block;
|
|
|
|
guint i;
|
|
|
|
|
|
|
|
odata_block = g_new0 (GtkObjectData, GTK_OBJECT_DATA_BLOCK_SIZE);
|
|
|
|
for (i = 1; i < GTK_OBJECT_DATA_BLOCK_SIZE; i++)
|
|
|
|
{
|
|
|
|
(odata_block + i)->next = gtk_object_data_free_list;
|
|
|
|
gtk_object_data_free_list = (odata_block + i);
|
|
|
|
}
|
|
|
|
|
|
|
|
odata = odata_block;
|
|
|
|
}
|
1998-03-14 04:43:14 +00:00
|
|
|
|
|
|
|
odata->id = data_id;
|
1997-11-24 22:37:52 +00:00
|
|
|
odata->data = data;
|
1998-02-13 05:11:16 +00:00
|
|
|
odata->destroy = destroy;
|
1997-11-24 22:37:52 +00:00
|
|
|
odata->next = object->object_data;
|
1998-03-14 04:43:14 +00:00
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
object->object_data = odata;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
void
|
|
|
|
gtk_object_set_data_full (GtkObject *object,
|
|
|
|
const gchar *key,
|
|
|
|
gpointer data,
|
|
|
|
GtkDestroyNotify destroy)
|
|
|
|
{
|
|
|
|
g_return_if_fail (key != NULL);
|
|
|
|
|
|
|
|
gtk_object_set_data_by_id_full (object, gtk_object_data_force_id (key), data, destroy);
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
gpointer
|
1998-03-14 04:43:14 +00:00
|
|
|
gtk_object_get_data_by_id (GtkObject *object,
|
1998-06-19 02:07:47 +00:00
|
|
|
GQuark data_id)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
GtkObjectData *odata;
|
|
|
|
|
|
|
|
g_return_val_if_fail (object != NULL, NULL);
|
|
|
|
g_return_val_if_fail (GTK_IS_OBJECT (object), NULL);
|
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
if (data_id)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
|
|
|
odata = object->object_data;
|
|
|
|
while (odata)
|
|
|
|
{
|
1998-03-14 04:43:14 +00:00
|
|
|
if (odata->id == data_id)
|
1997-11-24 22:37:52 +00:00
|
|
|
return odata->data;
|
|
|
|
odata = odata->next;
|
|
|
|
}
|
|
|
|
}
|
1998-03-14 04:43:14 +00:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
gpointer
|
|
|
|
gtk_object_get_data (GtkObject *object,
|
|
|
|
const gchar *key)
|
|
|
|
{
|
|
|
|
guint id;
|
|
|
|
|
|
|
|
g_return_val_if_fail (key != NULL, NULL);
|
|
|
|
|
|
|
|
id = gtk_object_data_try_key (key);
|
|
|
|
if (id)
|
|
|
|
return gtk_object_get_data_by_id (object, id);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
void
|
|
|
|
gtk_object_remove_data_by_id (GtkObject *object,
|
1998-06-19 02:07:47 +00:00
|
|
|
GQuark data_id)
|
1998-03-14 04:43:14 +00:00
|
|
|
{
|
|
|
|
if (data_id)
|
|
|
|
gtk_object_set_data_by_id_full (object, data_id, NULL, NULL);
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_remove_data (GtkObject *object,
|
|
|
|
const gchar *key)
|
|
|
|
{
|
1998-03-14 04:43:14 +00:00
|
|
|
gint id;
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
g_return_if_fail (key != NULL);
|
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
id = gtk_object_data_try_key (key);
|
|
|
|
if (id)
|
|
|
|
gtk_object_set_data_by_id_full (object, id, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
/*****************************************
|
|
|
|
* gtk_object_set_user_data:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_set_user_data (GtkObject *object,
|
|
|
|
gpointer data)
|
|
|
|
{
|
1998-03-14 04:43:14 +00:00
|
|
|
if (!user_data_key_id)
|
1998-06-19 02:07:47 +00:00
|
|
|
user_data_key_id = g_quark_from_static_string (user_data_key);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
gtk_object_set_data_by_id_full (object, user_data_key_id, data, NULL);
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_get_user_data:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
gpointer
|
|
|
|
gtk_object_get_user_data (GtkObject *object)
|
|
|
|
{
|
1998-03-14 04:43:14 +00:00
|
|
|
if (user_data_key_id)
|
1998-03-14 06:22:28 +00:00
|
|
|
return gtk_object_get_data_by_id (object, user_data_key_id);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
1998-03-14 04:43:14 +00:00
|
|
|
return NULL;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_check_cast:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
1998-03-07 20:32:59 +00:00
|
|
|
static gchar*
|
|
|
|
gtk_object_descriptive_type_name (GtkType type)
|
|
|
|
{
|
|
|
|
gchar *name;
|
|
|
|
|
|
|
|
name = gtk_type_name (type);
|
|
|
|
if (!name)
|
|
|
|
name = "(unknown)";
|
|
|
|
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
GtkObject*
|
|
|
|
gtk_object_check_cast (GtkObject *obj,
|
|
|
|
GtkType cast_type)
|
|
|
|
{
|
1998-03-07 20:32:59 +00:00
|
|
|
if (!obj)
|
1997-11-24 22:37:52 +00:00
|
|
|
{
|
1998-03-07 20:32:59 +00:00
|
|
|
g_warning ("invalid cast from (NULL) pointer to `%s'",
|
|
|
|
gtk_object_descriptive_type_name (cast_type));
|
|
|
|
return obj;
|
1997-11-24 22:37:52 +00:00
|
|
|
}
|
1998-03-07 20:32:59 +00:00
|
|
|
if (!obj->klass)
|
|
|
|
{
|
|
|
|
g_warning ("invalid unclassed pointer in cast to `%s'",
|
|
|
|
gtk_object_descriptive_type_name (cast_type));
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
if (obj->klass->type < GTK_TYPE_OBJECT)
|
|
|
|
{
|
|
|
|
g_warning ("invalid class type `%s' in cast to `%s'",
|
|
|
|
gtk_object_descriptive_type_name (obj->klass->type),
|
|
|
|
gtk_object_descriptive_type_name (cast_type));
|
|
|
|
return obj;
|
|
|
|
}
|
1998-05-08 23:20:48 +00:00
|
|
|
if (!gtk_type_is_a (obj->klass->type, cast_type))
|
1998-03-07 20:32:59 +00:00
|
|
|
{
|
|
|
|
g_warning ("invalid cast from `%s' to `%s'",
|
|
|
|
gtk_object_descriptive_type_name (obj->klass->type),
|
|
|
|
gtk_object_descriptive_type_name (cast_type));
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
1997-11-24 22:37:52 +00:00
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
|
|
|
* gtk_object_check_class_cast:
|
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
GtkObjectClass*
|
|
|
|
gtk_object_check_class_cast (GtkObjectClass *klass,
|
|
|
|
GtkType cast_type)
|
|
|
|
{
|
1998-03-07 20:32:59 +00:00
|
|
|
if (!klass)
|
|
|
|
{
|
|
|
|
g_warning ("invalid class cast from (NULL) pointer to `%s'",
|
|
|
|
gtk_object_descriptive_type_name (cast_type));
|
|
|
|
return klass;
|
|
|
|
}
|
|
|
|
if (klass->type < GTK_TYPE_OBJECT)
|
|
|
|
{
|
|
|
|
g_warning ("invalid class type `%s' in class cast to `%s'",
|
|
|
|
gtk_object_descriptive_type_name (klass->type),
|
|
|
|
gtk_object_descriptive_type_name (cast_type));
|
|
|
|
return klass;
|
|
|
|
}
|
1998-05-08 23:20:48 +00:00
|
|
|
if (!gtk_type_is_a (klass->type, cast_type))
|
1998-03-07 20:32:59 +00:00
|
|
|
{
|
|
|
|
g_warning ("invalid class cast from `%s' to `%s'",
|
|
|
|
gtk_object_descriptive_type_name (klass->type),
|
|
|
|
gtk_object_descriptive_type_name (cast_type));
|
|
|
|
return klass;
|
|
|
|
}
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
return klass;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*****************************************
|
1998-01-16 00:49:51 +00:00
|
|
|
* gtk_object_collect_args:
|
1997-11-24 22:37:52 +00:00
|
|
|
*
|
|
|
|
* arguments:
|
|
|
|
*
|
|
|
|
* results:
|
|
|
|
*****************************************/
|
|
|
|
|
|
|
|
GtkArg*
|
1998-01-16 05:11:10 +00:00
|
|
|
gtk_object_collect_args (guint *nargs,
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
GtkType (*get_arg_type) (const gchar*),
|
1997-11-24 22:37:52 +00:00
|
|
|
va_list args1,
|
|
|
|
va_list args2)
|
|
|
|
{
|
|
|
|
GtkArg *args;
|
|
|
|
GtkType type;
|
1998-01-16 05:11:10 +00:00
|
|
|
gchar *name;
|
|
|
|
gint done;
|
|
|
|
gint i, n;
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
n = 0;
|
|
|
|
done = FALSE;
|
|
|
|
|
|
|
|
while (!done)
|
|
|
|
{
|
|
|
|
name = va_arg (args1, char *);
|
|
|
|
if (!name)
|
|
|
|
{
|
|
|
|
done = TRUE;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
type = get_arg_type (name);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
switch (GTK_FUNDAMENTAL_TYPE (type))
|
|
|
|
{
|
|
|
|
case GTK_TYPE_INVALID:
|
1998-06-16 05:20:05 +00:00
|
|
|
g_warning ("GTK: invalid arg name: \"%s\" %x\n", name, type);
|
1997-11-24 22:37:52 +00:00
|
|
|
(void) va_arg (args1, long);
|
|
|
|
continue;
|
|
|
|
case GTK_TYPE_NONE:
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_CHAR:
|
|
|
|
case GTK_TYPE_BOOL:
|
|
|
|
case GTK_TYPE_INT:
|
|
|
|
case GTK_TYPE_UINT:
|
|
|
|
case GTK_TYPE_ENUM:
|
|
|
|
case GTK_TYPE_FLAGS:
|
|
|
|
(void) va_arg (args1, gint);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_LONG:
|
|
|
|
case GTK_TYPE_ULONG:
|
|
|
|
(void) va_arg (args1, glong);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_FLOAT:
|
|
|
|
(void) va_arg (args1, gfloat);
|
|
|
|
break;
|
1998-01-18 11:09:04 +00:00
|
|
|
case GTK_TYPE_DOUBLE:
|
|
|
|
(void) va_arg (args1, gdouble);
|
|
|
|
break;
|
1997-11-24 22:37:52 +00:00
|
|
|
case GTK_TYPE_STRING:
|
|
|
|
(void) va_arg (args1, gchar*);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_POINTER:
|
|
|
|
case GTK_TYPE_BOXED:
|
|
|
|
(void) va_arg (args1, gpointer);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_SIGNAL:
|
|
|
|
(void) va_arg (args1, GtkFunction);
|
|
|
|
(void) va_arg (args1, gpointer);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_FOREIGN:
|
|
|
|
(void) va_arg (args1, gpointer);
|
|
|
|
(void) va_arg (args1, GtkDestroyNotify);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_CALLBACK:
|
|
|
|
(void) va_arg (args1, GtkCallbackMarshal);
|
|
|
|
(void) va_arg (args1, gpointer);
|
|
|
|
(void) va_arg (args1, GtkDestroyNotify);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_C_CALLBACK:
|
|
|
|
(void) va_arg (args1, GtkFunction);
|
|
|
|
(void) va_arg (args1, gpointer);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_ARGS:
|
|
|
|
(void) va_arg (args1, gint);
|
|
|
|
(void) va_arg (args1, GtkArg*);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_OBJECT:
|
|
|
|
(void) va_arg (args1, GtkObject*);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_error ("unsupported type %s in args", gtk_type_name (type));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
n += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
*nargs = n;
|
|
|
|
args = NULL;
|
|
|
|
|
|
|
|
if (n > 0)
|
|
|
|
{
|
|
|
|
args = g_new0 (GtkArg, n);
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
{
|
|
|
|
args[i].name = va_arg (args2, char *);
|
new function gtk_container_child_arg_set, similar to
Wed Jun 24 14:14:32 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c: new function gtk_container_child_arg_set, similar
to gtk_container_child_arg_setv, but takes a variable argument list.
new function gtk_container_get_child_arg_type, which is needed by
gtk_object_collect_args.
* gtk/gtkobject.c: changed prototype for gtk_object_collect_args, to
take a function pointer to figure the argument type.
adapted callers to pass gtk_object_get_arg_type.
* gtk/gtkwidget.c: adapted gtk_object_collect_args callers to pass
gtk_object_get_arg_type..
* gtk/gtkpacker.h:
* gtk/gtkpacker.c:
(gtk_packer_reorder_child): new function to change the packing order
of a child.
(gtk_packer_size_request):
(gtk_packer_size_allocate): take container->border_width into acount.
* gtk/gtkpacker.c: implemented widget arguments:
"GtkPacker::spacing", "GtkPacker::border_width", "GtkPacker::pad_x",
"GtkPacker::pad_y", "GtkPacker::ipad_x", "GtkPacker::ipad_y".
implemented child arguments:
"GtkPacker::side", "GtkPacker::anchor", "GtkPacker::expand",
"GtkPacker::fill_x", "GtkPacker::fill_y", "GtkPacker::use_default",
"GtkPacker::border_width", "GtkPacker::pad_x", "GtkPacker::pad_y",
"GtkPacker::ipad_x", "GtkPacker::ipad_y", "GtkPacker::position".
* gtk/gtkmisc.c (gtk_misc_set_arg): for padding args, set the padding,
not the alignment.
* gtk/gtkeventbox.h:
* gtk/gtkeventbox.c: GtkType and macro fixups.
* gtk/testgtk.c (entry_toggle_sensitive): new function to toggle
sensitivity of an entry.
* gtk/gtkstyle.c (gtk_style_new): support normal grey as default color
for insensitive base.
* gtk/gtkentry.c (gtk_entry_realize): set the window backgrounds
widget state dependent.
(gtk_entry_style_set): likewise.
(gtk_entry_state_changed): set background color on state changes.
(gtk_entry_draw_text): for non selected text, use state dependent
colors.
* gtk/gtktogglebutton.c: support for widget arguments
"GtkToggleButton::active" and "GtkToggleButton::draw_indicator".
1998-06-24 12:22:23 +00:00
|
|
|
args[i].type = get_arg_type (args[i].name);
|
1997-11-24 22:37:52 +00:00
|
|
|
|
|
|
|
switch (GTK_FUNDAMENTAL_TYPE (args[i].type))
|
|
|
|
{
|
|
|
|
case GTK_TYPE_INVALID:
|
|
|
|
(void) va_arg (args2, long);
|
|
|
|
i -= 1;
|
|
|
|
continue;
|
|
|
|
case GTK_TYPE_NONE:
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_CHAR:
|
|
|
|
GTK_VALUE_CHAR(args[i]) = va_arg (args2, gint);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_BOOL:
|
|
|
|
GTK_VALUE_BOOL(args[i]) = va_arg (args2, gint);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_INT:
|
|
|
|
GTK_VALUE_INT(args[i]) = va_arg (args2, gint);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_UINT:
|
|
|
|
GTK_VALUE_UINT(args[i]) = va_arg (args2, guint);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_ENUM:
|
|
|
|
GTK_VALUE_ENUM(args[i]) = va_arg (args2, gint);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_FLAGS:
|
|
|
|
GTK_VALUE_FLAGS(args[i]) = va_arg (args2, gint);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_LONG:
|
|
|
|
GTK_VALUE_LONG(args[i]) = va_arg (args2, glong);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_ULONG:
|
|
|
|
GTK_VALUE_ULONG(args[i]) = va_arg (args2, gulong);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_FLOAT:
|
|
|
|
GTK_VALUE_FLOAT(args[i]) = va_arg (args2, gfloat);
|
|
|
|
break;
|
1998-01-18 11:09:04 +00:00
|
|
|
case GTK_TYPE_DOUBLE:
|
|
|
|
GTK_VALUE_DOUBLE(args[i]) = va_arg (args2, gdouble);
|
|
|
|
break;
|
1997-11-24 22:37:52 +00:00
|
|
|
case GTK_TYPE_STRING:
|
|
|
|
GTK_VALUE_STRING(args[i]) = va_arg (args2, gchar*);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_POINTER:
|
|
|
|
GTK_VALUE_POINTER(args[i]) = va_arg (args2, gpointer);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_BOXED:
|
|
|
|
GTK_VALUE_BOXED(args[i]) = va_arg (args2, gpointer);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_SIGNAL:
|
|
|
|
GTK_VALUE_SIGNAL(args[i]).f = va_arg (args2, GtkFunction);
|
|
|
|
GTK_VALUE_SIGNAL(args[i]).d = va_arg (args2, gpointer);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_FOREIGN:
|
|
|
|
GTK_VALUE_FOREIGN(args[i]).data = va_arg (args2, gpointer);
|
|
|
|
GTK_VALUE_FOREIGN(args[i]).notify =
|
|
|
|
va_arg (args2, GtkDestroyNotify);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_CALLBACK:
|
|
|
|
GTK_VALUE_CALLBACK(args[i]).marshal =
|
|
|
|
va_arg (args2, GtkCallbackMarshal);
|
|
|
|
GTK_VALUE_CALLBACK(args[i]).data = va_arg (args2, gpointer);
|
|
|
|
GTK_VALUE_CALLBACK(args[i]).notify =
|
|
|
|
va_arg (args2, GtkDestroyNotify);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_C_CALLBACK:
|
|
|
|
GTK_VALUE_C_CALLBACK(args[i]).func = va_arg (args2, GtkFunction);
|
|
|
|
GTK_VALUE_C_CALLBACK(args[i]).func_data =
|
|
|
|
va_arg (args2, gpointer);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_ARGS:
|
|
|
|
GTK_VALUE_ARGS(args[i]).n_args = va_arg (args2, gint);
|
|
|
|
GTK_VALUE_ARGS(args[i]).args = va_arg (args2, GtkArg*);
|
|
|
|
break;
|
|
|
|
case GTK_TYPE_OBJECT:
|
|
|
|
GTK_VALUE_OBJECT(args[i]) = va_arg (args2, GtkObject*);
|
|
|
|
g_assert (GTK_VALUE_OBJECT(args[i]) == NULL ||
|
|
|
|
GTK_CHECK_TYPE (GTK_VALUE_OBJECT(args[i]),
|
|
|
|
args[i].type));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
g_error ("unsupported type %s in args",
|
|
|
|
gtk_type_name (args[i].type));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return args;
|
|
|
|
}
|
1998-02-02 18:44:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#undef gtk_object_ref
|
|
|
|
#undef gtk_object_unref
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_ref (GtkObject *object)
|
|
|
|
{
|
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
|
|
|
|
|
|
|
object->ref_count += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
gtk_object_unref (GtkObject *object)
|
|
|
|
{
|
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
|
|
|
|
|
|
|
if (object->ref_count == 1)
|
|
|
|
gtk_object_destroy (object);
|
|
|
|
|
|
|
|
if (object->ref_count > 0)
|
|
|
|
object->ref_count -= 1;
|
|
|
|
|
|
|
|
if (object->ref_count == 0)
|
|
|
|
{
|
1998-02-19 06:21:27 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
|
|
|
if (gtk_debug_flags & GTK_DEBUG_OBJECTS)
|
|
|
|
{
|
1998-03-07 23:20:56 +00:00
|
|
|
g_assert (g_hash_table_lookup (living_objs_ht, object) == object);
|
|
|
|
g_hash_table_remove (living_objs_ht, object);
|
1998-02-19 06:21:27 +00:00
|
|
|
obj_count--;
|
|
|
|
}
|
|
|
|
#endif /* G_ENABLE_DEBUG */
|
1998-02-02 18:44:28 +00:00
|
|
|
object->klass->finalize (object);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkObject *gtk_trace_object = NULL;
|
|
|
|
void
|
1998-05-11 08:31:16 +00:00
|
|
|
gtk_trace_referencing (GtkObject *object,
|
1998-02-02 18:44:28 +00:00
|
|
|
const gchar *func,
|
1998-05-11 08:31:16 +00:00
|
|
|
guint dummy,
|
1998-02-02 18:44:28 +00:00
|
|
|
guint line,
|
|
|
|
gboolean do_ref)
|
|
|
|
{
|
1998-02-19 06:21:27 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_OBJECTS)
|
|
|
|
{
|
1998-05-11 15:30:05 +00:00
|
|
|
gboolean exists = TRUE;
|
|
|
|
|
1998-02-19 06:21:27 +00:00
|
|
|
g_return_if_fail (object != NULL);
|
|
|
|
g_return_if_fail (GTK_IS_OBJECT (object));
|
1998-02-02 18:44:28 +00:00
|
|
|
|
1998-05-11 15:30:05 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
1998-03-07 23:20:56 +00:00
|
|
|
exists = g_hash_table_lookup (living_objs_ht, object) != NULL;
|
1998-05-12 00:34:28 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|
1998-02-19 06:21:27 +00:00
|
|
|
|
|
|
|
if (exists &&
|
|
|
|
(object == gtk_trace_object ||
|
|
|
|
gtk_trace_object == (void*)42))
|
1998-05-11 08:31:16 +00:00
|
|
|
fprintf (stdout, "trace: object_%s: (%s:%p)->ref_count=%d %s (%s:%d)\n",
|
|
|
|
do_ref ? "ref" : "unref",
|
|
|
|
gtk_type_name (GTK_OBJECT_TYPE (object)),
|
|
|
|
object,
|
|
|
|
object->ref_count,
|
|
|
|
do_ref ? "+ 1" : "- 1",
|
|
|
|
func,
|
|
|
|
line);
|
|
|
|
else if (!exists)
|
|
|
|
fprintf (stdout, "trace: object_%s(%p): no such object! (%s:%d)\n",
|
|
|
|
do_ref ? "ref" : "unref",
|
|
|
|
object,
|
|
|
|
func,
|
|
|
|
line);
|
1998-02-19 06:21:27 +00:00
|
|
|
}
|
1998-02-02 18:44:28 +00:00
|
|
|
|
|
|
|
if (do_ref)
|
|
|
|
gtk_object_ref (object);
|
|
|
|
else
|
|
|
|
gtk_object_unref (object);
|
|
|
|
}
|