Add remaining custom psppire widgets to our glade tools

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 910f390751d575b11bc9820cfdf85f460651189c..37dbdb4e82e56f56674532aa3ec488292e3caa12 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -173,8 +173,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire.c \
        src/ui/gui/psppire-data-editor.c \
        src/ui/gui/psppire-data-editor.h \
-       src/ui/gui/psppire-data-sheet.c \
-       src/ui/gui/psppire-data-sheet.h \
        src/ui/gui/psppire-data-store.c \
        src/ui/gui/psppire-data-store.h \
        src/ui/gui/psppire-data-window.c \
@@ -200,10 +198,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-syntax-window.h \
        src/ui/gui/psppire-value-entry.c \
        src/ui/gui/psppire-value-entry.h \
-       src/ui/gui/psppire-variable-sheet.c \
-       src/ui/gui/psppire-variable-sheet.h \
-       src/ui/gui/psppire-var-sheet-header.c \
-       src/ui/gui/psppire-var-sheet-header.h \
        src/ui/gui/psppire-window.c \
        src/ui/gui/psppire-window.h \
        src/ui/gui/psppire-window-register.c \
@@ -234,6 +228,8 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
        src/ui/gui/psppire-checkbox-treeview.h \
        src/ui/gui/psppire-conf.c \
        src/ui/gui/psppire-conf.h \
+       src/ui/gui/psppire-data-sheet.c \
+       src/ui/gui/psppire-data-sheet.h \
        src/ui/gui/psppire-dialog-action-1sks.c \
        src/ui/gui/psppire-dialog-action-1sks.h \
        src/ui/gui/psppire-dialog-action-aggregate.c \
@@ -344,6 +340,10 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
        src/ui/gui/psppire-var-ptr.h \
        src/ui/gui/psppire-var-view.c \
        src/ui/gui/psppire-var-view.h \
+       src/ui/gui/psppire-var-sheet-header.c \
+       src/ui/gui/psppire-var-sheet-header.h \
+       src/ui/gui/psppire-variable-sheet.c \
+       src/ui/gui/psppire-variable-sheet.h \
        src/ui/gui/psppire-window-base.c \
        src/ui/gui/psppire-window-base.h \
        src/ui/gui/dialog-common.c \
@@ -458,7 +458,7 @@ src_ui_gui_libpsppire_glade_la_CFLAGS = $(GTK_CFLAGS) $(AM_CFLAGS)
 if cc_is_gcc
 src_ui_gui_libpsppire_glade_la_CFLAGS += -Wno-unused-parameter
 endif
-src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION)
+src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION)  $(SPREAD_SHEET_WIDGET_LIBS)
 
 EXTRA_DIST += src/ui/gui/psppire.xml src/ui/gui/glade-wrapper.in
 

diff --git a/src/ui/gui/dummy.c b/src/ui/gui/dummy.c
index 51c3e2da9f40e1ec7ba630f4e62a5de46c898928..96586d6b02ac0aee7e20235900fd7a16cc89e378 100644 (file)
--- a/src/ui/gui/dummy.c
+++ b/src/ui/gui/dummy.c
@@ -31,6 +31,7 @@
 #include "libpspp/compiler.h"
 #include "data/variable.h"
 
+#include "psppire-data-store.h"
 #include "t-test-options.h"
 #include "src/language/stats/chart-category.h"
 #include "src/language/stats/aggregate.h"
@@ -58,3 +59,19 @@ const struct agr_func agr_func_tab[] =
 
 const struct ag_func ag_func[] = {};
 const int N_AG_FUNCS = 1;
+
+
+gchar *
+psppire_data_store_value_to_string (gpointer unused, PsppireDataStore *store, gint col, gint row, const GValue *v)
+{
+  assert (0);
+  return NULL;
+}
+
+gboolean
+psppire_data_store_string_to_value (GtkTreeModel *model, gint col, gint row,
+                                   const gchar *in, GValue *out)
+{
+  assert (0);
+  return FALSE;
+}