X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpspp-sheet-view-column.c;h=bff3d330c1181994cadee94d9d3d70b21eaf0f56;hb=5206c60ba8beaddccdf571db65709b38dbadb3fd;hp=67e43409541209b965996381e2e7c4d616470c24;hpb=a6b9f4c6618e164059e7aaec9abece94077ace9e;p=pspp

diff --git a/src/ui/gui/pspp-sheet-view-column.c b/src/ui/gui/pspp-sheet-view-column.c
index 67e4340954..bff3d330c1 100644
--- a/src/ui/gui/pspp-sheet-view-column.c
+++ b/src/ui/gui/pspp-sheet-view-column.c
@@ -437,12 +437,34 @@ pspp_sheet_view_column_class_init (PsppSheetViewColumnClass *class)
                                                          GTK_PARAM_READWRITE));
 }
 
+
+static void _cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
+						   GtkBuilder   *builder,
+						   GObject      *child,
+						   const gchar  *tagname,
+						   gpointer     *data);
+
+
+static void _cell_layout_buildable_add_child (GtkBuildable      *buildable,
+						  GtkBuilder        *builder,
+						  GObject           *child,
+						  const gchar       *type);
+
+
+static gboolean _cell_layout_buildable_custom_tag_start (GtkBuildable  *buildable,
+                                             GtkBuilder    *builder,
+                                             GObject       *child,
+                                             const gchar   *tagname,
+                                             GMarkupParser *parser,
+					 gpointer      *data);
+
+
 static void
 pspp_sheet_view_column_buildable_init (GtkBuildableIface *iface)
 {
-  iface->add_child = _gtk_cell_layout_buildable_add_child;
-  iface->custom_tag_start = _gtk_cell_layout_buildable_custom_tag_start;
-  iface->custom_tag_end = _gtk_cell_layout_buildable_custom_tag_end;
+  iface->add_child = _cell_layout_buildable_add_child;
+  iface->custom_tag_start = _cell_layout_buildable_custom_tag_start;
+  iface->custom_tag_end = _cell_layout_buildable_custom_tag_end;
 }
 
 static void
@@ -1577,7 +1599,6 @@ _pspp_sheet_view_column_realize_button (PsppSheetViewColumn *column)
   attr.window_type = GDK_WINDOW_CHILD;
   attr.wclass = GDK_INPUT_ONLY;
   attr.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
-  attr.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
   attr.event_mask = gtk_widget_get_events (GTK_WIDGET (tree_view)) |
                     (GDK_BUTTON_PRESS_MASK |
 		     GDK_BUTTON_RELEASE_MASK |
@@ -3101,7 +3122,7 @@ enum {
 
 static gboolean
 pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn  *tree_column,
-					  GdkWindow          *window,
+					    cairo_t *cr,
 					  const GdkRectangle *background_area,
 					  const GdkRectangle *cell_area,
 					  guint               flags,
@@ -3260,11 +3281,10 @@ pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn  *tree_column,
       if (action == CELL_ACTION_RENDER)
 	{
 	  gtk_cell_renderer_render (info->cell,
-				    window,
+				    cr,
 				    tree_column->tree_view,
 				    &rtl_background_area,
 				    &rtl_cell_area,
-				    &real_expose_area, 
 				    flags);
 	}
       /* FOCUS */
@@ -3425,11 +3445,10 @@ pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn  *tree_column,
       if (action == CELL_ACTION_RENDER)
 	{
 	  gtk_cell_renderer_render (info->cell,
-				    window,
+				    cr,
 				    tree_column->tree_view,
 				    &rtl_background_area,
 				    &rtl_cell_area,
-				    &real_expose_area,
 				    flags);
 	}
       /* FOCUS */
@@ -3581,7 +3600,7 @@ pspp_sheet_view_column_cell_process_action (PsppSheetViewColumn  *tree_column,
  **/
 void
 _pspp_sheet_view_column_cell_render (PsppSheetViewColumn  *tree_column,
-				   GdkWindow          *window,
+				     cairo_t *cr,
 				   const GdkRectangle *background_area,
 				   const GdkRectangle *cell_area,
 				   const GdkRectangle *expose_area,
@@ -3593,7 +3612,7 @@ _pspp_sheet_view_column_cell_render (PsppSheetViewColumn  *tree_column,
   g_return_if_fail (expose_area != NULL);
 
   pspp_sheet_view_column_cell_process_action (tree_column,
-					    window,
+					      cr,
 					    background_area,
 					    cell_area,
 					    flags,
@@ -3893,7 +3912,7 @@ _pspp_sheet_view_column_cell_focus (PsppSheetViewColumn *tree_column,
 
 void
 _pspp_sheet_view_column_cell_draw_focus (PsppSheetViewColumn  *tree_column,
-				       GdkWindow          *window,
+					 cairo_t *cr,
 				       const GdkRectangle *background_area,
 				       const GdkRectangle *cell_area,
 				       const GdkRectangle *expose_area,
@@ -3926,7 +3945,7 @@ _pspp_sheet_view_column_cell_draw_focus (PsppSheetViewColumn  *tree_column,
     {
       GdkRectangle focus_rectangle;
       pspp_sheet_view_column_cell_process_action (tree_column,
-						window,
+						  cr,
 						background_area,
 						cell_area,
 						flags,
@@ -3938,10 +3957,10 @@ _pspp_sheet_view_column_cell_draw_focus (PsppSheetViewColumn  *tree_column,
       cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
 	      (flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
 	      (flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL));
+
       gtk_paint_focus (gtk_widget_get_style (GTK_WIDGET (tree_column->tree_view)),
-		       window,
+		       cr,
 		       cell_state,
-		       cell_area,
 		       tree_column->tree_view,
 		       "treeview",
 		       focus_rectangle.x,
@@ -4280,8 +4299,8 @@ static const GMarkupParser attributes_parser =
     attributes_text_element,
   };
 
-gboolean
-_gtk_cell_layout_buildable_custom_tag_start (GtkBuildable  *buildable,
+static gboolean
+_cell_layout_buildable_custom_tag_start (GtkBuildable  *buildable,
                                              GtkBuilder    *builder,
                                              GObject       *child,
                                              const gchar   *tagname,
@@ -4308,8 +4327,8 @@ _gtk_cell_layout_buildable_custom_tag_start (GtkBuildable  *buildable,
   return FALSE;
 }
 
-void
-_gtk_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
+static void
+_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
                                            GtkBuilder   *builder,
                                            GObject      *child,
                                            const gchar  *tagname,
@@ -4322,8 +4341,8 @@ _gtk_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable,
   g_slice_free (AttributesSubParserData, parser_data);
 }
 
-void
-_gtk_cell_layout_buildable_add_child (GtkBuildable      *buildable,
+static void
+_cell_layout_buildable_add_child (GtkBuildable      *buildable,
                                       GtkBuilder        *builder,
                                       GObject           *child,
                                       const gchar       *type)