From ba434f2f8eac8b4feee75d9ce4cc67afd30fcd92 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Mon, 8 May 2017 11:40:34 +0200 Subject: [PATCH] Cope with new location of upstream files --- src/ui/gui/efficient-sheet.mk | 29 ++++++++++++--------------- src/ui/gui/goto-case-dialog.c | 16 ++++++++++----- src/ui/gui/goto-case-dialog.h | 4 ++-- src/ui/gui/psppire-data-editor.c | 2 +- src/ui/gui/psppire-data-sheet.h | 2 +- src/ui/gui/psppire-data-window.c | 4 ++-- src/ui/gui/psppire-dict.c | 2 +- src/ui/gui/psppire-var-sheet-header.c | 4 ++-- src/ui/gui/psppire-variable-sheet.h | 2 +- 9 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/ui/gui/efficient-sheet.mk b/src/ui/gui/efficient-sheet.mk index c2512ad73c..a91226e607 100644 --- a/src/ui/gui/efficient-sheet.mk +++ b/src/ui/gui/efficient-sheet.mk @@ -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 $< > $@ diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c index 4d6fec1a28..9d694bf651 100644 --- a/src/ui/gui/goto-case-dialog.c +++ b/src/ui/gui/goto-case-dialog.c @@ -21,20 +21,23 @@ #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); diff --git a/src/ui/gui/goto-case-dialog.h b/src/ui/gui/goto-case-dialog.h index 93fb13a464..422cdff37a 100644 --- a/src/ui/gui/goto-case-dialog.h +++ b/src/ui/gui/goto-case-dialog.h @@ -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 diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 2b654f76bf..3f1f627ded 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -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 #define _(msgid) gettext (msgid) diff --git a/src/ui/gui/psppire-data-sheet.h b/src/ui/gui/psppire-data-sheet.h index 4622c067ca..2297adbcd7 100644 --- a/src/ui/gui/psppire-data-sheet.h +++ b/src/ui/gui/psppire-data-sheet.h @@ -19,7 +19,7 @@ #define _PSPPIRE_DATA_SHEET_H #include -#include "ui/gui/efficient-sheet/jmd-sheet.h" +#include "ui/gui/efficient-sheet/src/jmd-sheet.h" struct _PsppireDataSheet { diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 80eed25735..8af85b946b 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -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)); } } diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c index 21479d008d..5368538fe3 100644 --- a/src/ui/gui/psppire-dict.c +++ b/src/ui/gui/psppire-dict.c @@ -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 diff --git a/src/ui/gui/psppire-var-sheet-header.c b/src/ui/gui/psppire-var-sheet-header.c index cd2121fd8b..fe262600e7 100644 --- a/src/ui/gui/psppire-var-sheet-header.c +++ b/src/ui/gui/psppire-var-sheet-header.c @@ -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}; diff --git a/src/ui/gui/psppire-variable-sheet.h b/src/ui/gui/psppire-variable-sheet.h index 2c0093bf30..bbc32da71a 100644 --- a/src/ui/gui/psppire-variable-sheet.h +++ b/src/ui/gui/psppire-variable-sheet.h @@ -19,7 +19,7 @@ #define _PSPPIRE_VARIABLE_SHEET_H #include -#include "ui/gui/efficient-sheet/jmd-sheet.h" +#include "ui/gui/efficient-sheet/src/jmd-sheet.h" struct _PsppireVariableSheet -- 2.30.2