]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwidget.h
Switch style of stamp file usage.
[~andy/gtk] / gtk / gtkwidget.h
index b2ffc0bd11de33393df221faa5563cd1412c77d5..2176e71f060f7d0c35b8ef910dbebbc11e395889 100644 (file)
@@ -2,20 +2,28 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * 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_WIDGET_H__
 #define __GTK_WIDGET_H__
 
@@ -24,7 +32,8 @@
 #include <gtk/gtkobject.h>
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkstyle.h>
-
+#include <gtk/gtksettings.h>
+#include <atk/atkobject.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,13 +54,38 @@ typedef enum
   GTK_PARENT_SENSITIVE = 1 << 10,
   GTK_CAN_FOCUS        = 1 << 11,
   GTK_HAS_FOCUS        = 1 << 12,
+
+  /* widget is allowed to receive the default via gtk_widget_grab_default
+   * and will reserve space to draw the default if possible
+   */
   GTK_CAN_DEFAULT      = 1 << 13,
+
+  /* the widget currently is receiving the default action and should be drawn
+   * appropriately if possible
+   */
   GTK_HAS_DEFAULT      = 1 << 14,
+
   GTK_HAS_GRAB        = 1 << 15,
   GTK_RC_STYLE        = 1 << 16,
-  GTK_COMPOSITE_CHILD  = 1 << 17
+  GTK_COMPOSITE_CHILD  = 1 << 17,
+  GTK_NO_REPARENT      = 1 << 18,
+  GTK_APP_PAINTABLE    = 1 << 19,
+
+  /* the widget when focused will receive the default action and have
+   * HAS_DEFAULT set even if there is a different widget set as default
+   */
+  GTK_RECEIVES_DEFAULT = 1 << 20,
+
+  GTK_DOUBLE_BUFFERED  = 1 << 21
 } GtkWidgetFlags;
 
+/* Kinds of widget-specific help */
+typedef enum
+{
+  GTK_WIDGET_HELP_TOOLTIP,
+  GTK_WIDGET_HELP_WHATS_THIS
+} GtkWidgetHelpType;
+
 /* Macro for casting a pointer to a GtkWidget or GtkWidgetClass pointer.
  * Macros for testing whether `widget' or `klass' are of type GTK_TYPE_WIDGET.
  */
@@ -60,6 +94,7 @@ typedef enum
 #define GTK_WIDGET_CLASS(klass)                  (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET, GtkWidgetClass))
 #define GTK_IS_WIDGET(widget)            (GTK_CHECK_TYPE ((widget), GTK_TYPE_WIDGET))
 #define GTK_IS_WIDGET_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET))
+#define GTK_WIDGET_GET_CLASS(obj)         (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_WIDGET, GtkWidgetClass))
 
 /* Macros for extracting various fields from GtkWidget and GtkWidgetClass.
  */
@@ -87,62 +122,35 @@ typedef enum
 #define GTK_WIDGET_HAS_GRAB(wid)         ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_GRAB) != 0)
 #define GTK_WIDGET_RC_STYLE(wid)         ((GTK_WIDGET_FLAGS (wid) & GTK_RC_STYLE) != 0)
 #define GTK_WIDGET_COMPOSITE_CHILD(wid)          ((GTK_WIDGET_FLAGS (wid) & GTK_COMPOSITE_CHILD) != 0)
+#define GTK_WIDGET_APP_PAINTABLE(wid)    ((GTK_WIDGET_FLAGS (wid) & GTK_APP_PAINTABLE) != 0)
+#define GTK_WIDGET_RECEIVES_DEFAULT(wid)  ((GTK_WIDGET_FLAGS (wid) & GTK_RECEIVES_DEFAULT) != 0)
+#define GTK_WIDGET_DOUBLE_BUFFERED(wid)          ((GTK_WIDGET_FLAGS (wid) & GTK_DOUBLE_BUFFERED) != 0)
   
 /* Macros for setting and clearing widget flags.
  */
 #define GTK_WIDGET_SET_FLAGS(wid,flag)   G_STMT_START{ (GTK_WIDGET_FLAGS (wid) |= (flag)); }G_STMT_END
 #define GTK_WIDGET_UNSET_FLAGS(wid,flag)  G_STMT_START{ (GTK_WIDGET_FLAGS (wid) &= ~(flag)); }G_STMT_END
-  
-  
-  
-typedef struct _GtkRequisition   GtkRequisition;
-typedef struct _GtkAllocation    GtkAllocation;
-typedef struct _GtkSelectionData GtkSelectionData;
-typedef struct _GtkWidgetClass   GtkWidgetClass;
-typedef struct _GtkWidgetAuxInfo  GtkWidgetAuxInfo;
-typedef struct _GtkWidgetShapeInfo GtkWidgetShapeInfo;
 
-typedef void (*GtkCallback) (GtkWidget *widget,
-                            gpointer   data);
+#define GTK_TYPE_REQUISITION              (gtk_requisition_get_type ())
+
+/* forward declaration to avoid excessive includes (and concurrent includes)
+ */
+typedef struct _GtkRequisition    GtkRequisition;
+typedef        GdkRectangle       GtkAllocation;
+typedef struct _GtkSelectionData   GtkSelectionData;
+typedef struct _GtkWidgetClass    GtkWidgetClass;
+typedef struct _GtkWidgetAuxInfo   GtkWidgetAuxInfo;
+typedef struct _GtkWidgetShapeInfo GtkWidgetShapeInfo;
+typedef void     (*GtkCallback)        (GtkWidget        *widget,
+                                       gpointer          data);
 
 /* A requisition is a desired amount of space which a
  *  widget may request.
  */
 struct _GtkRequisition
 {
-  guint16 width;
-  guint16 height;
-};
-
-/* An allocation is a size and position. Where a widget
- *  can ask for a desired size, it is actually given
- *  this amount of space at the specified position.
- */
-struct _GtkAllocation
-{
-  gint16 x;
-  gint16 y;
-  guint16 width;
-  guint16 height;
-};
-
-/* The contents of a selection are returned in a GtkSelectionData
-   structure. selection/target identify the request. 
-   type specifies the type of the return; if length < 0, and
-   the data should be ignored. This structure has object semantics -
-   no fields should be modified directly, they should not be created
-   directly, and pointers to them should not be stored beyond the duration of
-   a callback. (If the last is changed, we'll need to add reference
-   counting.) The time field gives the timestamp at which the data was sent. */
-
-struct _GtkSelectionData
-{
-  GdkAtom selection;
-  GdkAtom target;
-  GdkAtom type;
-  gint   format;
-  guchar *data;
-  gint   length;
+  gint width;
+  gint height;
 };
 
 /* The widget is the base of the tree for displayable objects.
@@ -235,96 +243,106 @@ struct _GtkWidgetClass
    * handles the emission.
    * Implementation of this signal is optional.
    */
-  guint scroll_adjustments_signal;
-  
+  guint set_scroll_adjustments_signal;
+
+  /* seldomly overidden */
+  void (*dispatch_child_properties_changed) (GtkWidget   *widget,
+                                            guint        n_pspecs,
+                                            GParamSpec **pspecs);
+
   /* basics */
-  void (* show)                       (GtkWidget      *widget);
-  void (* show_all)            (GtkWidget      *widget);
-  void (* hide)                       (GtkWidget      *widget);
-  void (* hide_all)            (GtkWidget      *widget);
-  void (* map)                (GtkWidget      *widget);
-  void (* unmap)              (GtkWidget      *widget);
-  void (* realize)            (GtkWidget      *widget);
-  void (* unrealize)          (GtkWidget      *widget);
-  void (* draw)                       (GtkWidget      *widget,
-                               GdkRectangle   *area);
-  void (* draw_focus)         (GtkWidget      *widget);
-  void (* draw_default)               (GtkWidget      *widget);
-  void (* size_request)               (GtkWidget      *widget,
-                               GtkRequisition *requisition);
-  void (* size_allocate)       (GtkWidget      *widget,
-                               GtkAllocation  *allocation);
-  void (* state_changed)       (GtkWidget      *widget,
-                               GtkStateType    previous_state);
-  void (* parent_set)         (GtkWidget      *widget,
-                               GtkWidget      *previous_parent);
-  void (* style_set)          (GtkWidget      *widget,
-                               GtkStyle       *previous_style);
+  void (* show)                       (GtkWidget        *widget);
+  void (* show_all)            (GtkWidget        *widget);
+  void (* hide)                       (GtkWidget        *widget);
+  void (* hide_all)            (GtkWidget        *widget);
+  void (* map)                (GtkWidget        *widget);
+  void (* unmap)              (GtkWidget        *widget);
+  void (* realize)            (GtkWidget        *widget);
+  void (* unrealize)          (GtkWidget        *widget);
+  void (* size_request)               (GtkWidget        *widget,
+                               GtkRequisition   *requisition);
+  void (* size_allocate)       (GtkWidget        *widget,
+                               GtkAllocation    *allocation);
+  void (* state_changed)       (GtkWidget        *widget,
+                               GtkStateType      previous_state);
+  void (* parent_set)         (GtkWidget        *widget,
+                               GtkWidget        *previous_parent);
+  void (* hierarchy_changed)   (GtkWidget        *widget,
+                               GtkWidget        *previous_toplevel);
+  void (* style_set)          (GtkWidget        *widget,
+                               GtkStyle         *previous_style);
+  void (* direction_changed)   (GtkWidget        *widget,
+                               GtkTextDirection  previous_direction);
+  void (* grab_notify)         (GtkWidget        *widget,
+                               gboolean          was_grabbed);
+  void (* child_notify)        (GtkWidget       *widget,
+                               GParamSpec       *pspec);
   
-  /* accelerators */
-  gint (* add_accelerator)     (GtkWidget      *widget,
-                               guint           accel_signal_id,
-                               GtkAccelGroup  *accel_group,
-                               guint           accel_key,
-                               GdkModifierType accel_mods,
-                               GtkAccelFlags   accel_flags);
-  void (* remove_accelerator)  (GtkWidget      *widget,
-                               GtkAccelGroup  *accel_group,
-                               guint           accel_key,
-                               GdkModifierType accel_mods);
+  /* Mnemonics */
+  gboolean (* mnemonic_activate) (GtkWidget    *widget,
+                                 gboolean      group_cycling);
+  
+  /* explicit focus */
+  void     (* grab_focus)      (GtkWidget        *widget);
+  gboolean (* focus)           (GtkWidget        *widget,
+                                GtkDirectionType  direction);
   
   /* events */
-  gint (* event)                  (GtkWidget          *widget,
-                                   GdkEvent           *event);
-  gint (* button_press_event)     (GtkWidget          *widget,
-                                   GdkEventButton     *event);
-  gint (* button_release_event)           (GtkWidget          *widget,
-                                   GdkEventButton     *event);
-  gint (* motion_notify_event)    (GtkWidget          *widget,
-                                   GdkEventMotion     *event);
-  gint (* delete_event)                   (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* destroy_event)          (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* expose_event)                   (GtkWidget          *widget,
-                                   GdkEventExpose     *event);
-  gint (* key_press_event)        (GtkWidget          *widget,
-                                   GdkEventKey        *event);
-  gint (* key_release_event)      (GtkWidget          *widget,
-                                   GdkEventKey        *event);
-  gint (* enter_notify_event)     (GtkWidget          *widget,
-                                   GdkEventCrossing   *event);
-  gint (* leave_notify_event)     (GtkWidget          *widget,
-                                   GdkEventCrossing   *event);
-  gint (* configure_event)        (GtkWidget          *widget,
-                                   GdkEventConfigure  *event);
-  gint (* focus_in_event)         (GtkWidget          *widget,
-                                   GdkEventFocus      *event);
-  gint (* focus_out_event)        (GtkWidget          *widget,
-                                   GdkEventFocus      *event);
-  gint (* map_event)              (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* unmap_event)            (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* property_notify_event)   (GtkWidget         *widget,
-                                   GdkEventProperty   *event);
-  gint (* selection_clear_event)   (GtkWidget         *widget,
-                                   GdkEventSelection  *event);
-  gint (* selection_request_event) (GtkWidget         *widget,
-                                   GdkEventSelection  *event);
-  gint (* selection_notify_event)  (GtkWidget         *widget,
-                                   GdkEventSelection  *event);
-  gint (* proximity_in_event)     (GtkWidget          *widget,
-                                   GdkEventProximity  *event);
-  gint (* proximity_out_event)    (GtkWidget          *widget,
-                                   GdkEventProximity  *event);
-  gint (* visibility_notify_event)  (GtkWidget        *widget,
-                                    GdkEventVisibility *event);
-  gint (* client_event)                   (GtkWidget          *widget,
-                                   GdkEventClient     *event);
-  gint (* no_expose_event)        (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-
+  gboolean (* event)                   (GtkWidget           *widget,
+                                        GdkEvent            *event);
+  gboolean (* button_press_event)      (GtkWidget           *widget,
+                                        GdkEventButton      *event);
+  gboolean (* button_release_event)    (GtkWidget           *widget,
+                                        GdkEventButton      *event);
+  gboolean (* scroll_event)            (GtkWidget           *widget,
+                                        GdkEventScroll      *event);
+  gboolean (* motion_notify_event)     (GtkWidget           *widget,
+                                        GdkEventMotion      *event);
+  gboolean (* delete_event)            (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* destroy_event)           (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* expose_event)            (GtkWidget           *widget,
+                                        GdkEventExpose      *event);
+  gboolean (* key_press_event)         (GtkWidget           *widget,
+                                        GdkEventKey         *event);
+  gboolean (* key_release_event)       (GtkWidget           *widget,
+                                        GdkEventKey         *event);
+  gboolean (* enter_notify_event)      (GtkWidget           *widget,
+                                        GdkEventCrossing    *event);
+  gboolean (* leave_notify_event)      (GtkWidget           *widget,
+                                        GdkEventCrossing    *event);
+  gboolean (* configure_event)         (GtkWidget           *widget,
+                                        GdkEventConfigure   *event);
+  gboolean (* focus_in_event)          (GtkWidget           *widget,
+                                        GdkEventFocus       *event);
+  gboolean (* focus_out_event)         (GtkWidget           *widget,
+                                        GdkEventFocus       *event);
+  gboolean (* map_event)               (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* unmap_event)             (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* property_notify_event)   (GtkWidget           *widget,
+                                        GdkEventProperty    *event);
+  gboolean (* selection_clear_event)   (GtkWidget           *widget,
+                                        GdkEventSelection   *event);
+  gboolean (* selection_request_event) (GtkWidget           *widget,
+                                        GdkEventSelection   *event);
+  gboolean (* selection_notify_event)  (GtkWidget           *widget,
+                                        GdkEventSelection   *event);
+  gboolean (* proximity_in_event)      (GtkWidget           *widget,
+                                        GdkEventProximity   *event);
+  gboolean (* proximity_out_event)     (GtkWidget           *widget,
+                                        GdkEventProximity   *event);
+  gboolean (* visibility_notify_event) (GtkWidget           *widget,
+                                        GdkEventVisibility  *event);
+  gboolean (* client_event)            (GtkWidget           *widget,
+                                        GdkEventClient      *event);
+  gboolean (* no_expose_event)         (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* window_state_event)      (GtkWidget           *widget,
+                                        GdkEventWindowState *event);
+  
   /* selection */
   void (* selection_get)           (GtkWidget          *widget,
                                    GtkSelectionData   *selection_data,
@@ -343,7 +361,7 @@ struct _GtkWidgetClass
                                    GdkDragContext     *context,
                                    GtkSelectionData   *selection_data,
                                    guint               info,
-                                   guint32             time);
+                                   guint               time);
   void (* drag_data_delete)        (GtkWidget         *widget,
                                    GdkDragContext     *context);
 
@@ -367,19 +385,42 @@ struct _GtkWidgetClass
                                    gint                y,
                                    GtkSelectionData   *selection_data,
                                    guint               info,
-                                   guint32             time);
+                                   guint               time);
+
+  /* Signals used only for keybindings */
+  gboolean (* popup_menu)          (GtkWidget          *widget);
+
+  /* If a widget has multiple tooltips/whatsthis, it should show the
+   * one for the current focus location, or if that doesn't make
+   * sense, should cycle through them showing each tip alongside
+   * whatever piece of the widget it applies to.
+   */
+  gboolean (* show_help)           (GtkWidget          *widget,
+                                    GtkWidgetHelpType   help_type);
   
-  /* action signals */
-  void (* debug_msg)              (GtkWidget          *widget,
-                                   const gchar        *string);
+  /* accessibility support 
+   */
+  AtkObject*   (* get_accessible)  (GtkWidget          *widget);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 struct _GtkWidgetAuxInfo
 {
-  gint16  x;
-  gint16  y;
-  gint16 width;
-  gint16 height;
+  gint x;
+  gint y;
+  gint width;
+  gint height;
+  guint x_set : 1;
+  guint y_set : 1;
 };
 
 struct _GtkWidgetShapeInfo
@@ -389,30 +430,20 @@ struct _GtkWidgetShapeInfo
   GdkBitmap *shape_mask;
 };
 
-
-GtkType           gtk_widget_get_type            (void);
+GtkType           gtk_widget_get_type            (void) G_GNUC_CONST;
 GtkWidget* gtk_widget_new                (GtkType              type,
-                                          const gchar         *first_arg_name,
+                                          const gchar         *first_property_name,
                                           ...);
-GtkWidget* gtk_widget_newv               (GtkType              type,
-                                          guint                nargs,
-                                          GtkArg              *args);
-void      gtk_widget_ref                 (GtkWidget           *widget);
+GtkWidget* gtk_widget_ref                (GtkWidget           *widget);
 void      gtk_widget_unref               (GtkWidget           *widget);
 void      gtk_widget_destroy             (GtkWidget           *widget);
 void      gtk_widget_destroyed           (GtkWidget           *widget,
                                           GtkWidget          **widget_pointer);
-void      gtk_widget_get                 (GtkWidget           *widget,
-                                          GtkArg              *arg);
-void      gtk_widget_getv                (GtkWidget           *widget,
-                                          guint                nargs,
-                                          GtkArg              *args);
+#ifndef GTK_DISABLE_DEPRECATED
 void      gtk_widget_set                 (GtkWidget           *widget,
-                                          const gchar         *first_arg_name,
+                                          const gchar         *first_property_name,
                                           ...);
-void      gtk_widget_setv                (GtkWidget           *widget,
-                                          guint                nargs,
-                                          GtkArg              *args);
+#endif /* GTK_DISABLE_DEPRECATED */
 void      gtk_widget_unparent            (GtkWidget           *widget);
 void      gtk_widget_show                (GtkWidget           *widget);
 void       gtk_widget_show_now            (GtkWidget           *widget);
@@ -431,80 +462,112 @@ void        gtk_widget_queue_draw_area     (GtkWidget           *widget,
                                           gint                 y,
                                           gint                 width,
                                           gint                 height);
+#ifndef GTK_DISABLE_DEPRECATED
 void      gtk_widget_queue_clear         (GtkWidget           *widget);
 void      gtk_widget_queue_clear_area    (GtkWidget           *widget,
                                           gint                 x,
                                           gint                 y,
                                           gint                 width,
                                           gint                 height);
+#endif /* GTK_DISABLE_DEPRECATED */
 
 
 void      gtk_widget_queue_resize        (GtkWidget           *widget);
+#ifndef GTK_DISABLE_DEPRECATED
 void      gtk_widget_draw                (GtkWidget           *widget,
                                           GdkRectangle        *area);
-void      gtk_widget_draw_focus          (GtkWidget           *widget);
-void      gtk_widget_draw_default        (GtkWidget           *widget);
+#endif /* GTK_DISABLE_DEPRECATED */
 void      gtk_widget_size_request        (GtkWidget           *widget,
                                           GtkRequisition      *requisition);
 void      gtk_widget_size_allocate       (GtkWidget           *widget,
                                           GtkAllocation       *allocation);
+void       gtk_widget_get_child_requisition (GtkWidget        *widget,
+                                            GtkRequisition    *requisition);
 void      gtk_widget_add_accelerator     (GtkWidget           *widget,
                                           const gchar         *accel_signal,
                                           GtkAccelGroup       *accel_group,
                                           guint                accel_key,
-                                          guint                accel_mods,
+                                          GdkModifierType      accel_mods,
                                           GtkAccelFlags        accel_flags);
-void      gtk_widget_remove_accelerator  (GtkWidget           *widget,
-                                          GtkAccelGroup       *accel_group,
-                                          guint                accel_key,
-                                          guint                accel_mods);
-void      gtk_widget_remove_accelerators (GtkWidget           *widget,
-                                          const gchar         *accel_signal,
-                                          gboolean             visible_only);
-guint     gtk_widget_accelerator_signal  (GtkWidget           *widget,
+gboolean   gtk_widget_remove_accelerator  (GtkWidget           *widget,
                                           GtkAccelGroup       *accel_group,
                                           guint                accel_key,
-                                          guint                accel_mods);
-void      gtk_widget_lock_accelerators   (GtkWidget           *widget);
-void      gtk_widget_unlock_accelerators (GtkWidget           *widget);
-gint      gtk_widget_event               (GtkWidget           *widget,
+                                          GdkModifierType      accel_mods);
+void       gtk_widget_set_accel_path      (GtkWidget           *widget,
+                                          const gchar         *accel_path,
+                                          GtkAccelGroup       *accel_group);
+const gchar* _gtk_widget_get_accel_path   (GtkWidget           *widget);
+GList*     gtk_widget_list_accel_closures (GtkWidget          *widget);
+gboolean   gtk_widget_mnemonic_activate   (GtkWidget           *widget,
+                                          gboolean             group_cycling);
+gboolean   gtk_widget_event              (GtkWidget           *widget,
                                           GdkEvent            *event);
+gint       gtk_widget_send_expose         (GtkWidget           *widget,
+                                          GdkEvent            *event);
 
-gboolean   gtk_widget_activate           (GtkWidget           *widget);
-gboolean   gtk_widget_scroll_adjustements (GtkWidget           *widget,
-                                          GtkAdjustment       *hadjustment,
-                                          GtkAdjustment       *vadjustment);
+gboolean   gtk_widget_activate              (GtkWidget        *widget);
+gboolean   gtk_widget_set_scroll_adjustments (GtkWidget        *widget,
+                                             GtkAdjustment    *hadjustment,
+                                             GtkAdjustment    *vadjustment);
      
 void      gtk_widget_reparent            (GtkWidget           *widget,
                                           GtkWidget           *new_parent);
-void      gtk_widget_popup               (GtkWidget           *widget,
-                                          gint                 x,
-                                          gint                 y);
-gint      gtk_widget_intersect           (GtkWidget           *widget,
+gboolean   gtk_widget_intersect                  (GtkWidget           *widget,
                                           GdkRectangle        *area,
                                           GdkRectangle        *intersection);
+GdkRegion *gtk_widget_region_intersect   (GtkWidget           *widget,
+                                          GdkRegion           *region);
 
+void   gtk_widget_freeze_child_notify    (GtkWidget           *widget);
+void   gtk_widget_child_notify           (GtkWidget           *widget,
+                                          const gchar         *child_property);
+void   gtk_widget_thaw_child_notify      (GtkWidget           *widget);
+
+gboolean   gtk_widget_is_focus            (GtkWidget           *widget);
 void      gtk_widget_grab_focus          (GtkWidget           *widget);
 void      gtk_widget_grab_default        (GtkWidget           *widget);
 
-void      gtk_widget_set_name            (GtkWidget           *widget,
-                                          const gchar         *name);
-gchar*    gtk_widget_get_name            (GtkWidget           *widget);
-void      gtk_widget_set_state           (GtkWidget           *widget,
-                                          GtkStateType         state);
-void      gtk_widget_set_sensitive       (GtkWidget           *widget,
-                                          gint                 sensitive);
-void      gtk_widget_set_parent          (GtkWidget           *widget,
-                                          GtkWidget           *parent);
-void      gtk_widget_set_parent_window   (GtkWidget           *widget,
-                                          GdkWindow           *parent_window);
+void                  gtk_widget_set_name               (GtkWidget    *widget,
+                                                        const gchar  *name);
+G_CONST_RETURN gchar* gtk_widget_get_name               (GtkWidget    *widget);
+void                  gtk_widget_set_state              (GtkWidget    *widget,
+                                                        GtkStateType  state);
+void                  gtk_widget_set_sensitive          (GtkWidget    *widget,
+                                                        gboolean      sensitive);
+void                  gtk_widget_set_app_paintable      (GtkWidget    *widget,
+                                                        gboolean      app_paintable);
+void                  gtk_widget_set_double_buffered    (GtkWidget    *widget,
+                                                        gboolean      double_buffered);
+void                  gtk_widget_set_redraw_on_allocate (GtkWidget    *widget,
+                                                        gboolean      redraw_on_allocate);
+void                  gtk_widget_set_parent             (GtkWidget    *widget,
+                                                        GtkWidget    *parent);
+void                  gtk_widget_set_parent_window      (GtkWidget    *widget,
+                                                        GdkWindow    *parent_window);
+void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
+                                                        gboolean      is_visible);
+gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
+
+GtkWidget *gtk_widget_get_parent          (GtkWidget           *widget);
 GdkWindow *gtk_widget_get_parent_window          (GtkWidget           *widget);
+gboolean   gtk_widget_child_focus         (GtkWidget           *widget,
+                                           GtkDirectionType     direction);
+
+void       gtk_widget_set_size_request    (GtkWidget           *widget,
+                                           gint                 width,
+                                           gint                 height);
+void       gtk_widget_get_size_request    (GtkWidget           *widget,
+                                           gint                *width,
+                                           gint                *height);
+#ifndef GTK_DISABLE_DEPRECATED
 void      gtk_widget_set_uposition       (GtkWidget           *widget,
                                           gint                 x,
                                           gint                 y);
 void      gtk_widget_set_usize           (GtkWidget           *widget,
                                           gint                 width,
                                           gint                 height);
+#endif
+
 void      gtk_widget_set_events          (GtkWidget           *widget,
                                           gint                 events);
 void       gtk_widget_add_events          (GtkWidget           *widget,
@@ -518,35 +581,92 @@ GtkWidget*   gtk_widget_get_ancestor      (GtkWidget      *widget,
                                         GtkType        widget_type);
 GdkColormap* gtk_widget_get_colormap   (GtkWidget      *widget);
 GdkVisual*   gtk_widget_get_visual     (GtkWidget      *widget);
+
+GtkSettings* gtk_widget_get_settings    (GtkWidget      *widget);
+
+#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_widget_set_visual(widget,visual)  ((void) 0)
+#define gtk_widget_push_visual(visual)        ((void) 0)
+#define gtk_widget_pop_visual()               ((void) 0)
+#define gtk_widget_set_default_visual(visual) ((void) 0)
+#endif /* GTK_DISABLE_DEPRECATED */
+
+/* Accessibility support */
+AtkObject*       gtk_widget_get_accessible               (GtkWidget          *widget);
+
+/* The following functions must not be called on an already
+ * realized widget. Because it is possible that somebody
+ * can call get_colormap() or get_visual() and save the
+ * result, these functions are probably only safe to
+ * call in a widget's init() function.
+ */
+void         gtk_widget_set_colormap    (GtkWidget      *widget,
+                                        GdkColormap    *colormap);
+
 gint        gtk_widget_get_events      (GtkWidget      *widget);
 void        gtk_widget_get_pointer     (GtkWidget      *widget,
                                         gint           *x,
                                         gint           *y);
 
-gint        gtk_widget_is_ancestor     (GtkWidget      *widget,
+gboolean     gtk_widget_is_ancestor    (GtkWidget      *widget,
                                         GtkWidget      *ancestor);
 
+gboolean     gtk_widget_translate_coordinates (GtkWidget  *src_widget,
+                                              GtkWidget  *dest_widget,
+                                              gint        src_x,
+                                              gint        src_y,
+                                              gint       *dest_x,
+                                              gint       *dest_y);
+
 /* Hide widget and return TRUE.
  */
-gint      gtk_widget_hide_on_delete    (GtkWidget      *widget);
+gboolean     gtk_widget_hide_on_delete (GtkWidget      *widget);
 
 /* Widget styles.
  */
 void      gtk_widget_set_style         (GtkWidget      *widget,
                                         GtkStyle       *style);
-void      gtk_widget_set_rc_style      (GtkWidget      *widget);
 void      gtk_widget_ensure_style      (GtkWidget      *widget);
 GtkStyle*  gtk_widget_get_style                (GtkWidget      *widget);
-void      gtk_widget_restore_default_style (GtkWidget  *widget);
 
-void       gtk_widget_modify_style      (GtkWidget      *widget,
-                                        GtkRcStyle     *style);
+void        gtk_widget_modify_style       (GtkWidget            *widget,
+                                          GtkRcStyle           *style);
+GtkRcStyle *gtk_widget_get_modifier_style (GtkWidget            *widget);
+void        gtk_widget_modify_fg          (GtkWidget            *widget,
+                                          GtkStateType          state,
+                                          GdkColor             *color);
+void        gtk_widget_modify_bg          (GtkWidget            *widget,
+                                          GtkStateType          state,
+                                          GdkColor             *color);
+void        gtk_widget_modify_text        (GtkWidget            *widget,
+                                          GtkStateType          state,
+                                          GdkColor             *color);
+void        gtk_widget_modify_base        (GtkWidget            *widget,
+                                          GtkStateType          state,
+                                          GdkColor             *color);
+void        gtk_widget_modify_font        (GtkWidget            *widget,
+                                          PangoFontDescription *font_desc);
+
+#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_widget_set_rc_style(widget)          (gtk_widget_set_style (widget, NULL))
+#define gtk_widget_restore_default_style(widget) (gtk_widget_set_style (widget, NULL))
+#endif
+
+PangoContext *gtk_widget_create_pango_context (GtkWidget   *widget);
+PangoContext *gtk_widget_get_pango_context    (GtkWidget   *widget);
+PangoLayout  *gtk_widget_create_pango_layout  (GtkWidget   *widget,
+                                              const gchar *text);
+
+GdkPixbuf    *gtk_widget_render_icon          (GtkWidget   *widget,
+                                               const gchar *stock_id,
+                                               GtkIconSize  size,
+                                               const gchar *detail);
 
 /* handle composite names for GTK_COMPOSITE_CHILD widgets,
  * the returned name is newly allocated.
  */
 void   gtk_widget_set_composite_name   (GtkWidget      *widget,
-                                        gchar          *name);
+                                        const gchar    *name);
 gchar* gtk_widget_get_composite_name   (GtkWidget      *widget);
      
 /* Descend recursively and set rc-style on all widgets without user styles */
@@ -556,24 +676,46 @@ void       gtk_widget_reset_rc_styles   (GtkWidget      *widget);
  * This will override the values that got set by the
  * gtk_widget_set_default_* () functions.
  */
-void        gtk_widget_push_style           (GtkStyle   *style);
 void        gtk_widget_push_colormap        (GdkColormap *cmap);
-void        gtk_widget_push_visual          (GdkVisual  *visual);
 void        gtk_widget_push_composite_child (void);
 void        gtk_widget_pop_composite_child  (void);
-void        gtk_widget_pop_style            (void);
 void        gtk_widget_pop_colormap         (void);
-void        gtk_widget_pop_visual           (void);
+
+/* widget style properties
+ */
+void gtk_widget_class_install_style_property        (GtkWidgetClass     *klass,
+                                                    GParamSpec         *pspec);
+void gtk_widget_class_install_style_property_parser (GtkWidgetClass     *klass,
+                                                    GParamSpec         *pspec,
+                                                    GtkRcPropertyParser parser);
+void gtk_widget_style_get_property (GtkWidget       *widget,
+                                   const gchar    *property_name,
+                                   GValue           *value);
+void gtk_widget_style_get_valist   (GtkWidget       *widget,
+                                   const gchar    *first_property_name,
+                                   va_list         var_args);
+void gtk_widget_style_get          (GtkWidget       *widget,
+                                   const gchar    *first_property_name,
+                                   ...);
+
 
 /* Set certain default values to be used at widget creation time.
  */
-void        gtk_widget_set_default_style    (GtkStyle    *style);
 void        gtk_widget_set_default_colormap (GdkColormap *colormap);
-void        gtk_widget_set_default_visual   (GdkVisual   *visual);
 GtkStyle*    gtk_widget_get_default_style    (void);
 GdkColormap* gtk_widget_get_default_colormap (void);
 GdkVisual*   gtk_widget_get_default_visual   (void);
 
+/* Functions for setting directionality for widgets
+ */
+
+void             gtk_widget_set_direction         (GtkWidget        *widget,
+                                                  GtkTextDirection  dir);
+GtkTextDirection gtk_widget_get_direction         (GtkWidget        *widget);
+
+void             gtk_widget_set_default_direction (GtkTextDirection  dir);
+GtkTextDirection gtk_widget_get_default_direction (void);
+
 /* Counterpart to gdk_window_shape_combine_mask.
  */
 void        gtk_widget_shape_combine_mask (GtkWidget *widget,
@@ -596,16 +738,21 @@ void           gtk_widget_class_path         (GtkWidget *widget,
                                            gchar    **path,
                                            gchar    **path_reversed);
 
+GType           gtk_requisition_get_type (void);
+GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
+void            gtk_requisition_free     (GtkRequisition       *requisition);
+
 #if    defined (GTK_TRACE_OBJECTS) && defined (__GNUC__)
 #  define gtk_widget_ref gtk_object_ref
 #  define gtk_widget_unref gtk_object_unref
 #endif /* GTK_TRACE_OBJECTS && __GNUC__ */
 
+GtkWidgetAuxInfo *_gtk_widget_get_aux_info                (GtkWidget    *widget,
+                                                          gboolean      create);
+void              _gtk_widget_propagate_hierarchy_changed (GtkWidget    *widget,
+                                                          GtkWidget    *previous_toplevel);
 
-/* deprecated */
-void       gtk_widget_freeze_accelerators (GtkWidget          *widget);
-void      gtk_widget_thaw_accelerators   (GtkWidget           *widget);
-
+GdkColormap* _gtk_widget_peek_colormap (void);
 
 #ifdef __cplusplus
 }