Replace GTK_NO_CHECK_CASTS by G_DISABLE_CAST_CHECKS.

* docs/debugging.txt: Replace GTK_NO_CHECK_CASTS by
        G_DISABLE_CAST_CHECKS.

        * gtk/gtkaccelgroup.c (gtk_accel_group_from_accel_closure,
        gtk_accel_group_query, gtk_accel_group_find,
        gtk_accel_groups_from_object): Document.

        * gtk/gtkaccellabel.c (gtk_accel_label_set_accel_closure): Document.

        * gtk/tmpl/gtktypeutils.sgml: Replace GTK_NO_CHECK_CASTS by
        G_DISABLE_CAST_CHECKS, fix some markup and add stuff.

        * gtk/tmpl/gtkaccelgroup.sgml, gtk/tmpl/gtkwidget.sgml: Additions.

        * gtk/gtk-sections.txt: Make gtk_accel_group_get_type private.
This commit is contained in:
Matthias Clasen 2002-01-07 00:13:33 +00:00
parent ef121a06ff
commit ed29c8ddd8
15 changed files with 167 additions and 37 deletions

View File

@ -1,3 +1,14 @@
2002-01-06 Matthias Clasen <matthiasc@poet.de>
* docs/debugging.txt: Replace GTK_NO_CHECK_CASTS by
G_DISABLE_CAST_CHECKS.
* gtk/gtkaccelgroup.c (gtk_accel_group_from_accel_closure,
gtk_accel_group_query, gtk_accel_group_find,
gtk_accel_groups_from_object): Document.
* gtk/gtkaccellabel.c (gtk_accel_label_set_accel_closure): Document.
2002-01-04 Hans Breuer <hans@breuer.org> 2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c : * gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :

View File

@ -1,3 +1,14 @@
2002-01-06 Matthias Clasen <matthiasc@poet.de>
* docs/debugging.txt: Replace GTK_NO_CHECK_CASTS by
G_DISABLE_CAST_CHECKS.
* gtk/gtkaccelgroup.c (gtk_accel_group_from_accel_closure,
gtk_accel_group_query, gtk_accel_group_find,
gtk_accel_groups_from_object): Document.
* gtk/gtkaccellabel.c (gtk_accel_label_set_accel_closure): Document.
2002-01-04 Hans Breuer <hans@breuer.org> 2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c : * gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :

View File

@ -1,3 +1,14 @@
2002-01-06 Matthias Clasen <matthiasc@poet.de>
* docs/debugging.txt: Replace GTK_NO_CHECK_CASTS by
G_DISABLE_CAST_CHECKS.
* gtk/gtkaccelgroup.c (gtk_accel_group_from_accel_closure,
gtk_accel_group_query, gtk_accel_group_find,
gtk_accel_groups_from_object): Document.
* gtk/gtkaccellabel.c (gtk_accel_label_set_accel_closure): Document.
2002-01-04 Hans Breuer <hans@breuer.org> 2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c : * gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :

View File

@ -1,3 +1,14 @@
2002-01-06 Matthias Clasen <matthiasc@poet.de>
* docs/debugging.txt: Replace GTK_NO_CHECK_CASTS by
G_DISABLE_CAST_CHECKS.
* gtk/gtkaccelgroup.c (gtk_accel_group_from_accel_closure,
gtk_accel_group_query, gtk_accel_group_find,
gtk_accel_groups_from_object): Document.
* gtk/gtkaccellabel.c (gtk_accel_label_set_accel_closure): Document.
2002-01-04 Hans Breuer <hans@breuer.org> 2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c : * gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :

View File

@ -1,3 +1,14 @@
2002-01-06 Matthias Clasen <matthiasc@poet.de>
* docs/debugging.txt: Replace GTK_NO_CHECK_CASTS by
G_DISABLE_CAST_CHECKS.
* gtk/gtkaccelgroup.c (gtk_accel_group_from_accel_closure,
gtk_accel_group_query, gtk_accel_group_find,
gtk_accel_groups_from_object): Document.
* gtk/gtkaccellabel.c (gtk_accel_label_set_accel_closure): Document.
2002-01-04 Hans Breuer <hans@breuer.org> 2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c : * gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :

View File

@ -1,3 +1,14 @@
2002-01-06 Matthias Clasen <matthiasc@poet.de>
* docs/debugging.txt: Replace GTK_NO_CHECK_CASTS by
G_DISABLE_CAST_CHECKS.
* gtk/gtkaccelgroup.c (gtk_accel_group_from_accel_closure,
gtk_accel_group_query, gtk_accel_group_find,
gtk_accel_groups_from_object): Document.
* gtk/gtkaccellabel.c (gtk_accel_label_set_accel_closure): Document.
2002-01-04 Hans Breuer <hans@breuer.org> 2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c : * gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :

View File

@ -1,3 +1,14 @@
2002-01-06 Matthias Clasen <matthiasc@poet.de>
* docs/debugging.txt: Replace GTK_NO_CHECK_CASTS by
G_DISABLE_CAST_CHECKS.
* gtk/gtkaccelgroup.c (gtk_accel_group_from_accel_closure,
gtk_accel_group_query, gtk_accel_group_find,
gtk_accel_groups_from_object): Document.
* gtk/gtkaccellabel.c (gtk_accel_label_set_accel_closure): Document.
2002-01-04 Hans Breuer <hans@breuer.org> 2002-01-04 Hans Breuer <hans@breuer.org>
* gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c : * gdk/gdkdraw.c gdk/gdkpixbuf-drawable.c :

View File

@ -19,7 +19,7 @@ G_DISABLE_ASSERT
G_DISABLE_CHECKS G_DISABLE_CHECKS
If set, disable the g_return_if_fail and g_return_val_if_fail macros If set, disable the g_return_if_fail and g_return_val_if_fail macros
GTK_NO_CHECK_CASTS G_DISABLE_CAST_CHECKS
If set, don't check casts between different object types If set, don't check casts between different object types
@ -28,7 +28,7 @@ time by the --enable-debug option.
--enable-debug=minimum [default] --enable-debug=minimum [default]
Enable only inexpensive sanity checking Enable only inexpensive sanity checking
sets GTK_NO_CHECK_CASTS sets G_DISABLE_CAST_CHECKS
--enable-debug=yes --enable-debug=yes
Enable all debugging support Enable all debugging support
@ -36,7 +36,7 @@ time by the --enable-debug option.
--enable-debug=no (or --disable-debug) --enable-debug=no (or --disable-debug)
Disable all debugging support (fastest) Disable all debugging support (fastest)
sets G_DISABLE_ASSERT, G_DISABLE_CHECKS, and GTK_NO_CHECK_CASTS sets G_DISABLE_ASSERT, G_DISABLE_CHECKS, and G_DISABLE_CAST_CHECKS
Note that !G_DISABLE_CHECKS and --enable-debug=no are to be considered Note that !G_DISABLE_CHECKS and --enable-debug=no are to be considered
not only fast, but dangerous as they tend to destabilize even mostly not only fast, but dangerous as they tend to destabilize even mostly
@ -103,4 +103,4 @@ and the object system.
- 2001-08-13 Matthias Clasen - 2001-08-13 Matthias Clasen
- 98/02/19 Owen Taylor - 98/02/19 Owen Taylor

View File

@ -1,3 +1,12 @@
2002-01-06 Matthias Clasen <matthiasc@poet.de>
* gtk/tmpl/gtktypeutils.sgml: Replace GTK_NO_CHECK_CASTS by
G_DISABLE_CAST_CHECKS, fix some markup and add stuff.
* gtk/tmpl/gtkaccelgroup.sgml, gtk/tmpl/gtkwidget.sgml: Additions.
* gtk/gtk-sections.txt: Make gtk_accel_group_get_type private.
2002-01-06 Havoc Pennington <hp@pobox.com> 2002-01-06 Havoc Pennington <hp@pobox.com>
* gtk/question_index.sgml: a few more questions I thought of * gtk/question_index.sgml: a few more questions I thought of

View File

@ -5,7 +5,6 @@
<FILE>gtkaccelgroup</FILE> <FILE>gtkaccelgroup</FILE>
<TITLE>Keyboard Accelerators</TITLE> <TITLE>Keyboard Accelerators</TITLE>
GtkAccelGroup GtkAccelGroup
gtk_accel_group_get_type
gtk_accel_group_new gtk_accel_group_new
gtk_accel_group_ref gtk_accel_group_ref
gtk_accel_group_unref gtk_accel_group_unref
@ -27,8 +26,11 @@ gtk_accelerator_parse
gtk_accelerator_name gtk_accelerator_name
gtk_accelerator_set_default_mod_mask gtk_accelerator_set_default_mod_mask
gtk_accelerator_get_default_mod_mask gtk_accelerator_get_default_mod_mask
<SUBSECTION Private> <SUBSECTION Private>
GtkAccelGroupEntry GtkAccelGroupEntry
gtk_accel_group_get_type
<SUBSECTION Standard> <SUBSECTION Standard>
GtkAccelGroupClass GtkAccelGroupClass
GTK_TYPE_ACCEL_GROUP GTK_TYPE_ACCEL_GROUP

View File

@ -56,22 +56,17 @@ An object representing and maintaining a group of accelerators.
<!-- ##### MACRO gtk_accel_group_ref ##### --> <!-- ##### MACRO gtk_accel_group_ref ##### -->
<para> <para>
Deprecated equivalent of g_object_ref().
</para> </para>
@Returns: @Returns:
<!-- # Unused Parameters # -->
@accel_group:
<!-- ##### MACRO gtk_accel_group_unref ##### --> <!-- ##### MACRO gtk_accel_group_unref ##### -->
<para> <para>
Deprecated equivalent of g_object_unref().
</para> </para>
<!-- # Unused Parameters # -->
@accel_group:
<!-- ##### FUNCTION gtk_accel_group_connect ##### --> <!-- ##### FUNCTION gtk_accel_group_connect ##### -->
<para> <para>

View File

@ -6,7 +6,7 @@ Handle run-time type creation.
<!-- ##### SECTION Long_Description ##### --> <!-- ##### SECTION Long_Description ##### -->
<para> <para>
Gtk's type system is extensible. Because of that, types have to be The GTK+ type system is extensible. Because of that, types have to be
managed at runtime. managed at runtime.
</para> </para>
@ -17,7 +17,7 @@ managed at runtime.
<!-- ##### TYPEDEF GtkType ##### --> <!-- ##### TYPEDEF GtkType ##### -->
<para> <para>
@GtkType is unique integer identifying the type. The guts of the #GtkType is unique integer identifying the type. The guts of the
information about the type is held in a private struct named information about the type is held in a private struct named
#GtkTypeNode. #GtkTypeNode.
</para> </para>
@ -97,27 +97,27 @@ Use in place of <function>offsetof()</function>, which is used if it exists.
<!-- ##### MACRO GTK_CHECK_CAST ##### --> <!-- ##### MACRO GTK_CHECK_CAST ##### -->
<para> <para>
Casts the object in @tobj into @cast. If GTK_NO_CHECK_CASTS is Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is
defined, just cast it. Otherwise, check to see if we can cast @tobj defined, just cast it. Otherwise, check to see if we can cast @tobj
into a @cast. into a @cast.
</para> </para>
<!-- # Unused Parameters # --> <!-- # Unused Parameters # -->
@tobj: a pointer to a GtkObject. @tobj: a #GtkObject.
@cast_type: a Gtk type. @cast_type: a GTK+ type.
@cast: a C type @cast: a C type
<!-- ##### MACRO GTK_CHECK_CLASS_CAST ##### --> <!-- ##### MACRO GTK_CHECK_CLASS_CAST ##### -->
<para> <para>
Casts the object in @tobj into @cast. If GTK_NO_CHECK_CASTS is Casts the object in @tobj into @cast. If %G_DISABLE_CAST_CHECKS is
defined, just cast it. Otherwise, check to see if we can cast @tobj defined, just cast it. Otherwise, check to see if we can cast @tobj
into a @cast. into a @cast.
</para> </para>
<!-- # Unused Parameters # --> <!-- # Unused Parameters # -->
@tclass: a pointer to a GtkClassInitFunc @tclass: a #GtkClassInitFunc
@cast_type: a Gtk type. @cast_type: a GTK+ type.
@cast: a C type @cast: a C type
@ -127,7 +127,7 @@ Determines whether @type_object is a type of @otype.
</para> </para>
<!-- # Unused Parameters # --> <!-- # Unused Parameters # -->
@type_object: A GtkTypeObject object. @type_object: a #GtkTypeObject object
@otype: @otype:
@ -137,20 +137,21 @@ Determines whether @type_class is a type of @otype.
</para> </para>
<!-- # Unused Parameters # --> <!-- # Unused Parameters # -->
@type_class: A GtkTypeClass class. @type_class: a #GtkTypeClass class.
@otype: @otype:
<!-- ##### MACRO GTK_CHECK_GET_CLASS ##### --> <!-- ##### MACRO GTK_CHECK_GET_CLASS ##### -->
<para> <para>
Gets the class of @tobj.
</para> </para>
@tobj: a #GtkObject.
<!-- ##### MACRO GTK_FUNDAMENTAL_TYPE ##### --> <!-- ##### MACRO GTK_FUNDAMENTAL_TYPE ##### -->
<para> <para>
Converts a Gtk type into a fundamental type. Converts a GTK+ type into a fundamental type.
</para> </para>
<!-- # Unused Parameters # --> <!-- # Unused Parameters # -->
@ -189,8 +190,8 @@ Defines a function pointer.
Defines a function pointer. Defines a function pointer.
</para> </para>
@data: gpointer @data: #gpointer
@Returns: gint @Returns: #gint
<!-- ##### USER_FUNCTION GtkDestroyNotify ##### --> <!-- ##### USER_FUNCTION GtkDestroyNotify ##### -->
@ -198,7 +199,7 @@ Defines a function pointer.
Defines a function pointer. Defines a function pointer.
</para> </para>
@data: gpointer @data: #gpointer
<!-- ##### USER_FUNCTION GtkCallbackMarshal ##### --> <!-- ##### USER_FUNCTION GtkCallbackMarshal ##### -->
@ -206,10 +207,10 @@ Defines a function pointer.
Defines a function pointer. Defines a function pointer.
</para> </para>
@object: GtkObject* @object: #GtkObject*
@data: gpointer @data: #gpointer
@n_args: guint @n_args: #guint
@args: GtkArg* @args: #GtkArg*
<!-- ##### TYPEDEF GtkSignalMarshaller ##### --> <!-- ##### TYPEDEF GtkSignalMarshaller ##### -->
@ -504,7 +505,7 @@ function for an instance of the object. @reserved_1 is used for
<!-- ##### TYPEDEF GtkTypeClass ##### --> <!-- ##### TYPEDEF GtkTypeClass ##### -->
<para> <para>
The base structure for a Gtk type. Every type inherits this as a base structure. The base structure for a GTK+ type. Every type inherits this as a base structure.
</para> </para>
@ -523,7 +524,7 @@ nickname.
<!-- ##### FUNCTION gtk_type_init ##### --> <!-- ##### FUNCTION gtk_type_init ##### -->
<para> <para>
Initializes the data structures associated with Gtk types. Initializes the data structures associated with GTK+ types.
</para> </para>
@debug_flags: @debug_flags:
@ -555,7 +556,7 @@ Returns a pointer to the name of a type, or %NULL if it has none.
Gets the internal representation of a type, given its name. Gets the internal representation of a type, given its name.
</para> </para>
@name: the name of a Gtk type @name: the name of a GTK+ type
@Returns: a #GtkType. @Returns: a #GtkType.

View File

@ -88,10 +88,10 @@ Tells about certain properties of the widget.
<!-- ##### MACRO GTK_WIDGET_TYPE ##### --> <!-- ##### MACRO GTK_WIDGET_TYPE ##### -->
<para> <para>
Gets the type of a widget.
</para> </para>
@wid: @wid: a #GtkWidget.
<!-- ##### MACRO GTK_WIDGET_STATE ##### --> <!-- ##### MACRO GTK_WIDGET_STATE ##### -->

View File

@ -241,6 +241,13 @@ _gtk_accel_group_detach (GtkAccelGroup *accel_group,
g_object_unref (accel_group); g_object_unref (accel_group);
} }
/**
* gtk_accel_groups_from_object:
* @object: a #GObject, usually a #GtkWindow
* @returns: a list of all accel groups which are attached to @object
*
* Gets a list of all accel groups which are attached to @object.
*/
GSList* GSList*
gtk_accel_groups_from_object (GObject *object) gtk_accel_groups_from_object (GObject *object)
{ {
@ -249,6 +256,18 @@ gtk_accel_groups_from_object (GObject *object)
return g_object_get_qdata (object, quark_acceleratable_groups); return g_object_get_qdata (object, quark_acceleratable_groups);
} }
/**
* gtk_accel_group_find:
* @accel_group: a #GtkAccelGroup
* @find_func: a function to filter the entries of @accel_group with
* @data: data to pass to @find_func
* @returns: the key of the first entry passing @find_func. The key is
* owned by GTK+ and must not be freed.
*
* Finds the first entry in an accelerator group for which @find_func
* returns %TRUE and returns its #GtkAccelKey.
*
*/
GtkAccelKey* GtkAccelKey*
gtk_accel_group_find (GtkAccelGroup *accel_group, gtk_accel_group_find (GtkAccelGroup *accel_group,
gboolean (*find_func) (GtkAccelKey *key, gboolean (*find_func) (GtkAccelKey *key,
@ -651,6 +670,17 @@ _gtk_accel_group_reconnect (GtkAccelGroup *accel_group,
g_object_unref (accel_group); g_object_unref (accel_group);
} }
/**
* gtk_accel_group_query:
* @accel_group: the accelerator group to query
* @accel_key: key value of the accelerator
* @accel_mods: modifier combination of the accelerator
* @n_entries: location to return the number of entries found, or %NULL
* @returns: an array of @n_entries #GtkAccelGroupEntry elements, or %NULL. The array is owned by GTK+ and must not be freed.
*
* Queries an accelerator group for all entries matching @accel_key and
* @accel_mods.
*/
GtkAccelGroupEntry* GtkAccelGroupEntry*
gtk_accel_group_query (GtkAccelGroup *accel_group, gtk_accel_group_query (GtkAccelGroup *accel_group,
guint accel_key, guint accel_key,
@ -670,6 +700,14 @@ gtk_accel_group_query (GtkAccelGroup *accel_group,
return entries; return entries;
} }
/**
* gtk_accel_group_from_accel_closure:
* @closure: a #GClosure
* @returns: the #GtkAccelGroup to which @closure is connected, or %NULL.
*
* Finds the #GtkAccelGroup to which @closure is connected;
* see gtk_accel_group_connect().
*/
GtkAccelGroup* GtkAccelGroup*
gtk_accel_group_from_accel_closure (GClosure *closure) gtk_accel_group_from_accel_closure (GClosure *closure)
{ {
@ -711,7 +749,7 @@ _gtk_accel_group_activate (GtkAccelGroup *accel_group,
/** /**
* gtk_accel_groups_activate: * gtk_accel_groups_activate:
* @object: the #Gobject, usually a #GtkWindow, on which * @object: the #GObject, usually a #GtkWindow, on which
* to activate the accelerator. * to activate the accelerator.
* @accel_key: accelerator keyval from a key event * @accel_key: accelerator keyval from a key event
* @accel_mods: keyboard state mask from a key event * @accel_mods: keyboard state mask from a key event

View File

@ -428,6 +428,14 @@ check_accel_changed (GtkAccelGroup *accel_group,
gtk_accel_label_queue_refetch (accel_label); gtk_accel_label_queue_refetch (accel_label);
} }
/**
* gtk_accel_label_set_accel_closure:
* @accel_label: a #GtkAccelLabel
* @accel_closure: the closure to monitor for accelerator changes.
*
* Sets the closure to be monitored by this accelerator label. The closure
* must be connected to an accelerator group; see gtk_accel_group_connect().
**/
void void
gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label, gtk_accel_label_set_accel_closure (GtkAccelLabel *accel_label,
GClosure *accel_closure) GClosure *accel_closure)