uint -> guint

[pspp] / src / ui / gui / psppire-data-sheet.c

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 59268d21f431a3e569e8f7f3a4ddff654ebad02e..8cc32859a4f1c90c81ad3149d8304da28a94deca 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -110,7 +110,7 @@ gboolean myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in
 
 static void
 show_cases_row_popup (PsppireDataSheet *sheet, int row,
-                     uint button, uint state, gpointer p)
+                     guint button, guint state, gpointer p)
 {
   GListModel *vmodel = NULL;
   g_object_get (sheet, "vmodel", &vmodel, NULL);
@@ -186,7 +186,7 @@ create_data_row_header_popup_menu (PsppireDataSheet *sheet)
 
 
 static void
-show_cases_column_popup (PsppireDataSheet *sheet, int column, uint button, uint state,
+show_cases_column_popup (PsppireDataSheet *sheet, int column, guint button, guint state,
                         gpointer p)
 {
   GListModel *hmodel = NULL;
@@ -351,6 +351,8 @@ psppire_data_sheet_new (void)
     g_object_new (PSPPIRE_TYPE_DATA_SHEET,
                  "forward-conversion", psppire_data_store_value_to_string,
                  "reverse-conversion", myreversefunc,
+                 "editable", TRUE,
+                 "horizontal-draggable", TRUE,
                  NULL);
 
   return GTK_WIDGET (obj);
@@ -360,7 +362,7 @@ psppire_data_sheet_new (void)
 static gboolean
 indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
 {
-  guint row = g_object_get_data (widget, "row");
+  guint row = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "row"));
 
   if (!psppire_data_store_filtered (store, row))
     return FALSE;
@@ -376,12 +378,12 @@ indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
 }
 
 static void
-button_post_create (GtkWidget *button, uint i, gpointer user_data)
+button_post_create (GtkWidget *button, guint i, gpointer user_data)
 {
   PsppireDataStore *data_store = PSPPIRE_DATA_STORE (user_data);
 
-  g_object_set_data (button, "row", GUINT_TO_POINTER (i));
-  g_signal_connect_after (button, "draw", indicate_filtered_case, data_store);
+  g_object_set_data (G_OBJECT (button), "row", GUINT_TO_POINTER (i));
+  g_signal_connect_after (button, "draw", G_CALLBACK (indicate_filtered_case), data_store);
 }
 
 static void