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

commiting patch after comments from Alex on IRC

Browse Source 
2001-07-15  James Henstridge  <james@daa.com.au>

	* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
	(gtk_window_remove_accel_group): same here.
	(gtk_window_key_press_event): same here.

	* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
	(gtk_widget_remove_accelerator): same here.
	(gtk_widget_remove_accelerators): same here.

	* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.

	* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
	instead of GtkObject.

	* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
	now takes GObjects.

	* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
	pass a GObject to gtk_accel_group_entries_from_object.
	(gtk_item_factory_create_item): s/accel_widget/accel_object/

	* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.

	* gtk/gtkaccellabel.c: convert to handle GObject accel objects.

	* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
	GObjects can have accelerators set now.  Add compatibility
	defines.

	* gtk/gtkmarshal.list: add missing marshallers.

	* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
	accelerators on plain GObjects.  gtk_accel_group_object_destroy
	has been converted into a weak reference, and
	gtk_accel_group_delete_entries is now a destroy notify for that
	piece of data.
This commit is contained in:
James Henstridge 2001-07-25 13:36:02 +00:00 committed by James Henstridge
parent afacc246f1
commit e70939234c
20 changed files with 572 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ChangeLog
View File

@ -1,3 +1,41 @@
2001-07-15 James Henstridge <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
(gtk_window_remove_accel_group): same here.
(gtk_window_key_press_event): same here.
* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
(gtk_widget_remove_accelerator): same here.
(gtk_widget_remove_accelerators): same here.
* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
instead of GtkObject.
* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
now takes GObjects.
* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
pass a GObject to gtk_accel_group_entries_from_object.
(gtk_item_factory_create_item): s/accel_widget/accel_object/
* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.
* gtk/gtkaccellabel.c: convert to handle GObject accel objects.
* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
GObjects can have accelerators set now. Add compatibility
defines.
* gtk/gtkmarshal.list: add missing marshallers.
* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
accelerators on plain GObjects. gtk_accel_group_object_destroy
has been converted into a weak reference, and
gtk_accel_group_delete_entries is now a destroy notify for that
piece of data.
2001-07-23 Ron Steinke <rsteinke@w-link.net> 2001-07-23 Ron Steinke <rsteinke@w-link.net>
* gdk/gdkdraw.c: Added a check on the colormap depth to * gdk/gdkdraw.c: Added a check on the colormap depth to

38
ChangeLog.pre-2-0
View File

@ -1,3 +1,41 @@
2001-07-15 James Henstridge <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
(gtk_window_remove_accel_group): same here.
(gtk_window_key_press_event): same here.
* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
(gtk_widget_remove_accelerator): same here.
(gtk_widget_remove_accelerators): same here.
* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
instead of GtkObject.
* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
now takes GObjects.
* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
pass a GObject to gtk_accel_group_entries_from_object.
(gtk_item_factory_create_item): s/accel_widget/accel_object/
* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.
* gtk/gtkaccellabel.c: convert to handle GObject accel objects.
* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
GObjects can have accelerators set now. Add compatibility
defines.
* gtk/gtkmarshal.list: add missing marshallers.
* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
accelerators on plain GObjects. gtk_accel_group_object_destroy
has been converted into a weak reference, and
gtk_accel_group_delete_entries is now a destroy notify for that
piece of data.
2001-07-23 Ron Steinke <rsteinke@w-link.net> 2001-07-23 Ron Steinke <rsteinke@w-link.net>
* gdk/gdkdraw.c: Added a check on the colormap depth to * gdk/gdkdraw.c: Added a check on the colormap depth to

38
ChangeLog.pre-2-10
View File

@ -1,3 +1,41 @@
2001-07-15 James Henstridge <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
(gtk_window_remove_accel_group): same here.
(gtk_window_key_press_event): same here.
* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
(gtk_widget_remove_accelerator): same here.
(gtk_widget_remove_accelerators): same here.
* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
instead of GtkObject.
* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
now takes GObjects.
* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
pass a GObject to gtk_accel_group_entries_from_object.
(gtk_item_factory_create_item): s/accel_widget/accel_object/
* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.
* gtk/gtkaccellabel.c: convert to handle GObject accel objects.
* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
GObjects can have accelerators set now. Add compatibility
defines.
* gtk/gtkmarshal.list: add missing marshallers.
* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
accelerators on plain GObjects. gtk_accel_group_object_destroy
has been converted into a weak reference, and
gtk_accel_group_delete_entries is now a destroy notify for that
piece of data.
2001-07-23 Ron Steinke <rsteinke@w-link.net> 2001-07-23 Ron Steinke <rsteinke@w-link.net>
* gdk/gdkdraw.c: Added a check on the colormap depth to * gdk/gdkdraw.c: Added a check on the colormap depth to

38
ChangeLog.pre-2-2
View File

@ -1,3 +1,41 @@
2001-07-15 James Henstridge <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
(gtk_window_remove_accel_group): same here.
(gtk_window_key_press_event): same here.
* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
(gtk_widget_remove_accelerator): same here.
(gtk_widget_remove_accelerators): same here.
* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
instead of GtkObject.
* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
now takes GObjects.
* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
pass a GObject to gtk_accel_group_entries_from_object.
(gtk_item_factory_create_item): s/accel_widget/accel_object/
* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.
* gtk/gtkaccellabel.c: convert to handle GObject accel objects.
* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
GObjects can have accelerators set now. Add compatibility
defines.
* gtk/gtkmarshal.list: add missing marshallers.
* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
accelerators on plain GObjects. gtk_accel_group_object_destroy
has been converted into a weak reference, and
gtk_accel_group_delete_entries is now a destroy notify for that
piece of data.
2001-07-23 Ron Steinke <rsteinke@w-link.net> 2001-07-23 Ron Steinke <rsteinke@w-link.net>
* gdk/gdkdraw.c: Added a check on the colormap depth to * gdk/gdkdraw.c: Added a check on the colormap depth to

38
ChangeLog.pre-2-4
View File

@ -1,3 +1,41 @@
2001-07-15 James Henstridge <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
(gtk_window_remove_accel_group): same here.
(gtk_window_key_press_event): same here.
* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
(gtk_widget_remove_accelerator): same here.
(gtk_widget_remove_accelerators): same here.
* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
instead of GtkObject.
* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
now takes GObjects.
* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
pass a GObject to gtk_accel_group_entries_from_object.
(gtk_item_factory_create_item): s/accel_widget/accel_object/
* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.
* gtk/gtkaccellabel.c: convert to handle GObject accel objects.
* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
GObjects can have accelerators set now. Add compatibility
defines.
* gtk/gtkmarshal.list: add missing marshallers.
* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
accelerators on plain GObjects. gtk_accel_group_object_destroy
has been converted into a weak reference, and
gtk_accel_group_delete_entries is now a destroy notify for that
piece of data.
2001-07-23 Ron Steinke <rsteinke@w-link.net> 2001-07-23 Ron Steinke <rsteinke@w-link.net>
* gdk/gdkdraw.c: Added a check on the colormap depth to * gdk/gdkdraw.c: Added a check on the colormap depth to

38
ChangeLog.pre-2-6
View File

@ -1,3 +1,41 @@
2001-07-15 James Henstridge <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
(gtk_window_remove_accel_group): same here.
(gtk_window_key_press_event): same here.
* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
(gtk_widget_remove_accelerator): same here.
(gtk_widget_remove_accelerators): same here.
* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
instead of GtkObject.
* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
now takes GObjects.
* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
pass a GObject to gtk_accel_group_entries_from_object.
(gtk_item_factory_create_item): s/accel_widget/accel_object/
* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.
* gtk/gtkaccellabel.c: convert to handle GObject accel objects.
* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
GObjects can have accelerators set now. Add compatibility
defines.
* gtk/gtkmarshal.list: add missing marshallers.
* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
accelerators on plain GObjects. gtk_accel_group_object_destroy
has been converted into a weak reference, and
gtk_accel_group_delete_entries is now a destroy notify for that
piece of data.
2001-07-23 Ron Steinke <rsteinke@w-link.net> 2001-07-23 Ron Steinke <rsteinke@w-link.net>
* gdk/gdkdraw.c: Added a check on the colormap depth to * gdk/gdkdraw.c: Added a check on the colormap depth to

38
ChangeLog.pre-2-8
View File

@ -1,3 +1,41 @@
2001-07-15 James Henstridge <james@daa.com.au>
* gtk/gtkwindow.c (gtk_window_add_accel_group): cast to GObject.
(gtk_window_remove_accel_group): same here.
(gtk_window_key_press_event): same here.
* gtk/gtkwidget.c (gtk_widget_add_accelerator): cast to GObject.
(gtk_widget_remove_accelerator): same here.
(gtk_widget_remove_accelerators): same here.
* gtk/gtkplug.c (gtk_plug_accel_entries_changed): same here.
* gtk/gtkmenushell.c (gtk_menu_shell_key_press): cast to GObject
instead of GtkObject.
* gtk/gtkmenu.c (gtk_menu_key_press): update since GtkAccelGroup
now takes GObjects.
* gtk/gtkitemfactory.c (gtk_item_factory_propagate_accelerator):
pass a GObject to gtk_accel_group_entries_from_object.
(gtk_item_factory_create_item): s/accel_widget/accel_object/
* gtk/gtk-boxed.defs: remove GtkAccelGroup boxed def.
* gtk/gtkaccellabel.c: convert to handle GObject accel objects.
* gtk/gtkaccellabel.h: fix header to reflect that arbitrary
GObjects can have accelerators set now. Add compatibility
defines.
* gtk/gtkmarshal.list: add missing marshallers.
* gtk/gtkaccelgroup.[ch]: convert to a GObject, and allow setting
accelerators on plain GObjects. gtk_accel_group_object_destroy
has been converted into a weak reference, and
gtk_accel_group_delete_entries is now a destroy notify for that
piece of data.
2001-07-23 Ron Steinke <rsteinke@w-link.net> 2001-07-23 Ron Steinke <rsteinke@w-link.net>
* gdk/gdkdraw.c: Added a check on the colormap depth to * gdk/gdkdraw.c: Added a check on the colormap depth to

4
gtk/gtk-boxed.defs
View File

@ -9,10 +9,6 @@
;;; Gtk boxed types ;;; Gtk boxed types
(define-boxed GtkAccelGroup
gtk_accel_group_ref
gtk_accel_group_unref)
(define-boxed GtkBorder (define-boxed GtkBorder
gtk_border_copy gtk_border_copy
gtk_border_free gtk_border_free

372
gtk/gtkaccelgroup.c
View File

@ -36,14 +36,14 @@
/* --- signals --- */ /* --- signals --- */
typedef void (*GtkSignalAddAccelerator) (GtkObject *object, typedef void (*GtkSignalAddAccelerator) (GObject *object,
guint accel_signal_id, guint accel_signal_id,
GtkAccelGroup *accel_group, GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
GtkAccelFlags accel_flags, GtkAccelFlags accel_flags,
gpointer func_data); gpointer func_data);
typedef void (*GtkSignalRemoveAccelerator) (GtkObject *object, typedef void (*GtkSignalRemoveAccelerator) (GObject *object,
GtkAccelGroup *accel_group, GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
@ -59,9 +59,10 @@ static guint accel_groups_key_id = 0;
static const gchar *accel_entries_key = "gtk-accel-entries"; static const gchar *accel_entries_key = "gtk-accel-entries";
static guint accel_entries_key_id = 0; static guint accel_entries_key_id = 0;
static GHashTable *accel_entry_hash_table = NULL; static GHashTable *accel_entry_hash_table = NULL;
static GMemChunk *accel_tables_mem_chunk = NULL;
static GMemChunk *accel_entries_mem_chunk = NULL; static GMemChunk *accel_entries_mem_chunk = NULL;
static GObjectClass *parent_class = NULL;
/* --- functions --- */ /* --- functions --- */
static gboolean static gboolean
@ -95,11 +96,59 @@ gtk_accel_entries_hash (gconstpointer a)
return h; return h;
} }
GtkAccelGroup* static void gtk_accel_group_class_init (GObjectClass *class);
gtk_accel_group_new (void) static void gtk_accel_group_init (GtkAccelGroup *accel_group);
GType
gtk_accel_group_get_type (void)
{
static GType object_type = 0;
if (!object_type)
{
static const GTypeInfo object_info =
{
sizeof (GtkAccelGroupClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gtk_accel_group_class_init,
NULL, /* clas_finalize */
NULL, /* class_data */
sizeof(GtkAccelGroup),
0, /* n_preallocs */
(GInstanceInitFunc) gtk_accel_group_init,
};
object_type = g_type_register_static (G_TYPE_OBJECT,
"GtkAccelGroup",
&object_info, 0);
}
return object_type;
}
static void
gtk_accel_group_finalize (GObject *object)
{
GtkAccelGroup *accel_group = GTK_ACCEL_GROUP(object);
if (accel_group == default_accel_group)
g_warning (G_STRLOC "default accel group should not be finalized");
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
gtk_accel_group_class_init (GObjectClass *class)
{
parent_class = g_type_class_ref (G_TYPE_OBJECT);
class->finalize = gtk_accel_group_finalize;
}
static void
gtk_accel_group_init (GtkAccelGroup *accel_group)
{ {
GtkAccelGroup *accel_group;
if (!accel_groups_key_id) if (!accel_groups_key_id)
{ {
accel_groups_key_id = g_quark_from_static_string (accel_groups_key); accel_groups_key_id = g_quark_from_static_string (accel_groups_key);
@ -108,18 +157,20 @@ gtk_accel_group_new (void)
accel_entry_hash_table = g_hash_table_new (gtk_accel_entries_hash, accel_entry_hash_table = g_hash_table_new (gtk_accel_entries_hash,
gtk_accel_entries_equal); gtk_accel_entries_equal);
accel_tables_mem_chunk = g_mem_chunk_create (GtkAccelGroup, 8, G_ALLOC_AND_FREE);
accel_entries_mem_chunk = g_mem_chunk_create (GtkAccelEntry, 64, G_ALLOC_AND_FREE); accel_entries_mem_chunk = g_mem_chunk_create (GtkAccelEntry, 64, G_ALLOC_AND_FREE);
} }
accel_group = g_chunk_new (GtkAccelGroup, accel_tables_mem_chunk);
accel_group->ref_count = 1;
accel_group->lock_count = 0; accel_group->lock_count = 0;
accel_group->modifier_mask = gtk_accelerator_get_default_mod_mask (); accel_group->modifier_mask = gtk_accelerator_get_default_mod_mask ();
accel_group->attach_objects = NULL; accel_group->attach_objects = NULL;
}
return accel_group;
GtkAccelGroup*
gtk_accel_group_new (void)
{
GtkAccelGroup *accel_group;
accel_group = (GtkAccelGroup *)g_object_new(GTK_TYPE_ACCEL_GROUP, NULL);
} }
GtkAccelGroup* GtkAccelGroup*
@ -134,36 +185,26 @@ gtk_accel_group_get_default (void)
GtkAccelGroup* GtkAccelGroup*
gtk_accel_group_ref (GtkAccelGroup *accel_group) gtk_accel_group_ref (GtkAccelGroup *accel_group)
{ {
g_return_val_if_fail (accel_group != NULL, NULL); g_return_val_if_fail (GTK_IS_ACCEL_GROUP(accel_group), NULL);
accel_group->ref_count += 1; return (GtkAccelGroup *)g_object_ref(accel_group);
return accel_group;
} }
void void
gtk_accel_group_unref (GtkAccelGroup *accel_group) gtk_accel_group_unref (GtkAccelGroup *accel_group)
{ {
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
g_return_if_fail (accel_group->ref_count > 0);
accel_group->ref_count -= 1; g_object_unref(accel_group);
if (accel_group->ref_count == 0)
{
g_return_if_fail (accel_group != default_accel_group);
g_return_if_fail (accel_group->attach_objects == NULL);
g_chunk_free (accel_group, accel_tables_mem_chunk);
}
} }
static void static void
gtk_accel_group_object_destroy (GtkObject *object) gtk_accel_group_object_destroy (GObject *object)
{ {
GSList *free_list, *slist; GSList *free_list, *slist;
free_list = gtk_object_get_data_by_id (object, accel_groups_key_id); free_list = g_object_get_qdata (object, accel_groups_key_id);
gtk_object_set_data_by_id (object, accel_groups_key_id, NULL); g_object_set_qdata (object, accel_groups_key_id, NULL);
for (slist = free_list; slist; slist = slist->next) for (slist = free_list; slist; slist = slist->next)
{ {
@ -171,58 +212,57 @@ gtk_accel_group_object_destroy (GtkObject *object)
accel_group = slist->data; accel_group = slist->data;
accel_group->attach_objects = g_slist_remove (accel_group->attach_objects, object); accel_group->attach_objects = g_slist_remove (accel_group->attach_objects, object);
gtk_accel_group_unref (accel_group); g_object_unref (accel_group);
} }
g_slist_free (free_list); g_slist_free (free_list);
} }
void void
gtk_accel_group_attach (GtkAccelGroup *accel_group, gtk_accel_group_attach (GtkAccelGroup *accel_group,
GtkObject *object) GObject *object)
{ {
GSList *slist; GSList *slist;
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (g_slist_find (accel_group->attach_objects, object) == NULL); g_return_if_fail (g_slist_find (accel_group->attach_objects, object) == NULL);
accel_group->attach_objects = g_slist_prepend (accel_group->attach_objects, object); accel_group->attach_objects = g_slist_prepend (accel_group->attach_objects, object);
gtk_accel_group_ref (accel_group); g_object_ref (accel_group);
slist = gtk_object_get_data_by_id (object, accel_groups_key_id); slist = g_object_get_qdata (object, accel_groups_key_id);
if (!slist) if (!slist)
gtk_signal_connect (object, g_object_weak_ref(object,
"destroy", (GWeakNotify)gtk_accel_group_object_destroy,
GTK_SIGNAL_FUNC (gtk_accel_group_object_destroy), object);
NULL);
slist = g_slist_prepend (slist, accel_group); slist = g_slist_prepend (slist, accel_group);
gtk_object_set_data_by_id (object, accel_groups_key_id, slist); g_object_set_qdata (object, accel_groups_key_id, slist);
} }
void void
gtk_accel_group_detach (GtkAccelGroup *accel_group, gtk_accel_group_detach (GtkAccelGroup *accel_group,
GtkObject *object) GObject *object)
{ {
GSList *slist; GSList *slist;
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (g_slist_find (accel_group->attach_objects, object) != NULL); g_return_if_fail (g_slist_find (accel_group->attach_objects, object) != NULL);
accel_group->attach_objects = g_slist_remove (accel_group->attach_objects, object); accel_group->attach_objects = g_slist_remove (accel_group->attach_objects, object);
gtk_accel_group_unref (accel_group); g_object_unref (accel_group);
slist = gtk_object_get_data_by_id (object, accel_groups_key_id); slist = g_object_get_qdata (object, accel_groups_key_id);
slist = g_slist_remove (slist, accel_group); slist = g_slist_remove (slist, accel_group);
if (!slist) if (!slist)
gtk_signal_disconnect_by_func (object, g_object_weak_unref(object,
GTK_SIGNAL_FUNC (gtk_accel_group_object_destroy), (GWeakNotify)gtk_accel_group_object_destroy,
NULL); object);
gtk_object_set_data_by_id (object, accel_groups_key_id, slist); g_object_set_qdata (object, accel_groups_key_id, slist);
} }
void void
gtk_accel_group_lock (GtkAccelGroup *accel_group) gtk_accel_group_lock (GtkAccelGroup *accel_group)
{ {
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
accel_group->lock_count += 1; accel_group->lock_count += 1;
} }
@ -230,7 +270,7 @@ gtk_accel_group_lock (GtkAccelGroup *accel_group)
void void
gtk_accel_group_unlock (GtkAccelGroup *accel_group) gtk_accel_group_unlock (GtkAccelGroup *accel_group)
{ {
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
if (accel_group->lock_count) if (accel_group->lock_count)
accel_group->lock_count -= 1; accel_group->lock_count -= 1;
@ -257,24 +297,24 @@ gtk_accel_group_activate (GtkAccelGroup *accel_group,
{ {
GtkAccelEntry *entry; GtkAccelEntry *entry;
g_return_val_if_fail (accel_group != NULL, FALSE); g_return_val_if_fail (GTK_IS_ACCEL_GROUP(accel_group), FALSE);
entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods); entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
if (entry && entry->signal_id && if (entry && entry->signal_id &&
(!GTK_IS_WIDGET (entry->object) || GTK_WIDGET_IS_SENSITIVE (entry->object))) (!GTK_IS_WIDGET (entry->object) || GTK_WIDGET_IS_SENSITIVE (entry->object)))
{ {
gtk_signal_emit (entry->object, entry->signal_id); g_signal_emit (entry->object, entry->signal_id, 0);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
gboolean gboolean
gtk_accel_groups_activate (GtkObject *object, gtk_accel_groups_activate (GObject *object,
guint accel_key, guint accel_key,
GdkModifierType accel_mods) GdkModifierType accel_mods)
{ {
g_return_val_if_fail (GTK_IS_OBJECT (object), FALSE); g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
if (gtk_accelerator_valid (accel_key, accel_mods)) if (gtk_accelerator_valid (accel_key, accel_mods))
{ {
@ -296,7 +336,7 @@ gtk_accel_group_lock_entry (GtkAccelGroup *accel_group,
{ {
GtkAccelEntry *entry; GtkAccelEntry *entry;
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods); entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
if (entry) if (entry)
@ -310,7 +350,7 @@ gtk_accel_group_unlock_entry (GtkAccelGroup *accel_group,
{ {
GtkAccelEntry *entry; GtkAccelEntry *entry;
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods); entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
if (entry) if (entry)
@ -322,7 +362,7 @@ gtk_accel_group_get_entry (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods) GdkModifierType accel_mods)
{ {
g_return_val_if_fail (accel_group != NULL, 0); g_return_val_if_fail (GTK_IS_ACCEL_GROUP(accel_group), 0);
return gtk_accel_group_lookup (accel_group, accel_key, accel_mods); return gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
} }
@ -332,7 +372,7 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
GtkAccelFlags accel_flags, GtkAccelFlags accel_flags,
GtkObject *object, GObject *object,
const gchar *accel_signal) const gchar *accel_signal)
{ {
guint accel_signal_id = 0; guint accel_signal_id = 0;
@ -345,23 +385,23 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
GSList *attach_objects; GSList *attach_objects;
GtkAccelEntry *entry; GtkAccelEntry *entry;
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (accel_signal != NULL); g_return_if_fail (accel_signal != NULL);
/* check for required signals in the objects branch /* check for required signals in the objects branch
*/ */
signal = (gchar*) accel_signal; signal = (gchar*) accel_signal;
accel_signal_id = gtk_signal_lookup (signal, GTK_OBJECT_TYPE (object)); accel_signal_id = g_signal_lookup (signal, G_OBJECT_TYPE (object));
if (accel_signal_id) if (accel_signal_id)
{ {
signal = "add-accelerator"; signal = "add-accelerator";
add_accelerator_signal_id = gtk_signal_lookup (signal, GTK_OBJECT_TYPE (object)); add_accelerator_signal_id = g_signal_lookup (signal, G_OBJECT_TYPE (object));
} }
if (add_accelerator_signal_id) if (add_accelerator_signal_id)
{ {
signal = "remove-accelerator"; signal = "remove-accelerator";
remove_accelerator_signal_id = gtk_signal_lookup (signal, GTK_OBJECT_TYPE (object)); remove_accelerator_signal_id = g_signal_lookup (signal, G_OBJECT_TYPE (object));
} }
if (!accel_signal_id || if (!accel_signal_id ||
!add_accelerator_signal_id || !add_accelerator_signal_id ||
@ -370,7 +410,7 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
g_warning ("gtk_accel_group_add(): could not find signal \"%s\"" g_warning ("gtk_accel_group_add(): could not find signal \"%s\""
"in the `%s' class ancestry", "in the `%s' class ancestry",
signal, signal,
gtk_type_name (GTK_OBJECT_TYPE (object))); g_type_name (G_OBJECT_TYPE (object)));
return; return;
} }
g_signal_query (accel_signal_id, &query); g_signal_query (accel_signal_id, &query);
@ -379,7 +419,7 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
g_warning ("gtk_accel_group_add(): signal \"%s\" in the `%s' class ancestry" g_warning ("gtk_accel_group_add(): signal \"%s\" in the `%s' class ancestry"
"cannot be used as accelerator signal %s", "cannot be used as accelerator signal %s",
accel_signal, accel_signal,
gtk_type_name (GTK_OBJECT_TYPE (object)), g_type_name (G_OBJECT_TYPE (object)),
query.n_params > 0 ? "(extraneous parameters are not supported)" : ""); query.n_params > 0 ? "(extraneous parameters are not supported)" : "");
return; return;
} }
@ -394,24 +434,24 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
/* make sure our structures stay alive /* make sure our structures stay alive
*/ */
gtk_accel_group_ref (accel_group); g_object_ref (accel_group);
gtk_object_ref (object); g_object_ref (object);
/* remove an existing entry /* remove an existing entry
*/ */
if (entry) if (entry)
gtk_signal_emit (entry->object, remove_accelerator_signal_id, g_signal_emit (entry->object, remove_accelerator_signal_id, 0,
accel_group, accel_group,
gdk_keyval_to_lower (accel_key), gdk_keyval_to_lower (accel_key),
accel_mods & accel_group->modifier_mask); accel_mods & accel_group->modifier_mask);
/* abort if the entry still exists /* abort if the entry still exists
*/ */
entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods); entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
if (entry) if (entry)
{ {
gtk_accel_group_unref (accel_group); g_object_unref (accel_group);
gtk_object_unref (object); g_object_unref (object);
return; return;
} }
@ -424,11 +464,11 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
{ {
GSList *tmp_groups; GSList *tmp_groups;
tmp_groups = gtk_object_get_data_by_id (attach_objects->data, accel_groups_key_id); tmp_groups = g_object_get_qdata (attach_objects->data, accel_groups_key_id);
while (tmp_groups) while (tmp_groups)
{ {
groups = g_slist_prepend (groups, tmp_groups->data); groups = g_slist_prepend (groups, tmp_groups->data);
gtk_accel_group_ref (tmp_groups->data); g_object_ref (tmp_groups->data);
tmp_groups = tmp_groups->next; tmp_groups = tmp_groups->next;
} }
} }
@ -444,12 +484,12 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
{ {
entry = gtk_accel_group_lookup (tmp_group, accel_key, accel_mods); entry = gtk_accel_group_lookup (tmp_group, accel_key, accel_mods);
if (entry && !(entry->accel_flags & GTK_ACCEL_LOCKED)) if (entry && !(entry->accel_flags & GTK_ACCEL_LOCKED))
gtk_signal_emit (entry->object, remove_accelerator_signal_id, g_signal_emit (entry->object, remove_accelerator_signal_id, 0,
tmp_group, tmp_group,
gdk_keyval_to_lower (accel_key), gdk_keyval_to_lower (accel_key),
accel_mods & tmp_group->modifier_mask); accel_mods & tmp_group->modifier_mask);
} }
gtk_accel_group_unref (tmp_group); g_object_unref (tmp_group);
} }
g_slist_free (groups); g_slist_free (groups);
@ -457,48 +497,42 @@ gtk_accel_group_add (GtkAccelGroup *accel_group,
*/ */
entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods); entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
if (!entry) if (!entry)
gtk_signal_emit (object, add_accelerator_signal_id, g_signal_emit (object, add_accelerator_signal_id, 0,
accel_signal_id, accel_signal_id,
accel_group, accel_group,
gdk_keyval_to_lower (accel_key), gdk_keyval_to_lower (accel_key),
accel_mods & accel_group->modifier_mask, accel_mods & accel_group->modifier_mask,
accel_flags & GTK_ACCEL_MASK); accel_flags & GTK_ACCEL_MASK);
/* and release the structures again /* and release the structures again
*/ */
gtk_accel_group_unref (accel_group); g_object_unref (accel_group);
gtk_object_unref (object); g_object_unref (object);
} }
static void static void
gtk_accel_group_delete_entries (GtkObject *object) gtk_accel_group_delete_entries (GSList *entries)
{ {
GSList *free_slist, *slist; GSList *slist;
gtk_signal_disconnect_by_func (object,
GTK_SIGNAL_FUNC (gtk_accel_group_delete_entries),
NULL);
/* we remove all entries of this object the hard /* we remove all entries of this object the hard
* way (i.e. without signal emission). * way (i.e. without signal emission).
*/ */
free_slist = gtk_object_get_data_by_id (object, accel_entries_key_id); for (slist = entries; slist; slist = slist->next)
gtk_object_set_data_by_id (object, accel_entries_key_id, NULL);
for (slist = free_slist; slist; slist = slist->next)
{ {
GtkAccelEntry *entry; GtkAccelEntry *entry;
entry = slist->data; entry = slist->data;
g_hash_table_remove (accel_entry_hash_table, entry); g_hash_table_remove (accel_entry_hash_table, entry);
gtk_accel_group_unref (entry->accel_group); g_object_unref (entry->accel_group);
g_chunk_free (entry, accel_entries_mem_chunk); g_chunk_free (entry, accel_entries_mem_chunk);
} }
g_slist_free (free_slist); g_slist_free (entries);
} }
void void
gtk_accel_group_handle_add (GtkObject *object, gtk_accel_group_handle_add (GObject *object,
guint accel_signal_id, guint accel_signal_id,
GtkAccelGroup *accel_group, GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
@ -507,8 +541,8 @@ gtk_accel_group_handle_add (GtkObject *object,
{ {
GtkAccelEntry *entry; GtkAccelEntry *entry;
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
g_return_if_fail (accel_signal_id > 0); g_return_if_fail (accel_signal_id > 0);
if (!gtk_accelerator_valid (accel_key, accel_mods)) if (!gtk_accelerator_valid (accel_key, accel_mods))
@ -519,7 +553,7 @@ gtk_accel_group_handle_add (GtkObject *object,
{ {
GSList *slist; GSList *slist;
gtk_accel_group_ref (accel_group); g_object_ref (accel_group);
entry = g_chunk_new (GtkAccelEntry, accel_entries_mem_chunk); entry = g_chunk_new (GtkAccelEntry, accel_entries_mem_chunk);
entry->accel_group = accel_group; entry->accel_group = accel_group;
@ -531,14 +565,10 @@ gtk_accel_group_handle_add (GtkObject *object,
g_hash_table_insert (accel_entry_hash_table, entry, entry); g_hash_table_insert (accel_entry_hash_table, entry, entry);
slist = gtk_object_get_data_by_id (object, accel_entries_key_id); slist = g_object_steal_qdata (object, accel_entries_key_id);
if (!slist)
gtk_signal_connect (object,
"destroy",
GTK_SIGNAL_FUNC (gtk_accel_group_delete_entries),
NULL);
slist = g_slist_prepend (slist, entry); slist = g_slist_prepend (slist, entry);
gtk_object_set_data_by_id (object, accel_entries_key_id, slist); g_object_set_qdata_full (object, accel_entries_key_id, slist,
(GDestroyNotify) gtk_accel_group_delete_entries);
} }
} }
@ -546,23 +576,23 @@ void
gtk_accel_group_remove (GtkAccelGroup *accel_group, gtk_accel_group_remove (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
GtkObject *object) GObject *object)
{ {
GtkAccelEntry *entry; GtkAccelEntry *entry;
guint remove_accelerator_signal_id = 0; guint remove_accelerator_signal_id = 0;
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
/* check for required signals in the objects branch /* check for required signals in the objects branch
*/ */
remove_accelerator_signal_id = gtk_signal_lookup ("remove-accelerator", GTK_OBJECT_TYPE (object)); remove_accelerator_signal_id = g_signal_lookup ("remove-accelerator", G_OBJECT_TYPE (object));
if (!remove_accelerator_signal_id) if (!remove_accelerator_signal_id)
{ {
g_warning ("gtk_accel_group_remove(): could not find signal \"%s\"" g_warning ("gtk_accel_group_remove(): could not find signal \"%s\""
"in the `%s' class ancestry", "in the `%s' class ancestry",
"remove-accelerator", "remove-accelerator",
gtk_type_name (GTK_OBJECT_TYPE (object))); g_type_name (G_OBJECT_TYPE (object)));
return; return;
} }
@ -582,32 +612,32 @@ gtk_accel_group_remove (GtkAccelGroup *accel_group,
/* make sure our structures stay alive /* make sure our structures stay alive
*/ */
gtk_accel_group_ref (accel_group); g_object_ref (accel_group);
gtk_object_ref (object); g_object_ref (object);
/* remove the entry /* remove the entry
*/ */
gtk_signal_emit (entry->object, remove_accelerator_signal_id, g_signal_emit (entry->object, remove_accelerator_signal_id, 0,
accel_group, accel_group,
gdk_keyval_to_lower (accel_key), gdk_keyval_to_lower (accel_key),
accel_mods & accel_group->modifier_mask); accel_mods & accel_group->modifier_mask);
/* and release the structures again /* and release the structures again
*/ */
gtk_accel_group_unref (accel_group); g_object_unref (accel_group);
gtk_object_unref (object); g_object_unref (object);
} }
void void
gtk_accel_group_handle_remove (GtkObject *object, gtk_accel_group_handle_remove (GObject *object,
GtkAccelGroup *accel_group, GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods) GdkModifierType accel_mods)
{ {
GtkAccelEntry *entry; GtkAccelEntry *entry;
g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (accel_group != NULL); g_return_if_fail (GTK_IS_ACCEL_GROUP(accel_group));
entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods); entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
if (entry) if (entry)
@ -618,17 +648,15 @@ gtk_accel_group_handle_remove (GtkObject *object,
g_hash_table_remove (accel_entry_hash_table, entry); g_hash_table_remove (accel_entry_hash_table, entry);
slist = gtk_object_get_data_by_id (object, accel_entries_key_id); slist = g_object_steal_qdata (object, accel_entries_key_id);
if (slist) if (slist)
{ {
slist = g_slist_remove (slist, entry); slist = g_slist_remove (slist, entry);
if (!slist) if (slist)
gtk_signal_disconnect_by_func (object, g_object_set_qdata_full (object, accel_entries_key_id, slist,
GTK_SIGNAL_FUNC (gtk_accel_group_delete_entries), (GDestroyNotify) gtk_accel_group_delete_entries);
NULL);
gtk_object_set_data_by_id (object, accel_entries_key_id, slist);
gtk_accel_group_unref (accel_group); g_object_unref (accel_group);
g_chunk_free (entry, accel_entries_mem_chunk); g_chunk_free (entry, accel_entries_mem_chunk);
} }
@ -641,57 +669,59 @@ gtk_accel_group_handle_remove (GtkObject *object,
} }
guint guint
gtk_accel_group_create_add (GtkType class_type, gtk_accel_group_create_add (GType class_type,
GtkSignalRunType signal_flags, GSignalFlags signal_flags,
guint handler_offset) guint handler_offset)
{ {
g_return_val_if_fail (GTK_TYPE_IS_OBJECT (class_type), 0); g_return_val_if_fail (G_TYPE_IS_OBJECT (class_type), 0);
return gtk_signal_new ("add-accelerator", return g_signal_new ("add-accelerator",
signal_flags, class_type,
class_type, signal_flags,
handler_offset, handler_offset,
gtk_marshal_VOID__UINT_BOXED_UINT_FLAGS_FLAGS, (GSignalAccumulator) NULL, NULL,
GTK_TYPE_NONE, 5, gtk_marshal_VOID__UINT_OBJECT_UINT_FLAGS_FLAGS,
GTK_TYPE_UINT, G_TYPE_NONE, 5,
GTK_TYPE_ACCEL_GROUP, G_TYPE_UINT,
GTK_TYPE_UINT, GTK_TYPE_ACCEL_GROUP,
GDK_TYPE_MODIFIER_TYPE, G_TYPE_UINT,
GTK_TYPE_ACCEL_FLAGS); GDK_TYPE_MODIFIER_TYPE,
GTK_TYPE_ACCEL_FLAGS);
} }
guint guint
gtk_accel_group_create_remove (GtkType class_type, gtk_accel_group_create_remove (GType class_type,
GtkSignalRunType signal_flags, GSignalFlags signal_flags,
guint handler_offset) guint handler_offset)
{ {
g_return_val_if_fail (GTK_TYPE_IS_OBJECT (class_type), 0); g_return_val_if_fail (G_TYPE_IS_OBJECT (class_type), 0);
return gtk_signal_new ("remove-accelerator", return g_signal_new ("remove-accelerator",
signal_flags, class_type,
class_type, signal_flags,
handler_offset, handler_offset,
gtk_marshal_VOID__BOXED_UINT_FLAGS, (GSignalAccumulator) NULL, NULL,
GTK_TYPE_NONE, 3, gtk_marshal_VOID__OBJECT_UINT_FLAGS,
GTK_TYPE_ACCEL_GROUP, G_TYPE_NONE, 3,
GTK_TYPE_UINT, GTK_TYPE_ACCEL_GROUP,
GDK_TYPE_MODIFIER_TYPE); G_TYPE_UINT,
GDK_TYPE_MODIFIER_TYPE);
} }
GSList* GSList*
gtk_accel_groups_from_object (GtkObject *object) gtk_accel_groups_from_object (GObject *object)
{ {
g_return_val_if_fail (GTK_IS_OBJECT (object), NULL); g_return_val_if_fail (G_IS_OBJECT (object), NULL);
return gtk_object_get_data_by_id (object, accel_groups_key_id); return g_object_get_qdata (object, accel_groups_key_id);
} }
GSList* GSList*
gtk_accel_group_entries_from_object (GtkObject *object) gtk_accel_group_entries_from_object (GObject *object)
{ {
g_return_val_if_fail (GTK_IS_OBJECT (object), NULL); g_return_val_if_fail (G_IS_OBJECT (object), NULL);
return gtk_object_get_data_by_id (object, accel_entries_key_id); return g_object_get_qdata (object, accel_entries_key_id);
} }
gboolean gboolean

58
gtk/gtkaccelgroup.h
View File

@ -36,13 +36,20 @@
#include <gtk/gtkenums.h> #include <gtk/gtkenums.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef struct _GtkAccelGroup GtkAccelGroup; #define GTK_TYPE_ACCEL_GROUP (gtk_accel_group_get_type ())
typedef struct _GtkAccelEntry GtkAccelEntry; #define GTK_ACCEL_GROUP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ACCEL_GROUP, GtkAccelGroup))
#define GTK_ACCEL_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupClass))
#define GTK_IS_ACCEL_GROUP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ACCEL_GROUP))
#define GTK_IS_ACCEL_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCEL_GROUP))
#define GTK_ACCEL_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupClass))
typedef struct _GtkAccelGroup GtkAccelGroup;
typedef struct _GtkAccelGroupClass GtkAccelGroupClass;
typedef struct _GtkAccelEntry GtkAccelEntry;
typedef enum typedef enum
{ {
@ -63,12 +70,17 @@ typedef enum
struct _GtkAccelGroup struct _GtkAccelGroup
{ {
guint ref_count; GObject parent;
guint lock_count; guint lock_count;
GdkModifierType modifier_mask; GdkModifierType modifier_mask;
GSList *attach_objects; GSList *attach_objects;
}; };
struct _GtkAccelGroupClass
{
GObjectClass parent_class;
};
struct _GtkAccelEntry struct _GtkAccelEntry
{ {
/* key portion /* key portion
@ -78,7 +90,7 @@ struct _GtkAccelEntry
GdkModifierType accelerator_mods; GdkModifierType accelerator_mods;
GtkAccelFlags accel_flags; GtkAccelFlags accel_flags;
GtkObject *object; GObject *object;
guint signal_id; guint signal_id;
}; };
@ -98,13 +110,14 @@ guint gtk_accelerator_get_default_mod_mask (void);
/* Accelerator Groups /* Accelerator Groups
*/ */
GType gtk_accel_group_get_type (void);
GtkAccelGroup* gtk_accel_group_new (void); GtkAccelGroup* gtk_accel_group_new (void);
GtkAccelGroup* gtk_accel_group_get_default (void); GtkAccelGroup* gtk_accel_group_get_default (void);
GtkAccelGroup* gtk_accel_group_ref (GtkAccelGroup *accel_group); GtkAccelGroup* gtk_accel_group_ref (GtkAccelGroup *accel_group);
void gtk_accel_group_unref (GtkAccelGroup *accel_group); void gtk_accel_group_unref (GtkAccelGroup *accel_group);
void gtk_accel_group_lock (GtkAccelGroup *accel_group); void gtk_accel_group_lock (GtkAccelGroup *accel_group);
void gtk_accel_group_unlock (GtkAccelGroup *accel_group); void gtk_accel_group_unlock (GtkAccelGroup *accel_group);
gboolean gtk_accel_groups_activate (GtkObject *object, gboolean gtk_accel_groups_activate (GObject *object,
guint accel_key, guint accel_key,
GdkModifierType accel_mods); GdkModifierType accel_mods);
@ -114,9 +127,9 @@ gboolean gtk_accel_group_activate (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods); GdkModifierType accel_mods);
void gtk_accel_group_attach (GtkAccelGroup *accel_group, void gtk_accel_group_attach (GtkAccelGroup *accel_group,
GtkObject *object); GObject *object);
void gtk_accel_group_detach (GtkAccelGroup *accel_group, void gtk_accel_group_detach (GtkAccelGroup *accel_group,
GtkObject *object); GObject *object);
/* Accelerator Group Entries (internal) /* Accelerator Group Entries (internal)
*/ */
@ -133,42 +146,39 @@ void gtk_accel_group_add (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
GtkAccelFlags accel_flags, GtkAccelFlags accel_flags,
GtkObject *object, GObject *object,
const gchar *accel_signal); const gchar *accel_signal);
void gtk_accel_group_remove (GtkAccelGroup *accel_group, void gtk_accel_group_remove (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
GtkObject *object); GObject *object);
/* Accelerator Signals (internal) /* Accelerator Signals (internal)
*/ */
void gtk_accel_group_handle_add (GtkObject *object, void gtk_accel_group_handle_add (GObject *object,
guint accel_signal_id, guint accel_signal_id,
GtkAccelGroup *accel_group, GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods, GdkModifierType accel_mods,
GtkAccelFlags accel_flags); GtkAccelFlags accel_flags);
void gtk_accel_group_handle_remove (GtkObject *object, void gtk_accel_group_handle_remove (GObject *object,
GtkAccelGroup *accel_group, GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
GdkModifierType accel_mods); GdkModifierType accel_mods);
guint gtk_accel_group_create_add (GtkType class_type, guint gtk_accel_group_create_add (GType class_type,
GtkSignalRunType signal_flags, GSignalFlags signal_flags,
guint handler_offset); guint handler_offset);
guint gtk_accel_group_create_remove (GtkType class_type, guint gtk_accel_group_create_remove (GType class_type,
GtkSignalRunType signal_flags, GSignalFlags signal_flags,
guint handler_offset); guint handler_offset);
/* Miscellaneous (internal) /* Miscellaneous (internal)
*/ */
GSList* gtk_accel_groups_from_object (GtkObject *object); GSList* gtk_accel_groups_from_object (GObject *object);
GSList* gtk_accel_group_entries_from_object (GtkObject *object); GSList* gtk_accel_group_entries_from_object (GObject *object);
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_ACCEL_GROUP_H__ */ #endif /* __GTK_ACCEL_GROUP_H__ */

87
gtk/gtkaccellabel.c
View File

@ -36,7 +36,7 @@
enum { enum {
PROP_0, PROP_0,
PROP_ACCEL_WIDGET PROP_ACCEL_OBJECT
}; };
static void gtk_accel_label_class_init (GtkAccelLabelClass *klass); static void gtk_accel_label_class_init (GtkAccelLabelClass *klass);
@ -110,11 +110,11 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
object_class->destroy = gtk_accel_label_destroy; object_class->destroy = gtk_accel_label_destroy;
g_object_class_install_property (G_OBJECT_CLASS(object_class), g_object_class_install_property (G_OBJECT_CLASS(object_class),
PROP_ACCEL_WIDGET, PROP_ACCEL_OBJECT,
g_param_spec_object ("accel_widget", g_param_spec_object ("accel_object",
_("Accelerator widget"), _("Accelerator object"),
_("The widget monitored by this accelerator label"), _("The object monitored by this accelerator label"),
GTK_TYPE_WIDGET, G_TYPE_OBJECT,
G_PARAM_READABLE | G_PARAM_WRITABLE)); G_PARAM_READABLE | G_PARAM_WRITABLE));
@ -143,8 +143,8 @@ gtk_accel_label_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_ACCEL_WIDGET: case PROP_ACCEL_OBJECT:
gtk_accel_label_set_accel_widget (accel_label, (GtkWidget*) g_value_get_object (value)); gtk_accel_label_set_accel_object (accel_label, g_value_get_object (value));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -163,8 +163,8 @@ static void gtk_accel_label_get_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_ACCEL_WIDGET: case PROP_ACCEL_OBJECT:
g_value_set_object (value, G_OBJECT (accel_label->accel_widget)); g_value_set_object (value, accel_label->accel_object);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -177,7 +177,7 @@ gtk_accel_label_init (GtkAccelLabel *accel_label)
{ {
accel_label->queue_id = 0; accel_label->queue_id = 0;
accel_label->accel_padding = 3; accel_label->accel_padding = 3;
accel_label->accel_widget = NULL; accel_label->accel_object = NULL;
accel_label->accel_string = NULL; accel_label->accel_string = NULL;
gtk_accel_label_refetch (accel_label); gtk_accel_label_refetch (accel_label);
@ -206,7 +206,7 @@ gtk_accel_label_destroy (GtkObject *object)
accel_label = GTK_ACCEL_LABEL (object); accel_label = GTK_ACCEL_LABEL (object);
gtk_accel_label_set_accel_widget (accel_label, NULL); gtk_accel_label_set_accel_object (accel_label, NULL);
GTK_OBJECT_CLASS (parent_class)->destroy (object); GTK_OBJECT_CLASS (parent_class)->destroy (object);
} }
@ -226,21 +226,21 @@ gtk_accel_label_finalize (GObject *object)
} }
/** /**
* gtk_accel_label_get_accel_widget: * gtk_accel_label_get_accel_object:
* @accel_label: a #GtkAccelLabel * @accel_label: a #GtkAccelLabel
* *
* Fetches the widget monitored by this accelerator label. See * Fetches the widget monitored by this accelerator label. See
* gtk_accel_label_set_accel_widget(). * gtk_accel_label_set_accel_object().
* *
* Return value: the widget monitored by the accelerator label, * Return value: the object monitored by the accelerator label,
* or %NULL. * or %NULL.
**/ **/
GtkWidget * GObject *
gtk_accel_label_get_accel_widget (GtkAccelLabel *accel_label) gtk_accel_label_get_accel_object (GtkAccelLabel *accel_label)
{ {
g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), NULL); g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), NULL);
return accel_label->accel_widget; return accel_label->accel_object;
} }
guint guint
@ -348,41 +348,42 @@ gtk_accel_label_queue_refetch (GtkAccelLabel *accel_label)
} }
void void
gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label, gtk_accel_label_set_accel_object (GtkAccelLabel *accel_label,
GtkWidget *accel_widget) GObject *accel_object)
{ {
g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label)); g_return_if_fail (GTK_IS_ACCEL_LABEL (accel_label));
if (accel_widget != NULL) g_return_if_fail (accel_object == NULL || G_IS_OBJECT (accel_object));
g_return_if_fail (GTK_IS_WIDGET (accel_widget));
if (accel_object != accel_label->accel_object)
if (accel_widget != accel_label->accel_widget)
{ {
if (accel_label->accel_widget) if (accel_label->accel_object)
{ {
gtk_signal_disconnect_by_func (GTK_OBJECT (accel_label->accel_widget), g_signal_handlers_disconnect_by_func (accel_label->accel_object,
GTK_SIGNAL_FUNC (gtk_accel_label_queue_refetch), G_CALLBACK (gtk_accel_label_queue_refetch),
accel_label); accel_object);
gtk_widget_unref (accel_label->accel_widget); g_object_unref (accel_label->accel_object);
} }
if (accel_label->queue_id) if (accel_label->queue_id)
{ {
gtk_idle_remove (accel_label->queue_id); gtk_idle_remove (accel_label->queue_id);
accel_label->queue_id = 0; accel_label->queue_id = 0;
} }
accel_label->accel_widget = accel_widget; accel_label->accel_object = accel_object;
if (accel_label->accel_widget) if (accel_label->accel_object)
{ {
gtk_widget_ref (accel_label->accel_widget); g_object_ref (accel_label->accel_object);
gtk_signal_connect_object_after (GTK_OBJECT (accel_label->accel_widget), g_signal_connect_object (accel_label->accel_object,
"add-accelerator", "add-accelerator",
GTK_SIGNAL_FUNC (gtk_accel_label_queue_refetch), G_CALLBACK (gtk_accel_label_queue_refetch),
GTK_OBJECT (accel_label)); accel_label,
gtk_signal_connect_object_after (GTK_OBJECT (accel_label->accel_widget), G_CONNECT_AFTER | G_CONNECT_SWAPPED);
"remove-accelerator", g_signal_connect_object (accel_label->accel_object,
GTK_SIGNAL_FUNC (gtk_accel_label_queue_refetch), "remove-accelerator",
GTK_OBJECT (accel_label)); G_CALLBACK (gtk_accel_label_queue_refetch),
accel_label,
G_CONNECT_AFTER | G_CONNECT_SWAPPED);
} }
g_object_notify (G_OBJECT (accel_label), "accel_widget"); g_object_notify (G_OBJECT (accel_label), "accel_object");
} }
} }
@ -410,12 +411,12 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
g_free (accel_label->accel_string); g_free (accel_label->accel_string);
accel_label->accel_string = NULL; accel_label->accel_string = NULL;
if (accel_label->accel_widget) if (accel_label->accel_object)
{ {
GtkAccelEntry *entry = NULL; GtkAccelEntry *entry = NULL;
GSList *slist; GSList *slist;
slist = gtk_accel_group_entries_from_object (GTK_OBJECT (accel_label->accel_widget)); slist = gtk_accel_group_entries_from_object (accel_label->accel_object);
for (; slist; slist = slist->next) for (; slist; slist = slist->next)
{ {
entry = slist->data; entry = slist->data;

16
gtk/gtkaccellabel.h
View File

@ -56,7 +56,7 @@ struct _GtkAccelLabel
guint queue_id; guint queue_id;
guint accel_padding; guint accel_padding;
GtkWidget *accel_widget; GObject *accel_object;
gchar *accel_string; gchar *accel_string;
guint16 accel_string_width; guint16 accel_string_width;
}; };
@ -77,13 +77,19 @@ struct _GtkAccelLabelClass
GtkType gtk_accel_label_get_type (void) G_GNUC_CONST; GtkType gtk_accel_label_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_accel_label_new (const gchar *string); GtkWidget *gtk_accel_label_new (const gchar *string);
GtkWidget* gtk_accel_label_get_accel_widget (GtkAccelLabel *accel_label); GObject *gtk_accel_label_get_accel_object (GtkAccelLabel *accel_label);
guint gtk_accel_label_get_accel_width (GtkAccelLabel *accel_label); guint gtk_accel_label_get_accel_width (GtkAccelLabel *accel_label);
void gtk_accel_label_set_accel_widget (GtkAccelLabel *accel_label, void gtk_accel_label_set_accel_object (GtkAccelLabel *accel_label,
GtkWidget *accel_widget); GObject *accel_object);
gboolean gtk_accel_label_refetch (GtkAccelLabel *accel_label); gboolean gtk_accel_label_refetch (GtkAccelLabel *accel_label);
#ifndef GTK_DISABLE_DEPRECATED
#define gtk_accel_label_get_accel_widget(accel_label) \
GTK_WIDGET(gtk_accel_label_get_accel_object(acel_label))
#define gtk_accel_label_set_accel_widget(accel_label, accel_widget) \
gtk_accel_label_set_accel_object((accel_label), G_OBJECT(accel_widget))
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }

4
gtk/gtkitemfactory.c
View File

@ -335,7 +335,7 @@ gtk_item_factory_propagate_accelerator (GtkItemFactoryItem *item,
{ {
GSList *work; GSList *work;
work = gtk_accel_group_entries_from_object (GTK_OBJECT (widget)); work = gtk_accel_group_entries_from_object (G_OBJECT (widget));
while (work) while (work)
{ {
GtkAccelEntry *ac_entry; GtkAccelEntry *ac_entry;
@ -1266,7 +1266,7 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory,
label = gtk_widget_new (GTK_TYPE_ACCEL_LABEL, label = gtk_widget_new (GTK_TYPE_ACCEL_LABEL,
"GtkWidget::visible", TRUE, "GtkWidget::visible", TRUE,
"GtkWidget::parent", widget, "GtkWidget::parent", widget,
"GtkAccelLabel::accel_widget", widget, "GtkAccelLabel::accel_object", widget,
"GtkMisc::xalign", 0.0, "GtkMisc::xalign", 0.0,
NULL); NULL);

4
gtk/gtkmarshal.list
View File

@ -70,6 +70,7 @@ VOID:OBJECT,INT,INT,BOXED,UINT,UINT
VOID:OBJECT,OBJECT VOID:OBJECT,OBJECT
VOID:OBJECT,STRING,STRING VOID:OBJECT,STRING,STRING
VOID:OBJECT,UINT VOID:OBJECT,UINT
VOID:OBJECT,UINT,FLAGS
VOID:POINTER VOID:POINTER
VOID:POINTER,INT VOID:POINTER,INT
VOID:POINTER,POINTER,POINTER VOID:POINTER,POINTER,POINTER
@ -77,7 +78,6 @@ VOID:POINTER,UINT
VOID:STRING VOID:STRING
VOID:STRING,INT,POINTER VOID:STRING,INT,POINTER
VOID:UINT,BOXED,UINT,FLAGS,FLAGS VOID:UINT,BOXED,UINT,FLAGS,FLAGS
VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
VOID:UINT,STRING VOID:UINT,STRING
VOID:VOID VOID:VOID

4
gtk/gtkmarshalers.list
View File

@ -70,6 +70,7 @@ VOID:OBJECT,INT,INT,BOXED,UINT,UINT
VOID:OBJECT,OBJECT VOID:OBJECT,OBJECT
VOID:OBJECT,STRING,STRING VOID:OBJECT,STRING,STRING
VOID:OBJECT,UINT VOID:OBJECT,UINT
VOID:OBJECT,UINT,FLAGS
VOID:POINTER VOID:POINTER
VOID:POINTER,INT VOID:POINTER,INT
VOID:POINTER,POINTER,POINTER VOID:POINTER,POINTER,POINTER
@ -77,7 +78,6 @@ VOID:POINTER,UINT
VOID:STRING VOID:STRING
VOID:STRING,INT,POINTER VOID:STRING,INT,POINTER
VOID:UINT,BOXED,UINT,FLAGS,FLAGS VOID:UINT,BOXED,UINT,FLAGS,FLAGS
VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
VOID:UINT,STRING VOID:UINT,STRING
VOID:VOID VOID:VOID

2
gtk/gtkmenu.c
View File

@ -1500,7 +1500,7 @@ gtk_menu_key_press (GtkWidget *widget,
{ {
GSList *slist; GSList *slist;
slist = gtk_accel_group_entries_from_object (GTK_OBJECT (menu_item)); slist = gtk_accel_group_entries_from_object (G_OBJECT (menu_item));
while (slist) while (slist)
{ {
GtkAccelEntry *ac_entry; GtkAccelEntry *ac_entry;

2
gtk/gtkmenushell.c
View File

@ -537,7 +537,7 @@ gtk_menu_shell_key_press (GtkWidget *widget,
event->state)) event->state))
return TRUE; return TRUE;
if (gtk_accel_groups_activate (GTK_OBJECT (widget), event->keyval, event->state)) if (gtk_accel_groups_activate (G_OBJECT (widget), event->keyval, event->state))
return TRUE; return TRUE;
return FALSE; return FALSE;

2
gtk/gtkplug.c
View File

@ -700,7 +700,7 @@ gtk_plug_accel_entries_changed (GtkWindow *window)
new_grabbed_keys = g_hash_table_new (grabbed_key_hash, grabbed_key_equal); new_grabbed_keys = g_hash_table_new (grabbed_key_hash, grabbed_key_equal);
accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (window)); accel_groups = gtk_accel_groups_from_object (G_OBJECT (window));
tmp_list = accel_groups; tmp_list = accel_groups;

8
gtk/gtkwidget.c
View File

@ -2454,7 +2454,7 @@ gtk_widget_add_accelerator (GtkWidget *widget,
accel_key, accel_key,
accel_mods, accel_mods,
accel_flags, accel_flags,
(GtkObject*) widget, (GObject*) widget,
accel_signal); accel_signal);
} }
@ -2470,7 +2470,7 @@ gtk_widget_remove_accelerator (GtkWidget *widget,
gtk_accel_group_remove (accel_group, gtk_accel_group_remove (accel_group,
accel_key, accel_key,
accel_mods, accel_mods,
(GtkObject*) widget); (GObject*) widget);
} }
void void
@ -2487,7 +2487,7 @@ gtk_widget_remove_accelerators (GtkWidget *widget,
signal_id = gtk_signal_lookup (accel_signal, GTK_OBJECT_TYPE (widget)); signal_id = gtk_signal_lookup (accel_signal, GTK_OBJECT_TYPE (widget));
g_return_if_fail (signal_id != 0); g_return_if_fail (signal_id != 0);
slist = gtk_accel_group_entries_from_object (GTK_OBJECT (widget)); slist = gtk_accel_group_entries_from_object (G_OBJECT (widget));
while (slist) while (slist)
{ {
GtkAccelEntry *ac_entry; GtkAccelEntry *ac_entry;
@ -2516,7 +2516,7 @@ gtk_widget_accelerator_signal (GtkWidget *widget,
ac_entry = gtk_accel_group_get_entry (accel_group, accel_key, accel_mods); ac_entry = gtk_accel_group_get_entry (accel_group, accel_key, accel_mods);
if (ac_entry && ac_entry->object == (GtkObject*) widget) if (ac_entry && ac_entry->object == (GObject*) widget)
return ac_entry->signal_id; return ac_entry->signal_id;
return 0; return 0;
} }

6
gtk/gtkwindow.c
View File

@ -967,7 +967,7 @@ gtk_window_add_accel_group (GtkWindow *window,
g_return_if_fail (GTK_IS_WINDOW (window)); g_return_if_fail (GTK_IS_WINDOW (window));
g_return_if_fail (accel_group != NULL); g_return_if_fail (accel_group != NULL);
gtk_accel_group_attach (accel_group, GTK_OBJECT (window)); gtk_accel_group_attach (accel_group, G_OBJECT (window));
} }
void void
@ -977,7 +977,7 @@ gtk_window_remove_accel_group (GtkWindow *window,
g_return_if_fail (GTK_IS_WINDOW (window)); g_return_if_fail (GTK_IS_WINDOW (window));
g_return_if_fail (accel_group != NULL); g_return_if_fail (accel_group != NULL);
gtk_accel_group_detach (accel_group, GTK_OBJECT (window)); gtk_accel_group_detach (accel_group, G_OBJECT (window));
} }
void void
@ -2343,7 +2343,7 @@ gtk_window_key_press_event (GtkWidget *widget,
event->state); event->state);
if (!handled) if (!handled)
handled = gtk_accel_groups_activate (GTK_OBJECT (window), event->keyval, event->state); handled = gtk_accel_groups_activate (G_OBJECT (window), event->keyval, event->state);
/* Chain up, invokes binding set */ /* Chain up, invokes binding set */
if (!handled && GTK_WIDGET_CLASS (parent_class)->key_press_event) if (!handled && GTK_WIDGET_CLASS (parent_class)->key_press_event)