diff options
| author | Michael Natterer <mitch@imendio.com> | 2006-10-05 14:48:57 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2006-10-05 14:48:57 +0000 |
| commit | a3b67535dfb1bc35b9e488282df81fadea81aa58 (patch) | |
| tree | 018ec49e10daca32f068650e321f9ec0f47400e6 /gtk/gtkrc.c | |
| parent | 82448e172b5e0c42fdda20ad32e9700bac6d5fc3 (diff) | |
| download | gtk+-a3b67535dfb1bc35b9e488282df81fadea81aa58.tar.gz | |
added new scanner token "unbind" which gets rid of a key binding (in fact,
2006-10-05 Michael Natterer <mitch@imendio.com>
* gtk/gtkrc.[ch]: added new scanner token "unbind" which gets
rid of a key binding (in fact, it only lets it appear unbound).
* gtk/gtkbindings.[ch] (struct GtkBindingEntry): added
"guint marks_unbound : 1"
(gtk_binding_entry_skip): new API which marks the entry as unbound.
Changed code so it returns FALSE when "marks_unbound == TRUE" is
encountered while activating bindings, effectively letting the
binding appear unbound (regardless of still existing bindings in
lower binding priority levels). Fixes bug #358329.
(gtk_binding_entry_add)
(gtk_binding_entry_clear)
(gtk_binding_entry_add_signall)
(gtk_binding_parse_binding): deprected these functions.
(_gtk_binding_parse_binding)
(_gtk_binding_entry_add_signall): new internal API.
* gtk/gtk.symbols: changed accordingly.
Diffstat (limited to 'gtk/gtkrc.c')
| -rw-r--r-- | gtk/gtkrc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index a570d62f31..c5bc23cf14 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -319,7 +319,8 @@ static const gchar symbol_names[] = "im_module_file\0" "LTR\0" "RTL\0" - "color\0"; + "color\0" + "unbind\0"; static const struct { @@ -361,7 +362,8 @@ static const struct { 245, GTK_RC_TOKEN_IM_MODULE_FILE }, { 260, GTK_RC_TOKEN_LTR }, { 264, GTK_RC_TOKEN_RTL }, - { 268, GTK_RC_TOKEN_COLOR } + { 268, GTK_RC_TOKEN_COLOR }, + { 274, GTK_RC_TOKEN_UNBIND } }; static GHashTable *realized_style_ht = NULL; @@ -2858,7 +2860,7 @@ gtk_rc_parse_statement (GtkRcContext *context, return gtk_rc_parse_style (context, scanner); case GTK_RC_TOKEN_BINDING: - return gtk_binding_parse_binding (scanner); + return _gtk_binding_parse_binding (scanner); case GTK_RC_TOKEN_PIXMAP_PATH: return gtk_rc_parse_pixmap_path (context, scanner); |