docs: Fix building with latest GDK changes

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

diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 2c35956726c3047fde73d2954de157b8095ffcf9..2304f69ab7523e32ba7e9836d114a2f52afd30a9 100644 (file)
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -102,6 +102,8 @@ struct _GtkTreeViewPrivate
   /* Adjustments */
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
+  gint           min_display_width;
+  gint           min_display_height;
 
   /* Sub windows */
   GdkWindow *bin_window;
@@ -240,7 +242,7 @@ struct _GtkTreeViewPrivate
   GDestroyNotify search_position_destroy;
   GtkWidget *search_window;
   GtkWidget *search_entry;
-  guint search_entry_changed_id;
+  gulong search_entry_changed_id;
   guint typeselect_flush_timeout;
 
   /* Grid and tree lines */
@@ -300,6 +302,11 @@ struct _GtkTreeViewPrivate
 
   /* Whether our key press handler is to avoid sending an unhandled binding to the search entry */
   guint search_entry_avoid_unhandled_binding : 1;
+
+  /* GtkScrollablePolicy needs to be checked when
+   * driving the scrollable adjustment values */
+  guint hscroll_policy : 1;
+  guint vscroll_policy : 1;
 };
 
 #ifdef __GNUC__
@@ -439,10 +446,9 @@ gboolean          _gtk_tree_selection_row_is_selectable  (GtkTreeSelection *sele
                                                          GtkTreePath      *path);
 
 void             _gtk_tree_view_column_cell_render      (GtkTreeViewColumn  *tree_column,
-                                                         GdkWindow          *window,
+                                                         cairo_t            *cr,
                                                          const GdkRectangle *background_area,
                                                          const GdkRectangle *cell_area,
-                                                         const GdkRectangle *expose_area,
                                                          guint               flags);
 void             _gtk_tree_view_column_get_focus_area   (GtkTreeViewColumn  *tree_column,
                                                          const GdkRectangle *background_area,
@@ -453,10 +459,9 @@ gboolean     _gtk_tree_view_column_cell_focus       (GtkTreeViewColumn  *tree_colu
                                                          gboolean            left,
                                                          gboolean            right);
 void             _gtk_tree_view_column_cell_draw_focus  (GtkTreeViewColumn  *tree_column,
-                                                         GdkWindow          *window,
+                                                         cairo_t            *cr,
                                                          const GdkRectangle *background_area,
                                                          const GdkRectangle *cell_area,
-                                                         const GdkRectangle *expose_area,
                                                          guint               flags);
 void             _gtk_tree_view_column_cell_set_dirty   (GtkTreeViewColumn  *tree_column,
                                                          gboolean            install_handler);