tests: Remove unused argument from treeview-scrolling test

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

diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index d2abd128bd1e179253b4e580e07844e76643c420..f27eb87c343d78fdf20f18ad0694d68c5c44720c 100644 (file)
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -37,6 +37,8 @@ G_BEGIN_DECLS
  * @GTK_CELL_RENDERER_INSENSITIVE: The cell is drawn in an insensitive manner
  * @GTK_CELL_RENDERER_SORTED: The cell is in a sorted row
  * @GTK_CELL_RENDERER_FOCUSED: The cell is in the focus row.
+ * @GTK_CELL_RENDERER_EXPANDABLE: The cell is in a row that can be expanded. Since 3.4
+ * @GTK_CELL_RENDERER_EXPANDED: The cell is in a row that is expanded. Since 3.4
  *
  * Tells how a cell is to be rendererd.
  */
@@ -47,7 +49,9 @@ typedef enum
   GTK_CELL_RENDERER_INSENSITIVE = 1 << 2,
   /* this flag means the cell is in the sort column/row */
   GTK_CELL_RENDERER_SORTED      = 1 << 3,
-  GTK_CELL_RENDERER_FOCUSED     = 1 << 4
+  GTK_CELL_RENDERER_FOCUSED     = 1 << 4,
+  GTK_CELL_RENDERER_EXPANDABLE  = 1 << 5,
+  GTK_CELL_RENDERER_EXPANDED    = 1 << 6
 } GtkCellRendererState;
 
 /**
@@ -78,6 +82,7 @@ typedef enum
 typedef struct _GtkCellRenderer              GtkCellRenderer;
 typedef struct _GtkCellRendererPrivate       GtkCellRendererPrivate;
 typedef struct _GtkCellRendererClass         GtkCellRendererClass;
+typedef struct _GtkCellRendererClassPrivate  GtkCellRendererClassPrivate;
 
 struct _GtkCellRenderer
 {
@@ -111,6 +116,11 @@ struct _GtkCellRendererClass
                                                           gint                  height,
                                                           gint                 *minimum_width,
                                                           gint                 *natural_width);
+  void               (* get_aligned_area)                (GtkCellRenderer      *cell,
+                                                          GtkWidget            *widget,
+                                                         GtkCellRendererState  flags,
+                                                          const GdkRectangle   *cell_area,
+                                                          GdkRectangle         *aligned_area);
   void               (* get_size)                        (GtkCellRenderer      *cell,
                                                           GtkWidget            *widget,
                                                           const GdkRectangle   *cell_area,
@@ -145,8 +155,9 @@ struct _GtkCellRendererClass
                             GtkCellEditable *editable,
                             const gchar     *path);
 
+  GtkCellRendererClassPrivate *priv;
+
   /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
@@ -177,15 +188,20 @@ void               gtk_cell_renderer_get_preferred_size             (GtkCellRend
                                                                      GtkWidget          *widget,
                                                                      GtkRequisition     *minimum_size,
                                                                      GtkRequisition     *natural_size);
-#ifndef GTK_DISABLE_DEPRECATED
+void               gtk_cell_renderer_get_aligned_area               (GtkCellRenderer    *cell,
+                                                                    GtkWidget          *widget,
+                                                                    GtkCellRendererState flags,
+                                                                    const GdkRectangle *cell_area,
+                                                                    GdkRectangle       *aligned_area);
+
+GDK_DEPRECATED_FOR(gtk_cell_renderer_get_preferred_size)
 void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
-                                                  GtkWidget            *widget,
-                                                  const GdkRectangle   *cell_area,
-                                                  gint                 *x_offset,
-                                                  gint                 *y_offset,
-                                                  gint                 *width,
-                                                  gint                 *height);
-#endif
+                                                   GtkWidget            *widget,
+                                                   const GdkRectangle   *cell_area,
+                                                   gint                 *x_offset,
+                                                   gint                 *y_offset,
+                                                   gint                 *width,
+                                                   gint                 *height);
 void             gtk_cell_renderer_render         (GtkCellRenderer      *cell,
                                                    cairo_t              *cr,
                                                   GtkWidget            *widget,
@@ -236,6 +252,8 @@ void             gtk_cell_renderer_set_sensitive  (GtkCellRenderer      *cell,
                                                    gboolean              sensitive);
 gboolean         gtk_cell_renderer_get_sensitive  (GtkCellRenderer      *cell);
 
+gboolean         gtk_cell_renderer_is_activatable (GtkCellRenderer      *cell);
+
 /* For use by cell renderer implementations only */
 void             gtk_cell_renderer_stop_editing   (GtkCellRenderer      *cell,
                                                    gboolean              canceled);
@@ -249,6 +267,16 @@ void            _gtk_cell_renderer_calc_offset    (GtkCellRenderer      *cell,
                                                    gint                 *x_offset,
                                                    gint                 *y_offset);
 
+GtkStateFlags   gtk_cell_renderer_get_state       (GtkCellRenderer      *cell,
+                                                   GtkWidget            *widget,
+                                                   GtkCellRendererState  cell_state);
+
+void            _gtk_cell_renderer_class_set_accessible_type 
+                                                  (GtkCellRendererClass *renderer_class,
+                                                   GType                 type);
+GType           _gtk_cell_renderer_get_accessible_type
+                                                  (GtkCellRenderer *     renderer);
+
 G_END_DECLS
 
 #endif /* __GTK_CELL_RENDERER_H__ */