Update remaining gtk_paint_focus calls to Gtk3 signature

[pspp] / src / ui / gui / pspp-sheet-view.c

diff --git a/src/ui/gui/pspp-sheet-view.c b/src/ui/gui/pspp-sheet-view.c
index 49899a9b90afa869ad4eae5cc729e02993f48a75..d474566788be2ebed8b010fee8ab970c5ec83649 100644 (file)
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -1477,10 +1477,9 @@ pspp_sheet_view_realize (GtkWidget *widget)
   attributes.height = allocation.height;
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
   attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK;
 
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
 
   gtk_widget_set_window (widget,
                         gdk_window_new (gtk_widget_get_parent_window (widget),
@@ -3749,10 +3748,11 @@ invalidate_empty_focus (PsppSheetView *tree_view)
  * is empty.
  */
 static void
-draw_empty_focus (PsppSheetView *tree_view, GdkRectangle *clip_area)
+draw_empty_focus (PsppSheetView *tree_view)
 {
   GtkWidget *widget = GTK_WIDGET (tree_view);
   gint w, h;
+  cairo_t *cr = gdk_cairo_create (tree_view->priv->bin_window);
 
   if (!gtk_widget_has_focus (widget))
     return;
@@ -3765,12 +3765,12 @@ draw_empty_focus (PsppSheetView *tree_view, GdkRectangle *clip_area)
 
   if (w > 0 && h > 0)
     gtk_paint_focus (gtk_widget_get_style (widget),
-                    tree_view->priv->bin_window,
+                    cr,
                     gtk_widget_get_state (widget),
-                    clip_area,
                     widget,
                     NULL,
                     1, 1, w, h);
+  cairo_destroy (cr);
 }
 
 static void
@@ -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);
@@ -3872,7 +3874,7 @@ pspp_sheet_view_bin_expose (GtkWidget      *widget,
 
   if (tree_view->priv->row_count == 0)
     {
-      draw_empty_focus (tree_view, &Zarea);
+      draw_empty_focus (tree_view);
       return TRUE;
     }
 
@@ -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,
@@ -7703,9 +7694,8 @@ _pspp_sheet_view_column_start_drag (PsppSheetView       *tree_view,
       attributes.width = column->allocation.width;
       attributes.height = column->allocation.height;
       attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
-      attributes.colormap = gtk_widget_get_colormap (GTK_WIDGET (tree_view));
       attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
-      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+      attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL ;
 
       tree_view->priv->drag_window = gdk_window_new (tree_view->priv->bin_window,
                                                     &attributes,
@@ -7737,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;
 
@@ -12537,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");