Finish moving sheet model to new interface.

diff --git a/lib/gtksheet/gsheet-uniform-row.c b/lib/gtksheet/gsheet-uniform-row.c
index 755ce2585288404914ec88b302bf123dcca6aa74..7ab9b600a148ec4effc607193e11386d59b7cdb1 100644 (file)
--- a/lib/gtksheet/gsheet-uniform-row.c
+++ b/lib/gtksheet/gsheet-uniform-row.c
@@ -96,7 +96,7 @@ g_sheet_uniform_row_new (gint height, gint n_rows)
 }
 
 static gint
-g_sheet_uniform_row_get_height (const GSheetRow *geom, glong u, gpointer data)
+g_sheet_uniform_row_get_height (const GSheetRow *geom, glong u)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geom);
 
@@ -104,8 +104,7 @@ g_sheet_uniform_row_get_height (const GSheetRow *geom, glong u, gpointer data)
 }
 
 static gboolean
-g_sheet_uniform_row_get_sensitivity (const GSheetRow *geom, glong u,
-                                    gpointer data)
+g_sheet_uniform_row_get_sensitivity (const GSheetRow *geom, glong u)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geom);
 
@@ -114,8 +113,7 @@ g_sheet_uniform_row_get_sensitivity (const GSheetRow *geom, glong u,
 
 
 static gboolean
-g_sheet_uniform_row_get_visibility (const GSheetRow *geom, glong u,
-                                   gpointer data)
+g_sheet_uniform_row_get_visibility (const GSheetRow *geom, glong u)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW (geom);
 
@@ -124,7 +122,7 @@ g_sheet_uniform_row_get_visibility (const GSheetRow *geom, glong u,
 
 
 static gchar *
-g_sheet_uniform_row_get_button_label(const GSheetRow *geom, glong u, gpointer data)
+g_sheet_uniform_row_get_button_label (const GSheetRow *geom, glong u)
 {
   gchar *label = g_strdup_printf("%ld", u);
 
@@ -134,7 +132,7 @@ g_sheet_uniform_row_get_button_label(const GSheetRow *geom, glong u, gpointer da
 
 
 static glong
-g_sheet_uniform_row_get_row_count (const GSheetRow *geom, gpointer data)
+g_sheet_uniform_row_get_row_count (const GSheetRow *geom)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geom);
 
@@ -167,7 +165,7 @@ g_sheet_uniform_row_finalize (GObject *object)
 
 
 static guint
-g_sheet_uniform_row_top_ypixel (const GSheetRow *geo, glong row, gpointer data)
+g_sheet_uniform_row_top_ypixel (const GSheetRow *geo, glong row)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geo);
 
@@ -175,15 +173,14 @@ g_sheet_uniform_row_top_ypixel (const GSheetRow *geo, glong row, gpointer data)
 }
 
 static glong
-g_sheet_uniform_row_pixel_to_row (const GSheetRow *geo, guint pixel,
-                                gpointer data)
+g_sheet_uniform_row_pixel_to_row (const GSheetRow *geo, guint pixel)
 {
   GSheetUniformRow *ug = G_SHEET_UNIFORM_ROW(geo);
 
   gint row = pixel / ug->height;
 
-  if (row >= g_sheet_uniform_row_get_row_count(geo, data))
-    row = g_sheet_uniform_row_get_row_count(geo, data) -1;
+  if (row >= g_sheet_uniform_row_get_row_count(geo))
+    row = g_sheet_uniform_row_get_row_count(geo) - 1;
 
   return row;
 }

diff --git a/po/de.po b/po/de.po
index dc690cd0e4d70d4ba3c7210a395a360935e03444..dae8a2517a1cf9702d2a972860e940e354a06735 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-03-06 18:35+0900\n"
+"POT-Creation-Date: 2008-03-08 09:47+0900\n"
 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
@@ -216,13 +216,13 @@ msgstr "Systemedatein (*.sav)"
 msgid "scratch"
 msgstr ""
 
-#: src/data/dictionary.c:870
+#: src/data/dictionary.c:882
 msgid ""
 "At least one case in the data file had a weight value that was user-missing, "
 "system-missing, zero, or negative.  These case(s) were ignored."
 msgstr ""
 
-#: src/data/dictionary.c:1168
+#: src/data/dictionary.c:1180
 #, c-format
 msgid "Truncating document line to %d bytes."
 msgstr ""
@@ -1287,7 +1287,7 @@ msgid "Record"
 msgstr ""
 
 #: src/language/data-io/data-parser.c:643 src/language/data-io/print.c:404
-#: src/ui/gui/crosstabs.glade:92 src/ui/gui/psppire-var-sheet.c:103
+#: src/ui/gui/crosstabs.glade:92 src/ui/gui/psppire-var-sheet.c:107
 msgid "Columns"
 msgstr "Spalten"
 
@@ -1884,7 +1884,7 @@ msgstr ""
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
-#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:100
+#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:104
 msgid "Label"
 msgstr "Kennsatz"
 
@@ -2048,17 +2048,17 @@ msgid "Measure: %s"
 msgstr "Messe"
 
 #: src/language/dictionary/sys-file-info.c:495
-#: src/ui/gui/psppire-var-sheet.c:119
+#: src/ui/gui/psppire-var-sheet.c:123
 msgid "Nominal"
 msgstr "Nominalwert"
 
 #: src/language/dictionary/sys-file-info.c:496
-#: src/ui/gui/psppire-var-sheet.c:120
+#: src/ui/gui/psppire-var-sheet.c:124
 msgid "Ordinal"
 msgstr "Ordinalwert"
 
 #: src/language/dictionary/sys-file-info.c:497
-#: src/ui/gui/psppire-var-sheet.c:121
+#: src/ui/gui/psppire-var-sheet.c:125
 msgid "Scale"
 msgstr "Skalwert"
 
@@ -2068,17 +2068,17 @@ msgid "Display Alignment: %s"
 msgstr ""
 
 #: src/language/dictionary/sys-file-info.c:501
-#: src/ui/gui/psppire-var-sheet.c:112
+#: src/ui/gui/psppire-var-sheet.c:116
 msgid "Left"
 msgstr "Links"
 
 #: src/language/dictionary/sys-file-info.c:502
-#: src/ui/gui/psppire-var-sheet.c:114
+#: src/ui/gui/psppire-var-sheet.c:118
 msgid "Center"
 msgstr "Mittel"
 
 #: src/language/dictionary/sys-file-info.c:503
-#: src/ui/gui/psppire-var-sheet.c:113
+#: src/ui/gui/psppire-var-sheet.c:117
 msgid "Right"
 msgstr "Rechts"
 
@@ -2751,7 +2751,7 @@ msgstr ""
 
 #: src/language/stats/crosstabs.q:859 src/language/stats/examine.q:917
 #: src/language/stats/frequencies.q:1128 src/language/stats/frequencies.q:1407
-#: src/ui/gui/psppire-var-sheet.c:102
+#: src/ui/gui/psppire-var-sheet.c:106
 msgid "Missing"
 msgstr "Löse"
 
@@ -2855,7 +2855,7 @@ msgid "Directional measures."
 msgstr ""
 
 #: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire.glade:2223
-#: src/ui/gui/psppire-var-sheet.c:97
+#: src/ui/gui/psppire-var-sheet.c:101
 msgid "Type"
 msgstr "Typ"
 
@@ -5838,7 +5838,7 @@ msgstr ""
 msgid "Use expression as label"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:98
+#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:102
 msgid "Width"
 msgstr "Große"
 
@@ -5877,23 +5877,23 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
-#: src/ui/gui/psppire-var-sheet.c:96
+#: src/ui/gui/psppire-var-sheet.c:100
 msgid "Name"
 msgstr "Name"
 
-#: src/ui/gui/psppire-var-sheet.c:99
+#: src/ui/gui/psppire-var-sheet.c:103
 msgid "Decimals"
 msgstr "Dezimalstellen"
 
-#: src/ui/gui/psppire-var-sheet.c:101
+#: src/ui/gui/psppire-var-sheet.c:105
 msgid "Values"
 msgstr "Werten"
 
-#: src/ui/gui/psppire-var-sheet.c:104
+#: src/ui/gui/psppire-var-sheet.c:108
 msgid "Align"
 msgstr "Einstellung"
 
-#: src/ui/gui/psppire-var-sheet.c:105
+#: src/ui/gui/psppire-var-sheet.c:109
 msgid "Measure"
 msgstr "Messe"
 

diff --git a/po/en_GB.po b/po/en_GB.po
index 70d93da1e6b249dde1ec80ec57bd4b51dd52c7a6..8dfe640c0361cfed81f17c1dbb92aaf48e5408fd 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-03-06 18:35+0900\n"
+"POT-Creation-Date: 2008-03-08 09:47+0900\n"
 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
@@ -211,13 +211,13 @@ msgstr ""
 msgid "scratch"
 msgstr ""
 
-#: src/data/dictionary.c:870
+#: src/data/dictionary.c:882
 msgid ""
 "At least one case in the data file had a weight value that was user-missing, "
 "system-missing, zero, or negative.  These case(s) were ignored."
 msgstr ""
 
-#: src/data/dictionary.c:1168
+#: src/data/dictionary.c:1180
 #, c-format
 msgid "Truncating document line to %d bytes."
 msgstr ""
@@ -1279,7 +1279,7 @@ msgid "Record"
 msgstr ""
 
 #: src/language/data-io/data-parser.c:643 src/language/data-io/print.c:404
-#: src/ui/gui/crosstabs.glade:92 src/ui/gui/psppire-var-sheet.c:103
+#: src/ui/gui/crosstabs.glade:92 src/ui/gui/psppire-var-sheet.c:107
 msgid "Columns"
 msgstr ""
 
@@ -1875,7 +1875,7 @@ msgstr ""
 #: src/language/dictionary/split-file.c:86
 #: src/language/dictionary/sys-file-info.c:397
 #: src/language/dictionary/sys-file-info.c:564 src/ui/gui/crosstabs.glade:275
-#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:100
+#: src/ui/gui/psppire.glade:2099 src/ui/gui/psppire-var-sheet.c:104
 msgid "Label"
 msgstr ""
 
@@ -2039,17 +2039,17 @@ msgid "Measure: %s"
 msgstr ""
 
 #: src/language/dictionary/sys-file-info.c:495
-#: src/ui/gui/psppire-var-sheet.c:119
+#: src/ui/gui/psppire-var-sheet.c:123
 msgid "Nominal"
 msgstr ""
 
 #: src/language/dictionary/sys-file-info.c:496
-#: src/ui/gui/psppire-var-sheet.c:120
+#: src/ui/gui/psppire-var-sheet.c:124
 msgid "Ordinal"
 msgstr ""
 
 #: src/language/dictionary/sys-file-info.c:497
-#: src/ui/gui/psppire-var-sheet.c:121
+#: src/ui/gui/psppire-var-sheet.c:125
 msgid "Scale"
 msgstr ""
 
@@ -2059,17 +2059,17 @@ msgid "Display Alignment: %s"
 msgstr ""
 
 #: src/language/dictionary/sys-file-info.c:501
-#: src/ui/gui/psppire-var-sheet.c:112
+#: src/ui/gui/psppire-var-sheet.c:116
 msgid "Left"
 msgstr ""
 
 #: src/language/dictionary/sys-file-info.c:502
-#: src/ui/gui/psppire-var-sheet.c:114
+#: src/ui/gui/psppire-var-sheet.c:118
 msgid "Center"
 msgstr "Centre"
 
 #: src/language/dictionary/sys-file-info.c:503
-#: src/ui/gui/psppire-var-sheet.c:113
+#: src/ui/gui/psppire-var-sheet.c:117
 msgid "Right"
 msgstr ""
 
@@ -2742,7 +2742,7 @@ msgstr ""
 
 #: src/language/stats/crosstabs.q:859 src/language/stats/examine.q:917
 #: src/language/stats/frequencies.q:1128 src/language/stats/frequencies.q:1407
-#: src/ui/gui/psppire-var-sheet.c:102
+#: src/ui/gui/psppire-var-sheet.c:106
 msgid "Missing"
 msgstr ""
 
@@ -2846,7 +2846,7 @@ msgid "Directional measures."
 msgstr ""
 
 #: src/language/stats/crosstabs.q:1221 src/ui/gui/psppire.glade:2223
-#: src/ui/gui/psppire-var-sheet.c:97
+#: src/ui/gui/psppire-var-sheet.c:101
 msgid "Type"
 msgstr ""
 
@@ -5758,7 +5758,7 @@ msgstr ""
 msgid "Use expression as label"
 msgstr ""
 
-#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:98
+#: src/ui/gui/psppire.glade:2187 src/ui/gui/psppire-var-sheet.c:102
 msgid "Width"
 msgstr ""
 
@@ -5794,23 +5794,23 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
-#: src/ui/gui/psppire-var-sheet.c:96
+#: src/ui/gui/psppire-var-sheet.c:100
 msgid "Name"
 msgstr ""
 
-#: src/ui/gui/psppire-var-sheet.c:99
+#: src/ui/gui/psppire-var-sheet.c:103
 msgid "Decimals"
 msgstr ""
 
-#: src/ui/gui/psppire-var-sheet.c:101
+#: src/ui/gui/psppire-var-sheet.c:105
 msgid "Values"
 msgstr ""
 
-#: src/ui/gui/psppire-var-sheet.c:104
+#: src/ui/gui/psppire-var-sheet.c:108
 msgid "Align"
 msgstr ""
 
-#: src/ui/gui/psppire-var-sheet.c:105
+#: src/ui/gui/psppire-var-sheet.c:109
 msgid "Measure"
 msgstr ""