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

[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 b4e3d5f3d6cd8304b0764de216e10e7e575cc008..a0f4ad916944effeea72ed9b626411d042cdcbbb 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "ui/gui/psppire-data-sheet.h"
+// #include "ui/gui/psppire-data-sheet.h"
 
 #include "data/case-map.h"
 #include "data/casereader.h"
@@ -32,8 +32,6 @@
 #include "ui/gui/goto-case-dialog.h"
 #include "ui/gui/builder-wrapper.h"
 #include "ui/gui/helper.h"
-#include "ui/gui/pspp-sheet-selection.h"
-#include "ui/gui/psppire-cell-renderer-button.h"
 #include "ui/gui/psppire-data-store.h"
 #include "ui/gui/psppire-data-window.h"
 #include "ui/gui/psppire-dialog-action-var-info.h"
@@ -47,6 +45,8 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
+#if 0
+
 static void psppire_data_sheet_dispose (GObject *);
 static void psppire_data_sheet_unset_data_store (PsppireDataSheet *);
 
@@ -2469,3 +2469,5 @@ on_owner_change (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer data)
                                 psppire_data_sheet_targets_received_cb,
                                 dw->mi_paste);
 }
+
+#endif