Respect the case_cnt field from sys file header. Closes patch #6092

[pspp] / src / ui / gui / var-sheet.c

diff --git a/src/ui/gui/var-sheet.c b/src/ui/gui/var-sheet.c
index d8e6f6f7195e0a15dd1bd7ddbf961278b4afedbb..b6440e4d3caa32071dcaff366de85b65bb00bb31 100644 (file)
--- a/src/ui/gui/var-sheet.c
+++ b/src/ui/gui/var-sheet.c
@@ -1,10 +1,9 @@
-/*
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.

    Copyright (C) 2004, 2005, 2006  Free Software Foundation
 
    Copyright (C) 2004, 2005, 2006  Free Software Foundation
 

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -13,9 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */

 
 
 /* This module creates the Variable Sheet used for inputing the
 
 
 /* This module creates the Variable Sheet used for inputing the


@@ -33,9 +30,6 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

-#if HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif

 
 #include <data/value.h>
 
 
 #include <data/value.h>
 


@@ -43,6 +37,7 @@
 #include <gtksheet/gsheet-hetero-column.h>
 #include <gtksheet/gsheet-uniform-row.h>
 
 #include <gtksheet/gsheet-hetero-column.h>
 #include <gtksheet/gsheet-uniform-row.h>
 

+#include "localcharset.h"

 #include "psppire-var-store.h"
 #include "helper.h"
 #include "psppire-dict.h"
 #include "psppire-var-store.h"
 #include "helper.h"
 #include "psppire-dict.h"


@@ -224,7 +219,7 @@ var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
   if ( row >= psppire_var_store_get_var_cnt (var_store))
     return TRUE;
 
   if ( row >= psppire_var_store_get_var_cnt (var_store))
     return TRUE;
 

-  xml = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL);
+  xml = XML_NEW ("data-editor.glade");

 
   gtk_sheet_get_attributes (sheet, row, column, &attributes);
 
 
   gtk_sheet_get_attributes (sheet, row, column, &attributes);
 


@@ -446,12 +441,11 @@ psppire_variable_sheet_create (gchar *widget_name,
   gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_var_store));
 
 
   gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (the_var_store));
 
 

-#if HAVE_LANGINFO_H

   /* Since this happens inside glade_xml_new, we must prevent strings from
    * being re-encoded twice */
   codeset = bind_textdomain_codeset (PACKAGE, 0);
   /* Since this happens inside glade_xml_new, we must prevent strings from
    * being re-encoded twice */
   codeset = bind_textdomain_codeset (PACKAGE, 0);

-  bind_textdomain_codeset (PACKAGE, nl_langinfo (CODESET));
-#endif
+  bind_textdomain_codeset (PACKAGE, locale_charset ());
+

   for (i = 0 ; i < n_COLS ; ++i )
     {
       g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,
   for (i = 0 ; i < n_COLS ; ++i )
     {
       g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,


@@ -460,9 +454,8 @@ psppire_variable_sheet_create (gchar *widget_name,
       g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
                                               column_def[i].width);
     }
       g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
                                               column_def[i].width);
     }

-#if HAVE_LANGINFO_H
+

   bind_textdomain_codeset (PACKAGE, codeset);
   bind_textdomain_codeset (PACKAGE, codeset);

-#endif

 
   gtk_widget_show (sheet);
 
 
   gtk_widget_show (sheet);