]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkwidget.h
Use gdk_threads_add_timeout to popup the selection window
[~andy/gtk] / gtk / gtkwidget.h
index e89c3857ec1e1504768f0c2bd8e66db29ee06ed9..bdf8e5e607f16bb4bd371c3e4e661b4846a7b540 100644 (file)
  * Lesser General Public License for more details.
  *
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
  * 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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_WIDGET_H__
 #define __GTK_WIDGET_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkstyle.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gtk/gtkborder.h>
+#include <gtk/gtktypes.h>
+#include <atk/atk.h>
 
+G_BEGIN_DECLS
 
-/* The flags that are used by GtkWidget on top of the
- * flags field of GtkObject.
- */
+/* Kinds of widget-specific help */
 typedef enum
 {
-  GTK_TOPLEVEL         = 1 << 4,
-  GTK_NO_WINDOW        = 1 << 5,
-  GTK_REALIZED         = 1 << 6,
-  GTK_MAPPED           = 1 << 7,
-  GTK_VISIBLE          = 1 << 8,
-  GTK_SENSITIVE        = 1 << 9,
-  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_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;
+  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.
  */
 #define GTK_TYPE_WIDGET                          (gtk_widget_get_type ())
-#define GTK_WIDGET(widget)               (GTK_CHECK_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget))
-#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.
+#define GTK_WIDGET(widget)               (G_TYPE_CHECK_INSTANCE_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget))
+#define GTK_WIDGET_CLASS(klass)                  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET, GtkWidgetClass))
+#define GTK_IS_WIDGET(widget)            (G_TYPE_CHECK_INSTANCE_TYPE ((widget), GTK_TYPE_WIDGET))
+#define GTK_IS_WIDGET_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET))
+#define GTK_WIDGET_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WIDGET, GtkWidgetClass))
+
+#define GTK_TYPE_REQUISITION              (gtk_requisition_get_type ())
+
+typedef struct _GtkWidgetPrivate       GtkWidgetPrivate;
+typedef struct _GtkWidgetClass        GtkWidgetClass;
+typedef struct _GtkWidgetClassPrivate  GtkWidgetClassPrivate;
+typedef struct _GtkWidgetAuxInfo       GtkWidgetAuxInfo;
+
+/**
+ * GtkAllocation:
+ * @x: the X position of the widget's area relative to its parents allocation.
+ * @y: the Y position of the widget's area relative to its parents allocation.
+ * @width: the width of the widget's allocated area.
+ * @height: the height of the widget's allocated area.
+ *
+ * A <structname>GtkAllocation</structname> of a widget represents region
+ * which has been allocated to the widget by its parent. It is a subregion
+ * of its parents allocation. See <xref linkend="geometry-management"/> for
+ * more information.
  */
-#define GTK_WIDGET_TYPE(wid)             (GTK_OBJECT_TYPE (wid))
-#define GTK_WIDGET_STATE(wid)            (GTK_WIDGET (wid)->state)
-#define GTK_WIDGET_SAVED_STATE(wid)      (GTK_WIDGET (wid)->saved_state)
+typedef        GdkRectangle       GtkAllocation;
 
-/* Macros for extracting the widget flags from GtkWidget.
+/**
+ * GtkCallback:
+ * @widget: the widget to operate on
+ * @data: (closure): user-supplied data
+ *
+ * The type of the callback functions used for e.g. iterating over
+ * the children of a container, see gtk_container_foreach().
  */
-#define GTK_WIDGET_FLAGS(wid)            (GTK_OBJECT_FLAGS (wid))
-#define GTK_WIDGET_TOPLEVEL(wid)         ((GTK_WIDGET_FLAGS (wid) & GTK_TOPLEVEL) != 0)
-#define GTK_WIDGET_NO_WINDOW(wid)        ((GTK_WIDGET_FLAGS (wid) & GTK_NO_WINDOW) != 0)
-#define GTK_WIDGET_REALIZED(wid)         ((GTK_WIDGET_FLAGS (wid) & GTK_REALIZED) != 0)
-#define GTK_WIDGET_MAPPED(wid)           ((GTK_WIDGET_FLAGS (wid) & GTK_MAPPED) != 0)
-#define GTK_WIDGET_VISIBLE(wid)                  ((GTK_WIDGET_FLAGS (wid) & GTK_VISIBLE) != 0)
-#define GTK_WIDGET_DRAWABLE(wid)         (GTK_WIDGET_VISIBLE (wid) && GTK_WIDGET_MAPPED (wid))
-#define GTK_WIDGET_SENSITIVE(wid)        ((GTK_WIDGET_FLAGS (wid) & GTK_SENSITIVE) != 0)
-#define GTK_WIDGET_PARENT_SENSITIVE(wid)  ((GTK_WIDGET_FLAGS (wid) & GTK_PARENT_SENSITIVE) != 0)
-#define GTK_WIDGET_IS_SENSITIVE(wid)     (GTK_WIDGET_SENSITIVE (wid) && \
-                                          GTK_WIDGET_PARENT_SENSITIVE (wid))
-#define GTK_WIDGET_CAN_FOCUS(wid)        ((GTK_WIDGET_FLAGS (wid) & GTK_CAN_FOCUS) != 0)
-#define GTK_WIDGET_HAS_FOCUS(wid)        ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_FOCUS) != 0)
-#define GTK_WIDGET_CAN_DEFAULT(wid)      ((GTK_WIDGET_FLAGS (wid) & GTK_CAN_DEFAULT) != 0)
-#define GTK_WIDGET_HAS_DEFAULT(wid)      ((GTK_WIDGET_FLAGS (wid) & GTK_HAS_DEFAULT) != 0)
-#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.
+typedef void    (*GtkCallback)     (GtkWidget        *widget,
+                                   gpointer          data);
+
+/**
+ * GtkTickCallback:
+ * @widget: the widget
+ * @frame_clock: the frame clock for the widget (same as calling gtk_widget_get_frame_clock())
+ * @user_data: user data passed to gtk_widget_add_tick_callback().
+ *
+ * Callback type for adding a function to update animations. See gtk_widget_add_tick_callback().
+ *
+ * Returns: %G_SOURCE_CONTINUE if the tick callback should continue to be called,
+ *  %G_SOURCE_REMOVE if the tick callback should be removed.
+ *
+ * Since: 3.8
  */
-#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 _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.
+typedef gboolean (*GtkTickCallback) (GtkWidget     *widget,
+                                     GdkFrameClock *frame_clock,
+                                     gpointer       user_data);
+
+/**
+ * GtkRequisition:
+ * @width: the widget's desired width
+ * @height: the widget's desired height
+ *
+ * A <structname>GtkRequisition</structname> represents the desired size of a widget. See
+ * <xref linkend="geometry-management"/> for more information.
  */
 struct _GtkRequisition
 {
@@ -148,290 +124,361 @@ struct _GtkRequisition
  */
 struct _GtkWidget
 {
-  /* The object structure needs to be the first
-   *  element in the widget structure in order for
-   *  the object mechanism to work correctly. This
-   *  allows a GtkWidget pointer to be cast to a
-   *  GtkObject pointer.
-   */
-  GtkObject object;
-  
-  /* 16 bits of internally used private flags.
-   * this will be packed into the same 4 byte alignment frame that
-   * state and saved_state go. we therefore don't waste any new
-   * space on this.
-   */
-  guint16 private_flags;
-  
-  /* The state of the widget. There are actually only
-   *  5 widget states (defined in "gtkenums.h").
-   */
-  guint8 state;
-  
-  /* The saved state of the widget. When a widgets state
-   *  is changed to GTK_STATE_INSENSITIVE via
-   *  "gtk_widget_set_state" or "gtk_widget_set_sensitive"
-   *  the old state is kept around in this field. The state
-   *  will be restored once the widget gets sensitive again.
-   */
-  guint8 saved_state;
-  
-  /* The widgets name. If the widget does not have a name
-   *  (the name is NULL), then its name (as returned by
-   *  "gtk_widget_get_name") is its classes name.
-   * Among other things, the widget name is used to determine
-   *  the style to use for a widget.
-   */
-  gchar *name;
-  
-  /* The style for the widget. The style contains the
-   *  colors the widget should be drawn in for each state
-   *  along with graphics contexts used to draw with and
-   *  the font to use for text.
-   */
-  GtkStyle *style;
-  
-  /* The widgets desired size.
-   */
-  GtkRequisition requisition;
-  
-  /* The widgets allocated size.
-   */
-  GtkAllocation allocation;
-  
-  /* The widgets window or its parent window if it does
-   *  not have a window. (Which will be indicated by the
-   *  GTK_NO_WINDOW flag being set).
-   */
-  GdkWindow *window;
-  
-  /* The widgets parent.
-   */
-  GtkWidget *parent;
+  GInitiallyUnowned parent_instance;
+
+  GtkWidgetPrivate *priv;
 };
 
+/**
+ * GtkWidgetClass:
+ * @parent_class: The object class structure needs to be the first
+ *   element in the widget class structure in order for the class mechanism
+ *   to work correctly. This allows a GtkWidgetClass pointer to be cast to
+ *   a GObjectClass pointer.
+ * @activate_signal: The signal to emit when a widget of this class is
+ *   activated, gtk_widget_activate() handles the emission.
+ *   Implementation of this signal is optional.
+ * @get_request_mode: This allows a widget to tell its parent container whether
+ *   it prefers to be allocated in %GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH or
+ *   %GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT mode.
+ *   %GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH means the widget prefers to have
+ *   #GtkWidgetClass.get_preferred_width() called and then
+ *   #GtkWidgetClass.get_preferred_height_for_width().
+ *   %GTK_SIZE_REQUEST_CONSTANT_SIZE disables any height-for-width or
+ *   width-for-height geometry management for a said widget and is the
+ *   default return.
+ *   It's important to note (as described below) that any widget
+ *   which trades height-for-width or width-for-height must respond properly 
+ *   to both of the virtual methods #GtkWidgetClass.get_preferred_height_for_width()
+ *   and #GtkWidgetClass.get_preferred_width_for_height() since it might be 
+ *   queried in either #GtkSizeRequestMode by its parent container.
+ * @get_preferred_height: This is called by containers to obtain the minimum
+ *   and natural height of a widget. A widget that does not actually trade
+ *   any height for width or width for height only has to implement these
+ *   two virtual methods (#GtkWidgetClass.get_preferred_width() and
+ *   #GtkWidgetClass.get_preferred_height()).
+ * @get_preferred_width_for_height: This is analogous to
+ *   #GtkWidgetClass.get_preferred_height_for_width() except that it
+ *   operates in the oposite orientation. It's rare that a widget actually
+ *   does %GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT requests but this can happen
+ *   when, for example, a widget or container gets additional columns to
+ *   compensate for a smaller allocated height.
+ * @get_preferred_width: This is called by containers to obtain the minimum
+ *   and natural width of a widget. A widget will never be allocated a width
+ *   less than its minimum and will only ever be allocated a width greater
+ *   than the natural width once all of the said widget's siblings have
+ *   received their natural widths.
+ *   Furthermore, a widget will only ever be allocated a width greater than
+ *   its natural width if it was configured to receive extra expand space
+ *   from its parent container.
+ * @get_preferred_height_for_width: This is similar to
+ *   #GtkWidgetClass.get_preferred_height() except that it is passed a
+ *   contextual width to request height for. By implementing this virtual
+ *   method it is possible for a #GtkLabel to tell its parent how much height
+ *   would be required if the label were to be allocated a said width.
+ * @adjust_size_request: Convert an initial size request from a widget's
+ *   #GtkSizeRequestMode virtual method implementations into a size request to
+ *   be used by parent containers in laying out the widget.
+ *   adjust_size_request adjusts <emphasis>from</emphasis> a child widget's
+ *   original request <emphasis>to</emphasis> what a parent container should
+ *   use for layout. The @for_size argument will be -1 if the request should
+ *   not be for a particular size in the opposing orientation, i.e. if the
+ *   request is not height-for-width or width-for-height. If @for_size is
+ *   greater than -1, it is the proposed allocation in the opposing
+ *   orientation that we need the request for. Implementations of
+ *   adjust_size_request should chain up to the default implementation,
+ *   which applies #GtkWidget's margin properties and imposes any values
+ *   from gtk_widget_set_size_request(). Chaining up should be last,
+ *   <emphasis>after</emphasis> your subclass adjusts the request, so
+ *   #GtkWidget can apply constraints and add the margin properly.
+ * @adjust_size_allocation: Convert an initial size allocation assigned
+ *   by a #GtkContainer using gtk_widget_size_allocate(), into an actual
+ *   size allocation to be used by the widget. adjust_size_allocation
+ *   adjusts <emphasis>to</emphasis> a child widget's actual allocation
+ *   <emphasis>from</emphasis> what a parent container computed for the
+ *   child. The adjusted allocation must be entirely within the original
+ *   allocation. In any custom implementation, chain up to the default
+ *   #GtkWidget implementation of this method, which applies the margin
+ *   and alignment properties of #GtkWidget. Chain up
+ *   <emphasis>before</emphasis> performing your own adjustments so your
+ *   own adjustments remove more allocation after the #GtkWidget base
+ *   class has already removed margin and alignment. The natural size
+ *   passed in should be adjusted in the same way as the allocated size,
+ *   which allows adjustments to perform alignments or other changes
+ *   based on natural size.
+ */
 struct _GtkWidgetClass
 {
-  /* The object class structure needs to be the first
-   *  element in the widget class structure in order for
-   *  the class mechanism to work correctly. This allows a
-   *  GtkWidgetClass pointer to be cast to a GtkObjectClass
-   *  pointer.
-   */
-  GtkObjectClass parent_class;
-  
-  /* The signal to emit when a widget of this class is activated,
-   * gtk_widget_activate() handles the emission.
-   * Implementation of this signal is optional.
-   */
+  GInitiallyUnownedClass parent_class;
+
+  /*< public >*/
+
   guint activate_signal;
 
-  /* This signal is emitted  when a widget of this class is added
-   * to a scrolling aware parent, gtk_widget_set_scroll_adjustments()
-   * handles the emission.
-   * Implementation of this signal is optional.
-   */
-  guint set_scroll_adjustments_signal;
-  
+  /* seldomly overidden */
+  void (*dispatch_child_properties_changed) (GtkWidget   *widget,
+                                            guint        n_pspecs,
+                                            GParamSpec **pspecs);
+
   /* basics */
+  void (* destroy)             (GtkWidget        *widget);
   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 (* state_flags_changed) (GtkWidget        *widget,
+                               GtkStateFlags     previous_state_flags);
   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);
-  
-  /* 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);
+  void (* grab_notify)         (GtkWidget        *widget,
+                               gboolean          was_grabbed);
+  void (* child_notify)        (GtkWidget       *widget,
+                               GParamSpec       *child_property);
+  gboolean (* draw)           (GtkWidget        *widget,
+                                cairo_t          *cr);
+
+  /* size requests */
+  GtkSizeRequestMode (* get_request_mode)               (GtkWidget      *widget);
+
+  void               (* get_preferred_height)           (GtkWidget       *widget,
+                                                         gint            *minimum_height,
+                                                         gint            *natural_height);
+  void               (* get_preferred_width_for_height) (GtkWidget       *widget,
+                                                         gint             height,
+                                                         gint            *minimum_width,
+                                                         gint            *natural_width);
+  void               (* get_preferred_width)            (GtkWidget       *widget,
+                                                         gint            *minimum_width,
+                                                         gint            *natural_width);
+  void               (* get_preferred_height_for_width) (GtkWidget       *widget,
+                                                         gint             width,
+                                                         gint            *minimum_height,
+                                                         gint            *natural_height);
+
+  /* Mnemonics */
+  gboolean (* mnemonic_activate)        (GtkWidget           *widget,
+                                         gboolean             group_cycling);
 
   /* explicit focus */
-  void (* grab_focus)          (GtkWidget      *widget);
-  
+  void     (* grab_focus)               (GtkWidget           *widget);
+  gboolean (* focus)                    (GtkWidget           *widget,
+                                         GtkDirectionType     direction);
+
+  /* keyboard navigation */
+  void     (* move_focus)               (GtkWidget           *widget,
+                                         GtkDirectionType     direction);
+  gboolean (* keynav_failed)            (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 (* scroll_event)            (GtkWidget          *widget,
-                                   GdkEventScroll     *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 (* 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 (* window_state_event)      (GtkWidget           *widget,
+                                        GdkEventWindowState *event);
+  gboolean (* damage_event)             (GtkWidget           *widget,
+                                         GdkEventExpose      *event);
+  gboolean (* grab_broken_event)        (GtkWidget           *widget,
+                                         GdkEventGrabBroken  *event);
 
   /* selection */
-  void (* selection_get)           (GtkWidget          *widget,
+  void     (* selection_get)       (GtkWidget          *widget,
                                    GtkSelectionData   *selection_data,
                                    guint               info,
-                                   guint               time);
-  void (* selection_received)      (GtkWidget          *widget,
+                                   guint               time_);
+  void     (* selection_received)  (GtkWidget          *widget,
                                    GtkSelectionData   *selection_data,
-                                   guint               time);
+                                   guint               time_);
 
   /* Source side drag signals */
-  void (* drag_begin)             (GtkWidget          *widget,
+  void     (* drag_begin)          (GtkWidget         *widget,
                                    GdkDragContext     *context);
-  void (* drag_end)               (GtkWidget          *widget,
+  void     (* drag_end)                   (GtkWidget          *widget,
                                    GdkDragContext     *context);
-  void (* drag_data_get)           (GtkWidget          *widget,
+  void     (* drag_data_get)       (GtkWidget          *widget,
                                    GdkDragContext     *context,
                                    GtkSelectionData   *selection_data,
                                    guint               info,
-                                   guint               time);
-  void (* drag_data_delete)        (GtkWidget         *widget,
+                                   guint               time_);
+  void     (* drag_data_delete)    (GtkWidget          *widget,
                                    GdkDragContext     *context);
 
   /* Target side drag signals */
-  void (* drag_leave)             (GtkWidget          *widget,
+  void     (* drag_leave)          (GtkWidget          *widget,
                                    GdkDragContext     *context,
-                                   guint               time);
+                                   guint               time_);
   gboolean (* drag_motion)         (GtkWidget         *widget,
                                    GdkDragContext     *context,
                                    gint                x,
                                    gint                y,
-                                   guint               time);
+                                   guint               time_);
   gboolean (* drag_drop)           (GtkWidget         *widget,
                                    GdkDragContext     *context,
                                    gint                x,
                                    gint                y,
-                                   guint               time);
-  void (* drag_data_received)      (GtkWidget          *widget,
+                                   guint               time_);
+  void     (* drag_data_received)  (GtkWidget          *widget,
                                    GdkDragContext     *context,
                                    gint                x,
                                    gint                y,
                                    GtkSelectionData   *selection_data,
                                    guint               info,
-                                   guint               time);
-  
-  /* action signals */
-  void (* debug_msg)              (GtkWidget          *widget,
-                                   const gchar        *string);
-
-  /* Padding for future expandsion */
-  GtkFunction pad1;
-  GtkFunction pad2;
-  GtkFunction pad3;
-  GtkFunction pad4;
+                                   guint               time_);
+  gboolean (* drag_failed)         (GtkWidget          *widget,
+                                    GdkDragContext     *context,
+                                    GtkDragResult       result);
+
+  /* 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);
+
+  /* accessibility support
+   */
+  AtkObject *  (* get_accessible)     (GtkWidget *widget);
+
+  void         (* screen_changed)     (GtkWidget *widget,
+                                       GdkScreen *previous_screen);
+  gboolean     (* can_activate_accel) (GtkWidget *widget,
+                                       guint      signal_id);
+
+
+  void         (* composited_changed) (GtkWidget *widget);
+
+  gboolean     (* query_tooltip)      (GtkWidget  *widget,
+                                      gint        x,
+                                      gint        y,
+                                      gboolean    keyboard_tooltip,
+                                      GtkTooltip *tooltip);
+
+  void         (* compute_expand)     (GtkWidget  *widget,
+                                       gboolean   *hexpand_p,
+                                       gboolean   *vexpand_p);
+
+  void         (* adjust_size_request)    (GtkWidget         *widget,
+                                           GtkOrientation     orientation,
+                                           gint              *minimum_size,
+                                           gint              *natural_size);
+  void         (* adjust_size_allocation) (GtkWidget         *widget,
+                                           GtkOrientation     orientation,
+                                           gint              *minimum_size,
+                                           gint              *natural_size,
+                                           gint              *allocated_pos,
+                                           gint              *allocated_size);
+
+  void         (* style_updated)          (GtkWidget *widget);
+
+  gboolean     (* touch_event)            (GtkWidget     *widget,
+                                           GdkEventTouch *event);
+
+  /*< private >*/
+
+  GtkWidgetClassPrivate *priv;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
 };
 
 struct _GtkWidgetAuxInfo
 {
-  gint16  x;
-  gint16  y;
-  gint16 width;
-  gint16 height;
-};
+  gint width;
+  gint height;
 
-struct _GtkWidgetShapeInfo
-{
-  gint16     offset_x;
-  gint16     offset_y;
-  GdkBitmap *shape_mask;
+  guint   halign : 4;
+  guint   valign : 4;
+
+  GtkBorder margin;
 };
 
-GtkType           gtk_widget_get_type            (void) G_GNUC_CONST;
-GtkWidget* gtk_widget_new                (GtkType              type,
-                                          const gchar         *first_arg_name,
+GType     gtk_widget_get_type            (void) G_GNUC_CONST;
+GtkWidget* gtk_widget_new                (GType                type,
+                                          const gchar         *first_property_name,
                                           ...);
-GtkWidget* gtk_widget_newv               (GtkType              type,
-                                          guint                nargs,
-                                          GtkArg              *args);
-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);
-void      gtk_widget_set                 (GtkWidget           *widget,
-                                          const gchar         *first_arg_name,
-                                          ...);
-void      gtk_widget_setv                (GtkWidget           *widget,
-                                          guint                nargs,
-                                          GtkArg              *args);
 void      gtk_widget_unparent            (GtkWidget           *widget);
-void      gtk_widget_show                (GtkWidget           *widget);
+void       gtk_widget_show                (GtkWidget           *widget);
+void       gtk_widget_hide                (GtkWidget           *widget);
 void       gtk_widget_show_now            (GtkWidget           *widget);
-void      gtk_widget_hide                (GtkWidget           *widget);
-void      gtk_widget_show_all            (GtkWidget           *widget);
-void      gtk_widget_hide_all            (GtkWidget           *widget);
+void       gtk_widget_show_all            (GtkWidget           *widget);
+void       gtk_widget_set_no_show_all     (GtkWidget           *widget,
+                                           gboolean             no_show_all);
+gboolean   gtk_widget_get_no_show_all     (GtkWidget           *widget);
 void      gtk_widget_map                 (GtkWidget           *widget);
 void      gtk_widget_unmap               (GtkWidget           *widget);
 void      gtk_widget_realize             (GtkWidget           *widget);
 void      gtk_widget_unrealize           (GtkWidget           *widget);
 
+void       gtk_widget_draw                (GtkWidget           *widget,
+                                           cairo_t             *cr);
 /* Queuing draws */
 void      gtk_widget_queue_draw          (GtkWidget           *widget);
 void      gtk_widget_queue_draw_area     (GtkWidget           *widget,
@@ -439,158 +486,342 @@ void       gtk_widget_queue_draw_area     (GtkWidget           *widget,
                                           gint                 y,
                                           gint                 width,
                                           gint                 height);
-void      gtk_widget_queue_clear         (GtkWidget           *widget);
-void      gtk_widget_queue_clear_area    (GtkWidget           *widget,
-                                          gint                 x,
-                                          gint                 y,
-                                          gint                 width,
-                                          gint                 height);
-
-
+void      gtk_widget_queue_draw_region   (GtkWidget           *widget,
+                                           const cairo_region_t*region);
 void      gtk_widget_queue_resize        (GtkWidget           *widget);
-void      gtk_widget_draw                (GtkWidget           *widget,
-                                          GdkRectangle        *area);
-void      gtk_widget_draw_focus          (GtkWidget           *widget);
-void      gtk_widget_draw_default        (GtkWidget           *widget);
-void      gtk_widget_size_request        (GtkWidget           *widget,
-                                          GtkRequisition      *requisition);
+void      gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
+GDK_AVAILABLE_IN_3_8
+GdkFrameClock* gtk_widget_get_frame_clock (GtkWidget           *widget);
+
+GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
+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);
+
+GtkSizeRequestMode  gtk_widget_get_request_mode               (GtkWidget      *widget);
+void                gtk_widget_get_preferred_width            (GtkWidget      *widget,
+                                                               gint           *minimum_width,
+                                                               gint           *natural_width);
+void                gtk_widget_get_preferred_height_for_width (GtkWidget      *widget,
+                                                               gint            width,
+                                                               gint           *minimum_height,
+                                                               gint           *natural_height);
+void                gtk_widget_get_preferred_height           (GtkWidget      *widget,
+                                                               gint           *minimum_height,
+                                                               gint           *natural_height);
+void                gtk_widget_get_preferred_width_for_height (GtkWidget      *widget,
+                                                               gint            height,
+                                                               gint           *minimum_width,
+                                                               gint           *natural_width);
+void                gtk_widget_get_preferred_size             (GtkWidget      *widget,
+                                                               GtkRequisition *minimum_size,
+                                                               GtkRequisition *natural_size);
+
+GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
+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,
+gboolean   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,
-                                          GtkAccelGroup       *accel_group,
-                                          guint                accel_key,
-                                          guint                accel_mods);
-void      gtk_widget_lock_accelerators   (GtkWidget           *widget);
-void      gtk_widget_unlock_accelerators (GtkWidget           *widget);
-gboolean   gtk_widget_accelerators_locked (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);
+GList*     gtk_widget_list_accel_closures (GtkWidget          *widget);
+gboolean   gtk_widget_can_activate_accel  (GtkWidget           *widget,
+                                           guint                signal_id);
+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_send_focus_change   (GtkWidget           *widget,
+                                           GdkEvent            *event);
 
 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,
-                                          GdkRectangle        *area,
+gboolean   gtk_widget_intersect                  (GtkWidget           *widget,
+                                          const GdkRectangle  *area,
                                           GdkRectangle        *intersection);
-
-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,
-                                          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_parent          (GtkWidget           *widget,
-                                          GtkWidget           *parent);
-void      gtk_widget_set_parent_window   (GtkWidget           *widget,
-                                          GdkWindow           *parent_window);
-GdkWindow *gtk_widget_get_parent_window          (GtkWidget           *widget);
-void      gtk_widget_set_uposition       (GtkWidget           *widget,
-                                          gint                 x,
-                                          gint                 y);
-void      gtk_widget_set_usize           (GtkWidget           *widget,
-                                          gint                 width,
-                                          gint                 height);
+cairo_region_t *gtk_widget_region_intersect      (GtkWidget           *widget,
+                                          const cairo_region_t     *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);
+
+void       gtk_widget_set_can_focus       (GtkWidget           *widget,
+                                           gboolean             can_focus);
+gboolean   gtk_widget_get_can_focus       (GtkWidget           *widget);
+gboolean   gtk_widget_has_focus           (GtkWidget           *widget);
+gboolean   gtk_widget_is_focus            (GtkWidget           *widget);
+GDK_AVAILABLE_IN_3_2
+gboolean   gtk_widget_has_visible_focus   (GtkWidget           *widget);
+void       gtk_widget_grab_focus          (GtkWidget           *widget);
+
+void       gtk_widget_set_can_default     (GtkWidget           *widget,
+                                           gboolean             can_default);
+gboolean   gtk_widget_get_can_default     (GtkWidget           *widget);
+gboolean   gtk_widget_has_default         (GtkWidget           *widget);
+void       gtk_widget_grab_default        (GtkWidget           *widget);
+
+void      gtk_widget_set_receives_default (GtkWidget           *widget,
+                                           gboolean             receives_default);
+gboolean  gtk_widget_get_receives_default (GtkWidget           *widget);
+
+gboolean   gtk_widget_has_grab            (GtkWidget           *widget);
+
+gboolean   gtk_widget_device_is_shadowed  (GtkWidget           *widget,
+                                           GdkDevice           *device);
+
+
+void                  gtk_widget_set_name               (GtkWidget    *widget,
+                                                        const gchar  *name);
+const gchar *         gtk_widget_get_name               (GtkWidget    *widget);
+
+void                  gtk_widget_set_state              (GtkWidget    *widget,
+                                                        GtkStateType  state);
+GtkStateType          gtk_widget_get_state              (GtkWidget    *widget);
+
+void                  gtk_widget_set_state_flags        (GtkWidget     *widget,
+                                                         GtkStateFlags  flags,
+                                                         gboolean       clear);
+void                  gtk_widget_unset_state_flags      (GtkWidget     *widget,
+                                                         GtkStateFlags  flags);
+GtkStateFlags         gtk_widget_get_state_flags        (GtkWidget     *widget);
+
+void                  gtk_widget_set_sensitive          (GtkWidget    *widget,
+                                                        gboolean      sensitive);
+gboolean              gtk_widget_get_sensitive          (GtkWidget    *widget);
+gboolean              gtk_widget_is_sensitive           (GtkWidget    *widget);
+
+void                  gtk_widget_set_visible            (GtkWidget    *widget,
+                                                         gboolean      visible);
+gboolean              gtk_widget_get_visible            (GtkWidget    *widget);
+gboolean              gtk_widget_is_visible             (GtkWidget    *widget);
+
+void                  gtk_widget_set_has_window         (GtkWidget    *widget,
+                                                         gboolean      has_window);
+gboolean              gtk_widget_get_has_window         (GtkWidget    *widget);
+
+gboolean              gtk_widget_is_toplevel            (GtkWidget    *widget);
+gboolean              gtk_widget_is_drawable            (GtkWidget    *widget);
+void                  gtk_widget_set_realized           (GtkWidget    *widget,
+                                                         gboolean      realized);
+gboolean              gtk_widget_get_realized           (GtkWidget    *widget);
+void                  gtk_widget_set_mapped             (GtkWidget    *widget,
+                                                         gboolean      mapped);
+gboolean              gtk_widget_get_mapped             (GtkWidget    *widget);
+
+void                  gtk_widget_set_app_paintable      (GtkWidget    *widget,
+                                                        gboolean      app_paintable);
+gboolean              gtk_widget_get_app_paintable      (GtkWidget    *widget);
+
+void                  gtk_widget_set_double_buffered    (GtkWidget    *widget,
+                                                        gboolean      double_buffered);
+gboolean              gtk_widget_get_double_buffered    (GtkWidget    *widget);
+
+void                  gtk_widget_set_redraw_on_allocate (GtkWidget    *widget,
+                                                        gboolean      redraw_on_allocate);
+
+void                  gtk_widget_set_parent             (GtkWidget    *widget,
+                                                        GtkWidget    *parent);
+GtkWidget           * gtk_widget_get_parent             (GtkWidget    *widget);
+
+void                  gtk_widget_set_parent_window      (GtkWidget    *widget,
+                                                        GdkWindow    *parent_window);
+GdkWindow           * gtk_widget_get_parent_window      (GtkWidget    *widget);
+
+void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
+                                                        gboolean      is_visible);
+gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
+
+void                  gtk_widget_set_window             (GtkWidget    *widget,
+                                                         GdkWindow    *window);
+GdkWindow           * gtk_widget_get_window             (GtkWidget    *widget);
+GDK_AVAILABLE_IN_3_8
+void                  gtk_widget_register_window        (GtkWidget    *widget,
+                                                         GdkWindow    *window);
+GDK_AVAILABLE_IN_3_8
+void                  gtk_widget_unregister_window      (GtkWidget    *widget,
+                                                         GdkWindow    *window);
+
+int                   gtk_widget_get_allocated_width    (GtkWidget     *widget);
+int                   gtk_widget_get_allocated_height   (GtkWidget     *widget);
+
+void                  gtk_widget_get_allocation         (GtkWidget     *widget,
+                                                         GtkAllocation *allocation);
+void                  gtk_widget_set_allocation         (GtkWidget     *widget,
+                                                         const GtkAllocation *allocation);
+
+void                  gtk_widget_get_requisition        (GtkWidget     *widget,
+                                                         GtkRequisition *requisition);
+
+gboolean   gtk_widget_child_focus         (GtkWidget           *widget,
+                                           GtkDirectionType     direction);
+gboolean   gtk_widget_keynav_failed       (GtkWidget           *widget,
+                                           GtkDirectionType     direction);
+void       gtk_widget_error_bell          (GtkWidget           *widget);
+
+void       gtk_widget_set_size_request    (GtkWidget           *widget,
+                                           gint                 width,
+                                           gint                 height);
+void       gtk_widget_get_size_request    (GtkWidget           *widget,
+                                           gint                *width,
+                                           gint                *height);
 void      gtk_widget_set_events          (GtkWidget           *widget,
                                           gint                 events);
 void       gtk_widget_add_events          (GtkWidget           *widget,
                                           gint                 events);
-void      gtk_widget_set_extension_events (GtkWidget           *widget,
-                                           GdkExtensionMode    mode);
+void      gtk_widget_set_device_events   (GtkWidget           *widget,
+                                           GdkDevice           *device,
+                                          GdkEventMask         events);
+void       gtk_widget_add_device_events   (GtkWidget           *widget,
+                                           GdkDevice           *device,
+                                          GdkEventMask         events);
+GDK_AVAILABLE_IN_3_8
+void      gtk_widget_set_opacity         (GtkWidget           *widget,
+                                          double               opacity);
+GDK_AVAILABLE_IN_3_8
+double    gtk_widget_get_opacity         (GtkWidget           *widget);
+
+void       gtk_widget_set_device_enabled  (GtkWidget    *widget,
+                                           GdkDevice    *device,
+                                           gboolean      enabled);
+gboolean   gtk_widget_get_device_enabled  (GtkWidget    *widget,
+                                           GdkDevice    *device);
 
-GdkExtensionMode gtk_widget_get_extension_events (GtkWidget    *widget);
 GtkWidget*   gtk_widget_get_toplevel   (GtkWidget      *widget);
 GtkWidget*   gtk_widget_get_ancestor   (GtkWidget      *widget,
-                                        GtkType        widget_type);
-GdkColormap* gtk_widget_get_colormap   (GtkWidget      *widget);
+                                        GType           widget_type);
 GdkVisual*   gtk_widget_get_visual     (GtkWidget      *widget);
+void         gtk_widget_set_visual     (GtkWidget      *widget,
+                                         GdkVisual      *visual);
+
+GdkScreen *   gtk_widget_get_screen      (GtkWidget *widget);
+gboolean      gtk_widget_has_screen      (GtkWidget *widget);
+GdkDisplay *  gtk_widget_get_display     (GtkWidget *widget);
+GdkWindow *   gtk_widget_get_root_window (GtkWidget *widget);
+GtkSettings*  gtk_widget_get_settings    (GtkWidget *widget);
+GtkClipboard *gtk_widget_get_clipboard   (GtkWidget *widget,
+                                         GdkAtom    selection);
+
+
+/* Expand flags and related support */
+gboolean gtk_widget_get_hexpand          (GtkWidget      *widget);
+void     gtk_widget_set_hexpand          (GtkWidget      *widget,
+                                          gboolean        expand);
+gboolean gtk_widget_get_hexpand_set      (GtkWidget      *widget);
+void     gtk_widget_set_hexpand_set      (GtkWidget      *widget,
+                                          gboolean        set);
+gboolean gtk_widget_get_vexpand          (GtkWidget      *widget);
+void     gtk_widget_set_vexpand          (GtkWidget      *widget,
+                                          gboolean        expand);
+gboolean gtk_widget_get_vexpand_set      (GtkWidget      *widget);
+void     gtk_widget_set_vexpand_set      (GtkWidget      *widget,
+                                          gboolean        set);
+void     gtk_widget_queue_compute_expand (GtkWidget      *widget);
+gboolean gtk_widget_compute_expand       (GtkWidget      *widget,
+                                          GtkOrientation  orientation);
+
+
+/* Multidevice support */
+gboolean         gtk_widget_get_support_multidevice (GtkWidget      *widget);
+void             gtk_widget_set_support_multidevice (GtkWidget      *widget,
+                                                     gboolean        support_multidevice);
+
+/* Accessibility support */
+GDK_AVAILABLE_IN_3_2
+void             gtk_widget_class_set_accessible_type    (GtkWidgetClass     *widget_class,
+                                                          GType               type);
+GDK_AVAILABLE_IN_3_2
+void             gtk_widget_class_set_accessible_role    (GtkWidgetClass     *widget_class,
+                                                          AtkRole             role);
+AtkObject*       gtk_widget_get_accessible               (GtkWidget          *widget);
+
+
+/* Margin and alignment */
+GtkAlign gtk_widget_get_halign        (GtkWidget *widget);
+void     gtk_widget_set_halign        (GtkWidget *widget,
+                                       GtkAlign   align);
+GtkAlign gtk_widget_get_valign        (GtkWidget *widget);
+void     gtk_widget_set_valign        (GtkWidget *widget,
+                                       GtkAlign   align);
+gint     gtk_widget_get_margin_left   (GtkWidget *widget);
+void     gtk_widget_set_margin_left   (GtkWidget *widget,
+                                       gint       margin);
+gint     gtk_widget_get_margin_right  (GtkWidget *widget);
+void     gtk_widget_set_margin_right  (GtkWidget *widget,
+                                       gint       margin);
+gint     gtk_widget_get_margin_top    (GtkWidget *widget);
+void     gtk_widget_set_margin_top    (GtkWidget *widget,
+                                       gint       margin);
+gint     gtk_widget_get_margin_bottom (GtkWidget *widget);
+void     gtk_widget_set_margin_bottom (GtkWidget *widget,
+                                       gint       margin);
 
-/* 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);
+GdkEventMask gtk_widget_get_device_events (GtkWidget   *widget,
+                                           GdkDevice    *device);
+GDK_DEPRECATED_IN_3_4_FOR(gdk_window_get_device_position)
 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);
-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);
+/* Functions to override widget styling */
+void         gtk_widget_override_color            (GtkWidget     *widget,
+                                                   GtkStateFlags  state,
+                                                   const GdkRGBA *color);
+void         gtk_widget_override_background_color (GtkWidget     *widget,
+                                                   GtkStateFlags  state,
+                                                   const GdkRGBA *color);
+
+void         gtk_widget_override_font             (GtkWidget                  *widget,
+                                                   const PangoFontDescription *font_desc);
+
+void         gtk_widget_override_symbolic_color   (GtkWidget     *widget,
+                                                   const gchar   *name,
+                                                   const GdkRGBA *color);
+void         gtk_widget_override_cursor           (GtkWidget       *widget,
+                                                   const GdkRGBA   *cursor,
+                                                   const GdkRGBA   *secondary_cursor);
+
+void       gtk_widget_reset_style       (GtkWidget      *widget);
 
 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_stock_icon       (GtkWidget      *widget,
-                                               const gchar    *stock_id,
-                                               const gchar    *size,
-                                               const gchar    *detail);
+GdkPixbuf    *gtk_widget_render_icon_pixbuf   (GtkWidget   *widget,
+                                               const gchar *stock_id,
+                                               GtkIconSize  size);
 
 /* handle composite names for GTK_COMPOSITE_CHILD widgets,
  * the returned name is newly allocated.
@@ -599,30 +830,35 @@ void   gtk_widget_set_composite_name      (GtkWidget      *widget,
                                         const gchar    *name);
 gchar* gtk_widget_get_composite_name   (GtkWidget      *widget);
      
-/* Descend recursively and set rc-style on all widgets without user styles */
-void       gtk_widget_reset_rc_styles   (GtkWidget      *widget);
-
 /* Push/pop pairs, to change default values upon a widget's creation.
  * 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_composite_child (void);
 void        gtk_widget_pop_composite_child  (void);
-void        gtk_widget_pop_style            (void);
-void        gtk_widget_pop_colormap         (void);
 
-/* 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);
-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
+/* 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);
+GParamSpec*  gtk_widget_class_find_style_property   (GtkWidgetClass     *klass,
+                                                    const gchar        *property_name);
+GParamSpec** gtk_widget_class_list_style_properties (GtkWidgetClass     *klass,
+                                                    guint              *n_properties);
+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,
+                                   ...) G_GNUC_NULL_TERMINATED;
+
+/* Functions for setting directionality for widgets */
 
 void             gtk_widget_set_direction         (GtkWidget        *widget,
                                                   GtkTextDirection  dir);
@@ -631,38 +867,74 @@ 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,
-                                           GdkBitmap *shape_mask,
-                                           gint       offset_x,
-                                           gint       offset_y);
+/* Compositing manager functionality */
+gboolean gtk_widget_is_composited (GtkWidget *widget);
 
-/* internal function */
-void        gtk_widget_reset_shapes       (GtkWidget *widget);
-
-/* Compute a widget's path in the form "GtkWindow.MyLabel", and
- * return newly alocated strings.
+/* Counterpart to gdk_window_shape_combine_region.
  */
-void        gtk_widget_path               (GtkWidget *widget,
-                                           guint     *path_length,
-                                           gchar    **path,
-                                           gchar    **path_reversed);
-void        gtk_widget_class_path         (GtkWidget *widget,
-                                           guint     *path_length,
-                                           gchar    **path,
-                                           gchar    **path_reversed);
-
-#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__ */
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+void        gtk_widget_shape_combine_region (GtkWidget *widget,
+                                              cairo_region_t *region);
+void        gtk_widget_input_shape_combine_region (GtkWidget *widget,
+                                                    cairo_region_t *region);
+
+GList* gtk_widget_list_mnemonic_labels  (GtkWidget *widget);
+void   gtk_widget_add_mnemonic_label    (GtkWidget *widget,
+                                        GtkWidget *label);
+void   gtk_widget_remove_mnemonic_label (GtkWidget *widget,
+                                        GtkWidget *label);
+
+void                  gtk_widget_set_tooltip_window    (GtkWidget   *widget,
+                                                        GtkWindow   *custom_window);
+GtkWindow *gtk_widget_get_tooltip_window    (GtkWidget   *widget);
+void       gtk_widget_trigger_tooltip_query (GtkWidget   *widget);
+void       gtk_widget_set_tooltip_text      (GtkWidget   *widget,
+                                             const gchar *text);
+gchar *    gtk_widget_get_tooltip_text      (GtkWidget   *widget);
+void       gtk_widget_set_tooltip_markup    (GtkWidget   *widget,
+                                             const gchar *markup);
+gchar *    gtk_widget_get_tooltip_markup    (GtkWidget   *widget);
+void       gtk_widget_set_has_tooltip       (GtkWidget   *widget,
+                                            gboolean     has_tooltip);
+gboolean   gtk_widget_get_has_tooltip       (GtkWidget   *widget);
+
+gboolean   gtk_cairo_should_draw_window     (cairo_t     *cr,
+                                             GdkWindow   *window);
+void       gtk_cairo_transform_to_window    (cairo_t     *cr,
+                                             GtkWidget   *widget,
+                                             GdkWindow   *window);
+
+GType           gtk_requisition_get_type (void) G_GNUC_CONST;
+GtkRequisition *gtk_requisition_new      (void) G_GNUC_MALLOC;
+GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
+void            gtk_requisition_free     (GtkRequisition       *requisition);
+
+gboolean     gtk_widget_in_destruction (GtkWidget *widget);
+
+GtkStyleContext * gtk_widget_get_style_context (GtkWidget *widget);
+
+GtkWidgetPath *   gtk_widget_get_path (GtkWidget *widget);
+
+GDK_AVAILABLE_IN_3_4
+GdkModifierType   gtk_widget_get_modifier_mask (GtkWidget         *widget,
+                                                GdkModifierIntent  intent);
+
+GDK_AVAILABLE_IN_3_6
+void                    gtk_widget_insert_action_group                  (GtkWidget    *widget,
+                                                                         const gchar  *name,
+                                                                         GActionGroup *group);
+
+
+
+GDK_AVAILABLE_IN_3_8
+guint gtk_widget_add_tick_callback (GtkWidget       *widget,
+                                    GtkTickCallback  callback,
+                                    gpointer         user_data,
+                                    GDestroyNotify   notify);
+
+GDK_AVAILABLE_IN_3_8
+void gtk_widget_remove_tick_callback (GtkWidget       *widget,
+                                      guint            id);
+
+G_END_DECLS
 
 #endif /* __GTK_WIDGET_H__ */