gtk: Add gtk_widget_queue_draw_region()

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

diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 80e798dba76b22b1bc6aa9c249b68ae4bb3eb537..260eeb80b11f4a3759b201977ae2c53a5134451d 100644 (file)
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -1,7 +1,7 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
- * GtkBindingSet: Keybinding manager for GtkObjects.
+ * GtkBindingSet: Keybinding manager for GObjects.
  * Copyright (C) 1998 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -36,10 +36,8 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
 #include <gtk/gtkenums.h>
 
-
 G_BEGIN_DECLS
 
 
@@ -102,28 +100,15 @@ struct _GtkBindingSignal
 GtkBindingSet* gtk_binding_set_new     (const gchar    *set_name);
 GtkBindingSet* gtk_binding_set_by_class(gpointer        object_class);
 GtkBindingSet* gtk_binding_set_find    (const gchar    *set_name);
-gboolean gtk_bindings_activate         (GtkObject      *object,
+gboolean gtk_bindings_activate         (GObject        *object,
                                         guint           keyval,
                                         GdkModifierType modifiers);
-gboolean gtk_bindings_activate_event    (GtkObject      *object,
+gboolean gtk_bindings_activate_event    (GObject        *object,
                                         GdkEventKey    *event);
 gboolean gtk_binding_set_activate      (GtkBindingSet  *binding_set,
                                         guint           keyval,
                                         GdkModifierType modifiers,
-                                        GtkObject      *object);
-
-#ifndef GTK_DISABLE_DEPRECATED
-#define         gtk_binding_entry_add          gtk_binding_entry_clear
-void    gtk_binding_entry_clear        (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        GdkModifierType modifiers);
-void    gtk_binding_entry_add_signall  (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        GdkModifierType modifiers,
-                                        const gchar    *signal_name,
-                                        GSList         *binding_args);
-guint   gtk_binding_parse_binding      (GScanner       *scanner);
-#endif /* GTK_DISABLE_DEPRECATED */
+                                        GObject        *object);
 
 void    gtk_binding_entry_skip         (GtkBindingSet  *binding_set,
                                          guint           keyval,
@@ -134,6 +119,11 @@ void        gtk_binding_entry_add_signal   (GtkBindingSet  *binding_set,
                                          const gchar    *signal_name,
                                          guint           n_args,
                                          ...);
+void    gtk_binding_entry_add_signall  (GtkBindingSet  *binding_set,
+                                        guint           keyval,
+                                        GdkModifierType modifiers,
+                                        const gchar    *signal_name,
+                                        GSList         *binding_args);
 void    gtk_binding_entry_remove       (GtkBindingSet  *binding_set,
                                         guint           keyval,
                                         GdkModifierType modifiers);
@@ -154,21 +144,6 @@ void        _gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
                                         const gchar    *signal_name,
                                         GSList         *binding_args);
 
-/* Creates a signal with a fixed callback instead of a class offset;
- * useful for key binding signals
- */
-guint _gtk_binding_signal_new (const gchar       *signal_name,
-                              GType              itype,
-                              GSignalFlags       signal_flags,
-                              GCallback          handler,
-                              GSignalAccumulator accumulator,
-                              gpointer           accu_data,
-                              GSignalCMarshaller c_marshaller,
-                              GType              return_type,
-                              guint              n_params,
-                              ...);
-
 G_END_DECLS
 
-
 #endif /* __GTK_BINDINGS_H__ */