diff --git a/ChangeLog b/ChangeLog index 851f5b4ffe..2ee7c2b2e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 11 14:31:30 2006 Tim Janik + + * docs/reference/gtk/gtk-sections.txt: + * gtk/gtkbindings.c: document gtk_binding_entry_skip(). + 2006-10-11 Tor Lillqvist * gtk/gtk.symbols: Remove gtk_combo_string_key, which is a static diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 3ef83d79e4..2e977da42b 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -5796,13 +5796,10 @@ gtk_binding_set_find gtk_bindings_activate gtk_bindings_activate_event gtk_binding_set_activate -gtk_binding_entry_add -gtk_binding_entry_clear gtk_binding_entry_add_signal -gtk_binding_set_add_path +gtk_binding_entry_skip gtk_binding_entry_remove -gtk_binding_entry_add_signall -gtk_binding_parse_binding +gtk_binding_set_add_path
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 5a8e625b8c..49d4376315 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1858,6 +1858,40 @@ get an array of #GtkArgs that this object accepts. @n_args_p: the number of arguments this object accepts. @Returns: the array of arguments (or NULL on error). + + +Deprecated. + + + + + + + + +@binding_set: +@keyval: +@modifiers: +@signal_name: +@binding_args: + + + + + + +@binding_set: +@keyval: +@modifiers: + + + + + + +@scanner: +@Returns: + This is an internally used function and should never be called from an diff --git a/docs/reference/gtk/tmpl/gtkbindings.sgml b/docs/reference/gtk/tmpl/gtkbindings.sgml index a5d9447df1..b282cfff06 100644 --- a/docs/reference/gtk/tmpl/gtkbindings.sgml +++ b/docs/reference/gtk/tmpl/gtkbindings.sgml @@ -141,8 +141,9 @@ Each key binding element of a binding sets binding list is represented by a #Gtk @binding_set: binding set this entry belongs to @destroyed: implementation detail @in_emission: implementation detail +@marks_unbound: @set_next: linked list of entries maintained by binding set -@hash_next: implementation detail +@hash_next: implementation detail @signals: action signals of this entry @@ -164,6 +165,43 @@ key binding signal emission as stored in #GtkBindingSignal. @arg_type: implementation detail + + + + + +@set_name: +@Returns: + + + + + + + +@object_class: +@Returns: + + + + + + + +@set_name: +@Returns: + + + + + + + +@object: +@keyval: +@modifiers: +@Returns: + @@ -175,7 +213,59 @@ key binding signal emission as stored in #GtkBindingSignal. @Returns: - + -Deprecated. + + +@binding_set: +@keyval: +@modifiers: +@object: +@Returns: + + + + + + + +@binding_set: +@keyval: +@modifiers: +@signal_name: +@n_args: +@Varargs: + + + + + + + +@binding_set: +@keyval: +@modifiers: + + + + + + + +@binding_set: +@keyval: +@modifiers: + + + + + + + +@binding_set: +@path_type: +@path_pattern: +@priority: + + diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index 24009cd509..0cfd2710a6 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -814,6 +814,7 @@ specific portions of a RC file. @GTK_RC_TOKEN_LTR: @GTK_RC_TOKEN_RTL: @GTK_RC_TOKEN_COLOR: +@GTK_RC_TOKEN_UNBIND: @GTK_RC_TOKEN_LAST: diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index c8f494790b..838cefffac 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -722,6 +722,10 @@ gtk_binding_entry_clear (GtkBindingSet *binding_set, * @modifiers: key modifier of binding to skip * * Since: 2.12 + * + * Install a binding on @binding_set which causes key lookups + * to be aborted, to prevent bindings from lower priority sets + * to be activated. **/ void gtk_binding_entry_skip (GtkBindingSet *binding_set,