Cope with new location of upstream files
authorJohn Darrington <john@darrington.wattle.id.au>
Mon, 8 May 2017 09:40:34 +0000 (11:40 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Mon, 8 May 2017 09:40:34 +0000 (11:40 +0200)
src/ui/gui/efficient-sheet.mk
src/ui/gui/goto-case-dialog.c
src/ui/gui/goto-case-dialog.h
src/ui/gui/psppire-data-editor.c
src/ui/gui/psppire-data-sheet.h
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-dict.c
src/ui/gui/psppire-var-sheet-header.c
src/ui/gui/psppire-variable-sheet.h

index c2512ad73c61b05898e1914df38c2b9f27a0eaf3..a91226e607e6107422765b25d6ffcc23afd81065 100644 (file)
@@ -1,29 +1,26 @@
 src_ui_gui_psppire_SOURCES += \
-       src/ui/gui/efficient-sheet/jmd-axis-model.c \
-       src/ui/gui/efficient-sheet/jmd-constraint.c \
-       src/ui/gui/efficient-sheet/jmd-sheet.c \
-       src/ui/gui/efficient-sheet/jmd-sheet-axis.c \
-       src/ui/gui/efficient-sheet/jmd-sheet-body.c \
-       src/ui/gui/efficient-sheet/jmd-sheet-single.c \
-       src/ui/gui/efficient-sheet/jmd-datum.c \
-       src/ui/gui/efficient-sheet/jmd-cell.c
-
+       src/ui/gui/efficient-sheet/src/jmd-axis-model.c \
+       src/ui/gui/efficient-sheet/src/jmd-constraint.c \
+       src/ui/gui/efficient-sheet/src/jmd-sheet.c \
+       src/ui/gui/efficient-sheet/src/jmd-sheet-axis.c \
+       src/ui/gui/efficient-sheet/src/jmd-sheet-body.c \
+       src/ui/gui/efficient-sheet/src/jmd-sheet-single.c \
+       src/ui/gui/efficient-sheet/src/jmd-datum.c \
+       src/ui/gui/efficient-sheet/src/jmd-cell.c
 
 nodist_src_ui_gui_psppire_SOURCES += \
        src/ui/gui/efficient-sheet/jmd-marshaller.c \
        src/ui/gui/efficient-sheet/jmd-marshaller.h
 
-src_ui_gui_psppire_CPPFLAGS+=-Isrc/ui/gui/efficient-sheet
-
-
+src_ui_gui_psppire_CPPFLAGS+=-Isrc/ui/gui/efficient-sheet/src
 
 BUILT_SOURCES += \
-       src/ui/gui/efficient-sheet/jmd-marshaller.c \
-       src/ui/gui/efficient-sheet/jmd-marshaller.h
+       src/ui/gui/efficient-sheet/src/jmd-marshaller.c \
+       src/ui/gui/efficient-sheet/src/jmd-marshaller.h
 
-src/ui/gui/efficient-sheet/jmd-marshaller.c: src/ui/gui/efficient-sheet/marshall-list
+src/ui/gui/efficient-sheet/src/jmd-marshaller.c: src/ui/gui/efficient-sheet/src/marshall-list
        glib-genmarshal --body --prefix=jmd_cclosure_marshal $< > $@
 
-src/ui/gui/efficient-sheet/jmd-marshaller.h: src/ui/gui/efficient-sheet/marshall-list
+src/ui/gui/efficient-sheet/src/jmd-marshaller.h: src/ui/gui/efficient-sheet/src/marshall-list
        glib-genmarshal --header --prefix=jmd_cclosure_marshal $< > $@
 
index 4d6fec1a28e7badad0a96703c03960d4c1441d00..9d694bf651ec39ef882cd9793c2e469e92c15198 100644 (file)
 #include "psppire-dialog.h"
 #include "psppire-data-window.h"
 #include "psppire-data-store.h"
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "psppire-data-sheet.h"
 
 
 static void
-refresh (JmdSheet *ds, GtkBuilder *xml)
+refresh (PsppireDataSheet *ds, GtkBuilder *xml)
 {
+  PsppireDataStore *store = NULL;
+  g_object_get (ds, "data-model", &store, NULL);
+
   GtkWidget *case_num_entry = get_widget_assert (xml, "goto-case-case-num-entry");
-  casenumber case_count =  gtk_tree_model_iter_n_children (ds->data_model, NULL);
+  casenumber case_count =  gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
 
   gtk_spin_button_set_range (GTK_SPIN_BUTTON (case_num_entry), 1, case_count);
 }
 
 void
-goto_case_dialog (JmdSheet *ds)
+goto_case_dialog (PsppireDataSheet *ds)
 {
   GtkWindow *top_level;
   gint response;
@@ -50,6 +53,9 @@ goto_case_dialog (JmdSheet *ds)
 
   if (response == PSPPIRE_RESPONSE_GOTO)
     {
+      PsppireDataStore *store = NULL;
+      g_object_get (ds, "data-model", &store, NULL);
+
       GtkWidget *case_num_entry =
        get_widget_assert (xml, "goto-case-case-num-entry");
 
@@ -58,7 +64,7 @@ goto_case_dialog (JmdSheet *ds)
        - FIRST_CASE_NUMBER ;
 
       if (case_num >= 0 &&
-         case_num < gtk_tree_model_iter_n_children (ds->data_model, NULL))
+         case_num < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ds), NULL))
       {
        jmd_sheet_scroll_to (ds, -1, case_num);
        jmd_sheet_set_active_cell (ds, -1, case_num, 0);
index 93fb13a464d2aea8fde7d0d9d82abef6cc463263..422cdff37a17947b0a9c22d23117b46f78a65bef 100644 (file)
@@ -17,9 +17,9 @@
 #ifndef __GOTO_CASE_DIALOG_H
 #define __GOTO_CASE_DIALOG_H
 
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "psppire-data-sheet.h"
 
 
-void goto_case_dialog (JmdSheet *ds);
+void goto_case_dialog (PsppireDataSheet *ds);
 
 #endif
index 2b654f76bf83a3cabd5945a26857946dfbd15525..3f1f627dedd162cc42b974261df70b89ad26bef0 100644 (file)
@@ -41,7 +41,7 @@
 #include "ui/gui/psppire-data-sheet.h"
 
 
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
index 4622c067ca34cb2f05d29e04b9ccf1943867aba2..2297adbcd76aceed9b70af38a7df34b5d94c40fe 100644 (file)
@@ -19,7 +19,7 @@
 #define _PSPPIRE_DATA_SHEET_H
 
 #include <gtk/gtk.h>
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
 
 struct _PsppireDataSheet
 {
index 80eed25735aa8d9d4e3437d4f8e090d82cfb8d2e..8af85b946b590e233417451317d6afd0f6809219 100644 (file)
@@ -47,7 +47,7 @@
 #include "gl/c-strcasestr.h"
 #include "gl/xvasprintf.h"
 
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
 
 #include "find-dialog.h"
 #include "options-dialog.h"
@@ -1204,7 +1204,7 @@ goto_case (PsppireDataWindow *dw)
   int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de));
   if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW)
     {
-      goto_case_dialog (JMD_SHEET (de->data_sheet));
+      goto_case_dialog (PSPPIRE_DATA_SHEET (de->data_sheet));
     }
 }
 
index 21479d008da42635c5c78de7047b17d208f734d1..5368538fe30ccc8816f816127ca093a79f066d27 100644 (file)
@@ -34,7 +34,7 @@
 #include "ui/gui/psppire-marshal.h"
 #include "ui/gui/psppire-var-ptr.h"
 
-#include "ui/gui/efficient-sheet/jmd-datum.h"
+#include "ui/gui/efficient-sheet/src/jmd-datum.h"
 
 #include <gobject/genums.h>
 
index cd2121fd8b20aa93f1d793d74c649a32a4e8f943..fe262600e7f5eea8914f73207f4849c44644794a 100644 (file)
@@ -21,8 +21,8 @@
 
 #include "psppire-var-sheet-header.h"
 
-#include "efficient-sheet/jmd-axis-model.h"
-#include "efficient-sheet/jmd-datum.h"
+#include "efficient-sheet/src/jmd-axis-model.h"
+#include "efficient-sheet/src/jmd-datum.h"
 
 enum  {CHANGED,
        n_SIGNALS};
index 2c0093bf30cf34ab15b6a4c87feb371fed6a5081..bbc32da71a559d66084520e2b6229c9c88944a2a 100644 (file)
@@ -19,7 +19,7 @@
 #define _PSPPIRE_VARIABLE_SHEET_H
 
 #include <gtk/gtk.h>
-#include "ui/gui/efficient-sheet/jmd-sheet.h"
+#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
 
 
 struct _PsppireVariableSheet