Merge remote-tracking branch 'origin/master' into sheet

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

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 66ec49930a1878430b0729887dd968f5898e9f12..f1712ad4b7f683b74110ebbdc641dd8af13840a8 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -20,7 +20,6 @@
 #include "ui/gui/psppire-data-editor.h"
 
 #include <gtk/gtk.h>
-#include <gtk-contrib/gtkxpaned.h>
 
 #include "data/datasheet.h"
 #include "data/value-labels.h"
@@ -41,7 +40,7 @@
 #include "ui/gui/psppire-data-sheet.h"
 
 
-#include "ui/gui/efficient-sheet/src/ssw-sheet.h"
+#include <ssw-sheet.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -168,7 +167,16 @@ psppire_data_editor_set_property (GObject         *object,
 
       g_object_set (de->var_sheet, "data-model", de->dict, NULL);
       break;
+
     case PROP_VALUE_LABELS:
+      {
+       gboolean l = g_value_get_boolean (value);
+       g_object_set (de->data_sheet, "forward-conversion",
+                     l ?
+                     psppire_data_store_value_to_string_with_labels :
+                     psppire_data_store_value_to_string,
+                     NULL);
+      }
       break;
 
     default: