X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpspp-sheet-view-column.c;h=f105d189c3d6c52ff55cf86789983a1bfaf50ffd;hb=f50fd75b45786d9cd4f2c98d4076804d46795bec;hp=d4633672014865078debf4ba50d05a9a74a1015e;hpb=8298a4c6e326a39e204ca58d686497758333a102;p=pspp

diff --git a/src/ui/gui/pspp-sheet-view-column.c b/src/ui/gui/pspp-sheet-view-column.c
index d463367201..f105d189c3 100644
--- a/src/ui/gui/pspp-sheet-view-column.c
+++ b/src/ui/gui/pspp-sheet-view-column.c
@@ -145,7 +145,7 @@ void pspp_sheet_view_column_update_button                 (PsppSheetViewColumn
 
 /* Button signal handlers */
 static gint pspp_sheet_view_column_button_event                  (GtkWidget               *widget,
-								GdkEvent                *event,
+								GdkEventButton             *event,
 								gpointer                 data);
 static void pspp_sheet_view_column_button_clicked                (GtkWidget               *widget,
 								gpointer                 data);
@@ -1046,7 +1046,7 @@ pspp_sheet_view_column_create_button (PsppSheetViewColumn *tree_column)
 
   tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   tree_column->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
 
   if (tree_column->child)
@@ -1254,7 +1254,7 @@ pspp_sheet_view_column_update_button (PsppSheetViewColumn *tree_column)
 
 static gint
 pspp_sheet_view_column_button_event (GtkWidget *widget,
-				   GdkEvent  *event,
+				   GdkEventButton  *event,
 				   gpointer   data)
 {
   PsppSheetViewColumn *column = (PsppSheetViewColumn *) data;
@@ -1266,7 +1266,8 @@ pspp_sheet_view_column_button_event (GtkWidget *widget,
       ((GdkEventButton *)event)->button == 1)
     {
       column->maybe_reordered = TRUE;
-      gdk_window_get_pointer (gtk_button_get_event_window (GTK_BUTTON (widget)),
+      gdk_window_get_device_position (gtk_button_get_event_window (GTK_BUTTON (widget)),
+				      event->device,
 			      &column->drag_x,
 			      &column->drag_y,
 			      NULL);
@@ -1615,7 +1616,7 @@ _pspp_sheet_view_column_realize_button (PsppSheetViewColumn *column)
 
   pspp_sheet_view_column_update_button (column);
 
-  gdk_cursor_unref (attr.cursor);
+  g_object_unref (attr.cursor);
 }
 
 void