Merge 'master' into 'psppsheet'.

diff --combined src/ui/gui/automake.mk
index 8cba97018bd166cfb06f6dc6fcaa7ec3f6ace615,d7c3401d7b1e229f1d39f2a339c32cce6706f9cd..b8d574ffddb0059683c1455f00677dcf81dee0a4
--- 1/src/ui/gui/automake.mk
--- 2/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@@ -1,5 -1,7 +1,5 @@@
  ## Process this file with automake to produce Makefile.in  -*- makefile -*-
  
 -include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 -
  UI_FILES = \
        src/ui/gui/aggregate.ui \
        src/ui/gui/autorecode.ui \
@@@ -9,7 -11,6 +9,7 @@@
        src/ui/gui/count.ui \
        src/ui/gui/crosstabs.ui \
        src/ui/gui/chi-square.ui \
 +      src/ui/gui/data-sheet.ui \
        src/ui/gui/descriptives.ui \
        src/ui/gui/entry-dialog.ui \
        src/ui/gui/examine.ui \
@@@ -44,7 -45,6 +44,7 @@@
        src/ui/gui/data-editor.ui \
        src/ui/gui/output-viewer.ui \
        src/ui/gui/syntax-editor.ui \
 +      src/ui/gui/var-sheet.ui \
        src/ui/gui/var-type-dialog.ui
  
  EXTRA_DIST += \
@@@ -55,8 -55,10 +55,10 @@@
  
  if HAVE_GUI
  bin_PROGRAMS += src/ui/gui/psppire 
+ noinst_PROGRAMS += src/ui/gui/spreadsheet-test
  
  src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+ src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
  
  
  src_ui_gui_psppire_LDFLAGS = \
@@@ -72,7 -74,8 +74,7 @@@ endi
  
  
  src_ui_gui_psppire_LDADD = \
 -        src/ui/gui/sheet/libsheet.la \
 -      lib/gtk-contrib/libgtksheet.a \
 +      lib/gtk-contrib/libxpaned.a \
        src/ui/libuicommon.la \
        src/libpspp.la \
        src/libpspp-core.la \
@@@ -83,6 -86,16 +85,16 @@@
        $(LIBINTL) \
        $(GSL_LIBS)
  
+ 
+ src_ui_gui_spreadsheet_test_LDADD = \
+       src/libpspp-core.la \
+       $(GTK_LIBS) \
+       $(GTHREAD_LIBS)
+ 
+ 
+ src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/psppire-spreadsheet-model.c
+ 
+ 
  src_ui_gui_psppiredir = $(pkgdatadir)
  
  
@@@ -175,6 -188,8 +187,6 @@@ src_ui_gui_psppire_SOURCES = 
        src/ui/gui/chi-square-dialog.h \
        src/ui/gui/count-dialog.c \
        src/ui/gui/count-dialog.h \
 -      src/ui/gui/customentry.c \
 -      src/ui/gui/customentry.h \
        src/ui/gui/dialog-common.c \
        src/ui/gui/dialog-common.h \
        src/ui/gui/dict-display.h \
@@@ -210,8 -225,6 +222,8 @@@
        src/ui/gui/psppire-conf.h \
        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 \
@@@ -273,6 -286,8 +285,8 @@@
        src/ui/gui/psppire-output-window.h \
        src/ui/gui/psppire-var-view.c \
        src/ui/gui/psppire-var-view.h \
+       src/ui/gui/psppire-spreadsheet-model.c \
+       src/ui/gui/psppire-spreadsheet-model.h \
        src/ui/gui/psppire-selector.h \
        src/ui/gui/psppire-select-dest.c \
        src/ui/gui/psppire-select-dest.h \
@@@ -286,6 -301,8 +300,6 @@@
        src/ui/gui/psppire-var-ptr.h \
        src/ui/gui/psppire-var-sheet.c \
        src/ui/gui/psppire-var-sheet.h \
 -      src/ui/gui/psppire-var-store.c \
 -      src/ui/gui/psppire-var-store.h \
        src/ui/gui/psppire-vbuttonbox.h \
        src/ui/gui/psppire-window.c \
        src/ui/gui/psppire-window.h \