add _gtk_tree_view_column_get_editable_cell and

[~andy/gtk] / gtk / gtkbindings.h

diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index b9e173203d3fa53e5ad4df6ca30de1ff3c251614..a481f23df694c3583fdced745429e0d78848e41d 100644 (file)
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -5,20 +5,28 @@
  * Copyright (C) 1998 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser 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.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #ifndef __GTK_BINDINGS_H__
 #define __GTK_BINDINGS_H__
 
@@ -30,37 +38,9 @@
 
 #ifdef __cplusplus
 extern "C" {
-#pragma }
 #endif /* __cplusplus */
 
 
-/* Pattern matching
- */
-typedef struct _GtkPatternSpec GtkPatternSpec;
-
-struct _GtkPatternSpec
-{
-  GtkMatchType  match_type;
-  guint                 pattern_length;
-  gchar                *pattern;
-  gchar                *pattern_reversed;
-  gpointer      user_data;
-  guint                 seq_id;
-};
-
-void    gtk_pattern_spec_init      (GtkPatternSpec      *pspec,
-                                    const gchar         *pattern);
-void    gtk_pattern_spec_free_segs (GtkPatternSpec      *pspec);
-gboolean gtk_pattern_match         (GtkPatternSpec      *pspec,
-                                    guint                string_length,
-                                    const gchar         *string,
-                                    const gchar         *string_reversed);
-gboolean gtk_pattern_match_string   (GtkPatternSpec     *pspec,
-                                    const gchar         *string);
-gboolean gtk_pattern_match_simple   (const gchar        *pattern,
-                                    const gchar         *string);
-
-
 /* Binding sets
  */
 
@@ -78,6 +58,7 @@ struct _GtkBindingSet
   GSList               *class_branch_pspecs;
   GtkBindingEntry      *entries;
   GtkBindingEntry      *current;
+  guint                  parsed : 1; /* From RC content */
 };
 
 struct _GtkBindingEntry
@@ -85,7 +66,7 @@ struct _GtkBindingEntry
   /* key portion
    */
   guint                         keyval;
-  guint                         modifiers;
+  GdkModifierType       modifiers;
   
   GtkBindingSet                *binding_set;
   guint                        destroyed : 1;
@@ -121,18 +102,18 @@ GtkBindingSet*    gtk_binding_set_by_class(gpointer        object_class);
 GtkBindingSet* gtk_binding_set_find    (const gchar    *set_name);
 gboolean gtk_bindings_activate         (GtkObject      *object,
                                         guint           keyval,
-                                        guint           modifiers);
+                                        GdkModifierType modifiers);
 gboolean gtk_binding_set_activate      (GtkBindingSet  *binding_set,
                                         guint           keyval,
-                                        guint           modifiers,
+                                        GdkModifierType modifiers,
                                         GtkObject      *object);
 #define         gtk_binding_entry_add          gtk_binding_entry_clear
 void    gtk_binding_entry_clear        (GtkBindingSet  *binding_set,
                                         guint           keyval,
-                                        guint           modifiers);
+                                        GdkModifierType modifiers);
 void    gtk_binding_entry_add_signal   (GtkBindingSet  *binding_set,
                                         guint           keyval,
-                                        guint           modifiers,
+                                        GdkModifierType modifiers,
                                         const gchar    *signal_name,
                                         guint           n_args,
                                         ...);
@@ -146,16 +127,18 @@ void       gtk_binding_set_add_path       (GtkBindingSet  *binding_set,
 
 void    gtk_binding_entry_remove       (GtkBindingSet  *binding_set,
                                         guint           keyval,
-                                        guint           modifiers);
+                                        GdkModifierType modifiers);
 void    gtk_binding_entry_add_signall  (GtkBindingSet  *binding_set,
                                         guint           keyval,
-                                        guint           modifiers,
+                                        GdkModifierType modifiers,
                                         const gchar    *signal_name,
                                         GSList         *binding_args);
 guint   gtk_binding_parse_binding      (GScanner       *scanner);
 
 
-
+gboolean _gtk_bindings_activate_event (GtkObject   *object,
+                                      GdkEventKey *event);
+void     _gtk_binding_reset_parsed    (void);
 
 #ifdef __cplusplus
 }