Typo fix. (#388123, Murray Cumming)

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

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index ac7eed5e2ee8d7e66819161ca72b1569c11a44c7..cb5841fbd3a97e2410568cbfc5918322ed639ecb 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -35,10 +35,7 @@
 #include <gtk/gtksettings.h>
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 /* The flags that are used by GtkWidget on top of the
  * flags field of GtkObject.
@@ -182,7 +179,7 @@ struct _GtkWidget
    */
   guint8 state;
   
-  /* The saved state of the widget. When a widgets state
+  /* The saved state of the widget. When a widget's 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
@@ -190,9 +187,9 @@ struct _GtkWidget
    */
   guint8 saved_state;
   
-  /* The widgets name. If the widget does not have a name
+  /* The widget's 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.
+   *  "gtk_widget_get_name") is its class's name.
    * Among other things, the widget name is used to determine
    *  the style to use for a widget.
    */
@@ -207,21 +204,21 @@ struct _GtkWidget
    */
   GtkStyle *style;
   
-  /* The widgets desired size.
+  /* The widget's desired size.
    */
   GtkRequisition requisition;
   
-  /* The widgets allocated size.
+  /* The widget's allocated size.
    */
   GtkAllocation allocation;
   
-  /* The widgets window or its parent window if it does
+  /* The widget's 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.
+  /* The widget's parent.
    */
   GtkWidget *parent;
 };
@@ -406,9 +403,13 @@ struct _GtkWidgetClass
   gboolean     (*can_activate_accel) (GtkWidget *widget,
                                       guint      signal_id);
 
+  /* Sent when a grab is broken. */
+  gboolean (*grab_broken_event) (GtkWidget          *widget,
+                                 GdkEventGrabBroken  *event);
+
+  void         (* composited_changed) (GtkWidget *widget);
+
   /* Padding for future expansion */
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
   void (*_gtk_reserved5) (void);
   void (*_gtk_reserved6) (void);
@@ -444,7 +445,7 @@ void           gtk_widget_destroyed           (GtkWidget           *widget,
 #ifndef GTK_DISABLE_DEPRECATED
 void      gtk_widget_set                 (GtkWidget           *widget,
                                           const gchar         *first_property_name,
-                                          ...);
+                                          ...) G_GNUC_NULL_TERMINATED;
 #endif /* GTK_DISABLE_DEPRECATED */
 void      gtk_widget_unparent            (GtkWidget           *widget);
 void      gtk_widget_show                (GtkWidget           *widget);
@@ -562,6 +563,9 @@ GdkWindow *gtk_widget_get_parent_window       (GtkWidget           *widget);
 
 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,
@@ -716,7 +720,7 @@ void gtk_widget_style_get_valist   (GtkWidget            *widget,
                                    va_list         var_args);
 void gtk_widget_style_get          (GtkWidget       *widget,
                                    const gchar    *first_property_name,
-                                   ...);
+                                   ...) G_GNUC_NULL_TERMINATED;
 
 
 /* Set certain default values to be used at widget creation time.
@@ -738,12 +742,19 @@ GtkTextDirection gtk_widget_get_direction         (GtkWidget        *widget);
 void             gtk_widget_set_default_direction (GtkTextDirection  dir);
 GtkTextDirection gtk_widget_get_default_direction (void);
 
+/* Compositing manager functionality */
+gboolean gtk_widget_is_composited (GtkWidget *widget);
+
 /* Counterpart to gdk_window_shape_combine_mask.
  */
 void        gtk_widget_shape_combine_mask (GtkWidget *widget,
                                            GdkBitmap *shape_mask,
                                            gint       offset_x,
                                            gint       offset_y);
+void        gtk_widget_input_shape_combine_mask (GtkWidget *widget,
+                                                 GdkBitmap *shape_mask,
+                                                 gint       offset_x,
+                                                 gint       offset_y);
 
 /* internal function */
 void        gtk_widget_reset_shapes       (GtkWidget *widget);
@@ -760,13 +771,13 @@ void           gtk_widget_class_path         (GtkWidget *widget,
                                            gchar    **path,
                                            gchar    **path_reversed);
 
-GList* gtk_widget_get_mnemonic_labels   (GtkWidget *widget);
+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);
 
-GType           gtk_requisition_get_type (void);
+GType           gtk_requisition_get_type (void) G_GNUC_CONST;
 GtkRequisition *gtk_requisition_copy     (const GtkRequisition *requisition);
 void            gtk_requisition_free     (GtkRequisition       *requisition);
 
@@ -775,18 +786,19 @@ void            gtk_requisition_free     (GtkRequisition       *requisition);
 #  define gtk_widget_unref gtk_object_unref
 #endif /* GTK_TRACE_OBJECTS && __GNUC__ */
 
+void              _gtk_widget_grab_notify                 (GtkWidget    *widget,
+                                                          gboolean     was_grabbed);
+
 GtkWidgetAuxInfo *_gtk_widget_get_aux_info                (GtkWidget    *widget,
                                                           gboolean      create);
 void              _gtk_widget_propagate_hierarchy_changed (GtkWidget    *widget,
                                                           GtkWidget    *previous_toplevel);
 void              _gtk_widget_propagate_screen_changed    (GtkWidget    *widget,
                                                           GdkScreen    *previous_screen);
+void             _gtk_widget_propagate_composited_changed (GtkWidget    *widget);
 
 GdkColormap* _gtk_widget_peek_colormap (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_WIDGET_H__ */