X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpspp-sheet-view.c;h=d474566788be2ebed8b010fee8ab970c5ec83649;hb=2d2a7bf72aaf1f117faeaddb207108463561302f;hp=b97e14d6c6dc6d494034d273b2ca07cae05b6b62;hpb=45b796f476903a96d6abc58c9811aa64dce9d0c9;p=pspp

diff --git a/src/ui/gui/pspp-sheet-view.c b/src/ui/gui/pspp-sheet-view.c
index b97e14d6c6..d474566788 100644
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -3851,6 +3851,8 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
   gboolean draw_vgrid_lines, draw_hgrid_lines;
   gint min_y, max_y;
   cairo_t *cr = gdk_cairo_create (event->window);
+
+  cairo_t *bwcr = gdk_cairo_create (tree_view->priv->bin_window);
   GdkRectangle Zarea;
   GtkAllocation allocation;
   gtk_widget_get_allocation (widget, &allocation);
@@ -3899,10 +3901,9 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
   if (tree_view->priv->height < bin_window_height)
     {
       gtk_paint_flat_box (gtk_widget_get_style (widget),
-                          event->window,
+                          cr,
                           gtk_widget_get_state (widget),
                           GTK_SHADOW_NONE,
-                          &Zarea,
                           widget,
                           "cell_even",
                           0, tree_view->priv->height,
@@ -4175,10 +4176,9 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 		g_snprintf (new_detail, 128, "%s_middle", detail);
 
 	      gtk_paint_flat_box (gtk_widget_get_style (widget),
-				  event->window,
+				  cr,
 				  state,
 				  GTK_SHADOW_NONE,
-				  &Zarea,
 				  widget,
 				  new_detail,
 				  background_area.x,
@@ -4189,10 +4189,9 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 	  else
 	    {
 	      gtk_paint_flat_box (gtk_widget_get_style (widget),
-				  event->window,
+				  cr,
 				  state,
 				  GTK_SHADOW_NONE,
-				  &Zarea,
 				  widget,
 				  detail,
 				  background_area.x,
@@ -4240,10 +4239,9 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 	    }
 
           _pspp_sheet_view_column_cell_render (column,
-                                               event->window,
+                                               cr,
                                                &background_area,
                                                &cell_area,
-                                               &Zarea,
                                                flags);
 
           if (node == cursor && has_special_cell &&
@@ -4253,10 +4251,9 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 	       (column == tree_view->priv->edited_column)))
 	    {
 	      _pspp_sheet_view_column_cell_draw_focus (column,
-						     event->window,
+						       cr,
 						     &background_area,
 						     &cell_area,
-						     &Zarea,
 						     flags);
 	    }
 
@@ -4266,10 +4263,9 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
       if (cell_offset < Zarea.x)
         {
           gtk_paint_flat_box (gtk_widget_get_style (widget),
-                              event->window,
+                              cr,
                               GTK_STATE_NORMAL,
                               GTK_SHADOW_NONE,
-                              &Zarea,
                               widget,
                               "base",
                               cell_offset,
@@ -4308,9 +4304,8 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 
 	      if (row_ending_details)
 		gtk_paint_focus (gtk_widget_get_style (widget),
-			         tree_view->priv->bin_window,
+			         bwcr,
 				 gtk_widget_get_state (widget),
-				 &Zarea,
 				 widget,
 				 (is_first
 				  ? (is_last ? "treeview-drop-indicator" : "treeview-drop-indicator-left" )
@@ -4321,9 +4316,8 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 			       - focus_line_width + 1);
 	      else
 		gtk_paint_focus (gtk_widget_get_style (widget),
-			         tree_view->priv->bin_window,
+			         bwcr,
 				 gtk_widget_get_state (widget),
-				 &Zarea,
 				 widget,
 				 "treeview-drop-indicator",
 				 0, BACKGROUND_FIRST_PIXEL (tree_view, node)
@@ -4376,9 +4370,8 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 
 	  if (row_ending_details)
 	    gtk_paint_focus (gtk_widget_get_style (widget),
-			     tree_view->priv->bin_window,
+			     bwcr,
 			     focus_rect_state,
-			     &Zarea,
 			     widget,
 			     (is_first
 			      ? (is_last ? "treeview" : "treeview-left" )
@@ -4387,9 +4380,8 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 			     width, tmp_height);
 	  else
 	    gtk_paint_focus (gtk_widget_get_style (widget),
-			     tree_view->priv->bin_window,
+			     bwcr,
 			     focus_rect_state,
-			     &Zarea,
 			     widget,
 			     "treeview",
 			     0, tmp_y,
@@ -4481,10 +4473,9 @@ pspp_sheet_view_expose (GtkWidget      *widget,
       GList *list;
 
       gtk_paint_flat_box (gtk_widget_get_style (widget),
-                          event->window,
+                          cr,
                           GTK_STATE_NORMAL,
                           GTK_SHADOW_NONE,
-                          &event->area,
                           widget,
                           "cell_odd",
                           event->area.x,
@@ -7736,7 +7727,9 @@ _pspp_sheet_view_column_start_drag (PsppSheetView       *tree_view,
   send_event->button.axes = NULL;
   send_event->button.state = 0;
   send_event->button.button = 1;
-  send_event->button.device = gdk_display_get_core_pointer (display);
+  send_event->button.device = 
+    gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (display));
+
   send_event->button.x_root = 0;
   send_event->button.y_root = 0;
 
@@ -12536,7 +12529,7 @@ pspp_sheet_view_event (GtkWidget *widget,
   gtk_tree_path_free (path);
 
   handled = gtk_binding_set_activate (edit_bindings, keyval, event->state,
-                                      GTK_OBJECT (tree_view));
+                                      G_OBJECT (tree_view));
   if (handled)
     g_signal_stop_emission_by_name (widget, "event");