Finish making the GtkSettings object identical on all backends so that it doesn't...

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

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index afc03e9d84f00fd80b82db164517334026f367e2..c391b229a2c8e57aa935a6c10d52486b02f01969 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -323,8 +323,6 @@ struct _GtkWidgetClass
                                         GdkEventProximity   *event);
   gboolean (* visibility_notify_event) (GtkWidget           *widget,
                                         GdkEventVisibility  *event);
-  gboolean (* client_event)            (GtkWidget           *widget,
-                                        GdkEventClient      *event);
   gboolean (* window_state_event)      (GtkWidget           *widget,
                                         GdkEventWindowState *event);
   gboolean (* damage_event)             (GtkWidget           *widget,
@@ -375,6 +373,9 @@ struct _GtkWidgetClass
                                    GtkSelectionData   *selection_data,
                                    guint               info,
                                    guint               time_);
+  gboolean (* drag_failed)         (GtkWidget          *widget,
+                                    GdkDragContext     *context,
+                                    GtkDragResult       result);
 
   /* Signals used only for keybindings */
   gboolean (* popup_menu)          (GtkWidget          *widget);
@@ -415,6 +416,7 @@ struct _GtkWidgetClass
                                            gint              *natural_size);
   void         (* adjust_size_allocation) (GtkWidget         *widget,
                                            GtkOrientation     orientation,
+                                           gint              *minimum_size,
                                            gint              *natural_size,
                                            gint              *allocated_pos,
                                            gint              *allocated_size);
@@ -670,10 +672,13 @@ void         gtk_widget_set_device_events   (GtkWidget           *widget,
 void       gtk_widget_add_device_events   (GtkWidget           *widget,
                                            GdkDevice           *device,
                                           GdkEventMask         events);
-void      gtk_widget_set_extension_events (GtkWidget           *widget,
-                                           GdkExtensionMode    mode);
 
-GdkExtensionMode gtk_widget_get_extension_events (GtkWidget    *widget);
+void       gtk_widget_set_device_enabled  (GtkWidget    *widget,
+                                           GdkDevice    *device,
+                                           gboolean      enabled);
+gboolean   gtk_widget_get_device_enabled  (GtkWidget    *widget,
+                                           GdkDevice    *device);
+
 GtkWidget*   gtk_widget_get_toplevel   (GtkWidget      *widget);
 GtkWidget*   gtk_widget_get_ancestor   (GtkWidget      *widget,
                                         GType           widget_type);
@@ -773,11 +778,16 @@ void         gtk_widget_override_font             (GtkWidget                  *w
 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_style_attach               (GtkWidget     *widget);
+void       gtk_widget_reset_style       (GtkWidget      *widget);
 
 #if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
 
+void        gtk_widget_style_attach               (GtkWidget     *widget);
+
 /* Widget styles.
  */
 gboolean    gtk_widget_has_rc_style       (GtkWidget            *widget);
@@ -809,7 +819,6 @@ void        gtk_widget_modify_font        (GtkWidget            *widget,
 
 /* Descend recursively and set rc-style on all widgets without user styles */
 void       gtk_widget_reset_rc_styles   (GtkWidget      *widget);
-void       gtk_widget_reset_style       (GtkWidget      *widget);
 
 /* Set certain default values to be used at widget creation time  */
 GtkStyle*    gtk_widget_get_default_style    (void);
@@ -826,6 +835,10 @@ void            gtk_widget_class_path         (GtkWidget *widget,
                                            gchar    **path,
                                            gchar    **path_reversed);
 
+GdkPixbuf    *gtk_widget_render_icon          (GtkWidget   *widget,
+                                               const gchar *stock_id,
+                                               GtkIconSize  size,
+                                               const gchar *detail);
 #endif  /* GTK_DISABLE_DEPRECATED */
 
 PangoContext *gtk_widget_create_pango_context (GtkWidget   *widget);
@@ -833,10 +846,9 @@ 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,
+GdkPixbuf    *gtk_widget_render_icon_pixbuf   (GtkWidget   *widget,
                                                const gchar *stock_id,
-                                               GtkIconSize  size,
-                                               const gchar *detail);
+                                               GtkIconSize  size);
 
 /* handle composite names for GTK_COMPOSITE_CHILD widgets,
  * the returned name is newly allocated.
@@ -892,9 +904,6 @@ void             gtk_widget_shape_combine_region (GtkWidget *widget,
 void        gtk_widget_input_shape_combine_region (GtkWidget *widget,
                                                     cairo_region_t *region);
 
-/* internal function */
-void        gtk_widget_reset_shapes       (GtkWidget *widget);
-
 GList* gtk_widget_list_mnemonic_labels  (GtkWidget *widget);
 void   gtk_widget_add_mnemonic_label    (GtkWidget *widget,
                                         GtkWidget *label);