[Pspp-cvs] psppire gtk_sheet/gtksheet.c gtk_sheet/gtksheet...

[John Darrington]

CVSROOT:        /cvsroot/pspp
Module name:    psppire
Branch:         
Changes by:     John Darrington <address@hidden>        05/12/23 23:34:03

Modified files:
        gtk_sheet      : gtksheet.c gtksheet.h 
        src            : Makefile.am callbacks.c customentry.h 
                         data_sheet.c data_sheet.h error-dialog.c main.c 
                         misc.c missing_val_dialog.c pspp-dict.c 
                         pspp-object.c val_labs_dialog.c var_sheet.c 
                         var_type_dialog.c 

Log message:
        General tidy up

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/gtk_sheet/gtksheet.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/gtk_sheet/gtksheet.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/Makefile.am.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/callbacks.c.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/customentry.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/data_sheet.c.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/data_sheet.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/error-dialog.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/main.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/misc.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/missing_val_dialog.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/pspp-dict.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/pspp-object.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/val_labs_dialog.c.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/var_sheet.c.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/psppire/src/var_type_dialog.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: psppire/gtk_sheet/gtksheet.c
diff -u psppire/gtk_sheet/gtksheet.c:1.11 psppire/gtk_sheet/gtksheet.c:1.12
--- psppire/gtk_sheet/gtksheet.c:1.11   Sun Dec 18 09:44:42 2005
+++ psppire/gtk_sheet/gtksheet.c        Fri Dec 23 23:34:03 2005
@@ -1175,7 +1175,7 @@
 }
 
 guint
-gtk_sheet_get_columns_count(GtkSheet *sheet)
+gtk_sheet_get_columns_count(const GtkSheet *sheet)
 {
   g_return_val_if_fail (sheet != NULL, 0);
   g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
@@ -1184,7 +1184,7 @@
 }
 
 guint
-gtk_sheet_get_rows_count(GtkSheet *sheet)
+gtk_sheet_get_rows_count(const GtkSheet *sheet)
 {
   g_return_val_if_fail (sheet != NULL, 0);
   g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
@@ -1193,7 +1193,7 @@
 }
 
 gint
-gtk_sheet_get_state(GtkSheet *sheet)
+gtk_sheet_get_state(const GtkSheet *sheet)
 {
   g_return_val_if_fail (sheet != NULL, 0);
   g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
@@ -2351,7 +2351,7 @@
 }
 
 void 
-gtk_sheet_get_visible_range(GtkSheet *sheet, GtkSheetRange *range)
+gtk_sheet_get_visible_range(const GtkSheet *sheet, GtkSheetRange *range)
 {
 
   g_return_if_fail (sheet != NULL);
@@ -6539,7 +6539,7 @@
 }
 
 GtkWidget * 
-gtk_sheet_get_entry(GtkSheet *sheet)
+gtk_sheet_get_entry(const GtkSheet *sheet)
 {
  GtkWidget *parent;
  GtkWidget *entry = NULL;
@@ -6591,7 +6591,7 @@
 }
 
 GtkWidget * 
-gtk_sheet_get_entry_widget(GtkSheet *sheet)
+gtk_sheet_get_entry_widget(const GtkSheet *sheet)
 {
  g_return_val_if_fail (sheet != NULL, NULL);
  g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL);
Index: psppire/gtk_sheet/gtksheet.h
diff -u psppire/gtk_sheet/gtksheet.h:1.5 psppire/gtk_sheet/gtksheet.h:1.6
--- psppire/gtk_sheet/gtksheet.h:1.5    Sun Nov 20 12:26:14 2005
+++ psppire/gtk_sheet/gtksheet.h        Fri Dec 23 23:34:03 2005
@@ -454,25 +454,25 @@
 
 /* Returns sheet's entry widget */
 GtkWidget *
-gtk_sheet_get_entry                    (GtkSheet *sheet);
+gtk_sheet_get_entry                    (const GtkSheet *sheet);
 GtkWidget *
-gtk_sheet_get_entry_widget             (GtkSheet *sheet);
+gtk_sheet_get_entry_widget             (const GtkSheet *sheet);
 
 /* Returns sheet->state 
  * Added by Steven Rostedt <address@hidden> */
 gint
-gtk_sheet_get_state                    (GtkSheet *sheet);
+gtk_sheet_get_state                    (const GtkSheet *sheet);
 
 /* Returns sheet's ranges 
  * Added by Murray Cumming */
 guint
-gtk_sheet_get_columns_count            (GtkSheet *sheet);
+gtk_sheet_get_columns_count            (const GtkSheet *sheet);
 
 guint
-gtk_sheet_get_rows_count               (GtkSheet *sheet);
+gtk_sheet_get_rows_count               (const GtkSheet *sheet);
 
 void
-gtk_sheet_get_visible_range            (GtkSheet *sheet,
+gtk_sheet_get_visible_range            (const GtkSheet *sheet,
                                         GtkSheetRange *range);
 void
 gtk_sheet_set_selection_mode           (GtkSheet *sheet, gint mode);
Index: psppire/src/Makefile.am
diff -u psppire/src/Makefile.am:1.13 psppire/src/Makefile.am:1.14
--- psppire/src/Makefile.am:1.13        Fri Dec 23 13:18:06 2005
+++ psppire/src/Makefile.am     Fri Dec 23 23:34:03 2005
@@ -34,7 +34,7 @@
        -L../../pspp/gl -lgl
 
 
-psppire_DEPENDENCIES = $(top_srcdir)/gtk_sheet/libgtksheet.a libpspp_data.a 
stubs.o
+psppire_DEPENDENCIES = $(top_srcdir)/gtk_sheet/libgtksheet.a libpspp_data.a 
 
 libpspp_data.a: 
        @echo You need to follow the instructions in INSTALL to create $@
Index: psppire/src/callbacks.c
diff -u psppire/src/callbacks.c:1.18 psppire/src/callbacks.c:1.19
--- psppire/src/callbacks.c:1.18        Fri Dec 23 06:50:09 2005
+++ psppire/src/callbacks.c     Fri Dec 23 23:34:03 2005
@@ -36,6 +36,7 @@
 #include "pspp-dict.h"
 
 #include "var_sheet.h"
+#include "data_sheet.h"
 #include "misc.h"
 
 
@@ -296,7 +297,7 @@
   PSPP_Dict *dict = psppire_var_sheet_get_dictionary(var_sheet);
   
   if ( psppire_handle ) 
-    psppire_create_system_file(data_sheet, dict, psppire_handle);
+    psppire_create_system_file(GTK_SHEET(data_sheet), dict, psppire_handle);
 }
 
 
@@ -314,7 +315,7 @@
   PSPP_Dict *dict = psppire_var_sheet_get_dictionary(var_sheet);
 
   if ( psppire_handle ) 
-    psppire_create_system_file(data_sheet, dict, psppire_handle);
+    psppire_create_system_file(GTK_SHEET(data_sheet), dict, psppire_handle);
 }
 
 
Index: psppire/src/customentry.h
diff -u psppire/src/customentry.h:1.1 psppire/src/customentry.h:1.2
--- psppire/src/customentry.h:1.1       Wed Nov 23 12:39:37 2005
+++ psppire/src/customentry.h   Fri Dec 23 23:34:03 2005
@@ -67,6 +67,8 @@
 #include <glib-object.h>
 
 
+GType psppire_custom_entry_get_type (void);
+
 G_BEGIN_DECLS
 
 #define PSPPIRE_CUSTOM_ENTRY_TYPE (psppire_custom_entry_get_type ())
Index: psppire/src/data_sheet.c
diff -u psppire/src/data_sheet.c:1.25 psppire/src/data_sheet.c:1.26
--- psppire/src/data_sheet.c:1.25       Sun Dec 11 10:14:39 2005
+++ psppire/src/data_sheet.c    Fri Dec 23 23:34:03 2005
@@ -23,6 +23,8 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
+#include <ctype.h>
+
 #include "gtksheet.h"
 #include "pspp-dict.h"
 #include "sfm-write.h"
@@ -34,6 +36,8 @@
 #include "callbacks.h"
 #include "data_sheet.h"
 
+#include "misc.h"
+
 #define _(A) A
 #define N_(A) A
 
@@ -56,7 +60,7 @@
 
 /* Repair any damage that may have been done to the data sheet */
 void
-psppire_data_sheet_redisplay(const GtkSheet *sheet)
+psppire_data_sheet_redisplay(GtkSheet *sheet)
 {
   repopulate_columns(sheet, pspp_dictionary, 0, 
                     gtk_sheet_get_columns_count(sheet) - 1);
@@ -198,10 +202,6 @@
 static void 
 convert(GType to, gint row, gint col, GValue *value)
 {
-  const struct variable *var = pspp_dict_get_var(pspp_dictionary, col);
-  
-  const struct fmt_spec *fp = &var->write;
-
   double v;
 
   switch  (G_VALUE_TYPE(value))
@@ -306,11 +306,8 @@
 
   PSPP_Dict *dict = PSPP_DICT(obj);
 
-  GtkSheetRange range;
   GtkSheet *sheet = GTK_SHEET(data);
 
-  const struct variable *var = pspp_dict_get_var(dict, column);
-
   update_column(sheet, column, dict);
 
   for ( r = 0 ; r <= last_populated_row; ++r)
@@ -399,7 +396,7 @@
 
 
 /* Change the width of COL to WIDTH characters */
-static int
+static void
 adjust_column_width(GtkSheet *sheet, gint col, gint width)
 {
   struct variable *var = pspp_dict_get_var(pspp_dictionary, col);
@@ -415,8 +412,6 @@
       var->display_width = width / unit_width  ;
       pspp_dict_var_changed(pspp_dictionary, col);
     }
-
-  return FALSE;
 }
 
 /* Clear the entire sheet */
@@ -444,7 +439,7 @@
 
 /* Associate a  dictionary with the data sheet */
 void
-psppire_data_sheet_set_dictionary(GtkWidget *sheet, PSPP_Dict *d)
+psppire_data_sheet_set_dictionary(GtkSheet *sheet, PSPP_Dict *d)
 {
   pspp_dictionary  = d;
 
Index: psppire/src/data_sheet.h
diff -u psppire/src/data_sheet.h:1.2 psppire/src/data_sheet.h:1.3
--- psppire/src/data_sheet.h:1.2        Sun Nov 27 08:21:33 2005
+++ psppire/src/data_sheet.h    Fri Dec 23 23:34:03 2005
@@ -27,7 +27,7 @@
 void psppire_data_sheet_clear(GtkSheet *sheet);
 
 
-void psppire_data_sheet_set_dictionary(GtkWidget *sheet, PSPP_Dict *d);
+void psppire_data_sheet_set_dictionary(GtkSheet *sheet, PSPP_Dict *d);
 
 
 GtkWidget* psppire_data_sheet_create (gchar *widget_name, 
@@ -43,7 +43,10 @@
 void psppire_data_sheet_set_show_labels(GtkSheet *sheet, gboolean show_labels);
 
 /* Repair any damage that may have been done to the data sheet */
-void psppire_data_sheet_redisplay(const GtkSheet *sheet);
+void psppire_data_sheet_redisplay(GtkSheet *sheet);
+
+void psppire_create_system_file(GtkSheet *sheet, PSPP_Dict *d, 
+                               struct file_handle *handle);
 
 
 #endif
Index: psppire/src/error-dialog.c
diff -u psppire/src/error-dialog.c:1.1 psppire/src/error-dialog.c:1.2
--- psppire/src/error-dialog.c:1.1      Fri Dec 23 06:50:09 2005
+++ psppire/src/error-dialog.c  Fri Dec 23 23:34:03 2005
@@ -138,7 +138,7 @@
 void
 err_vmsg (const struct error *e, const char *format, va_list args)
 {
-  vmsg(SE, format, args);
+  vmsg(e->class, format, args);
 }
 
 
Index: psppire/src/main.c
diff -u psppire/src/main.c:1.12 psppire/src/main.c:1.13
--- psppire/src/main.c:1.12     Sun Dec 11 10:14:39 2005
+++ psppire/src/main.c  Fri Dec 23 23:34:03 2005
@@ -66,7 +66,7 @@
 
   PSPP_Dict *d = psppire_var_sheet_get_dictionary(var_sheet);
   
-  psppire_data_sheet_set_dictionary(data_sheet, d);
+  psppire_data_sheet_set_dictionary(GTK_SHEET(data_sheet), d);
 
   gtk_init_add(callbacks_on_init, 0);
 
Index: psppire/src/misc.c
diff -u psppire/src/misc.c:1.2 psppire/src/misc.c:1.3
--- psppire/src/misc.c:1.2      Sun Dec 11 10:14:39 2005
+++ psppire/src/misc.c  Fri Dec 23 23:34:03 2005
@@ -1,6 +1,10 @@
+
 #include "misc.h"
 #include "data-in.h"
 
+#include <ctype.h>
+#include <string.h>
+
 /* Formats a value according to FORMAT 
    The returned string must be freed when no longer required */
 gchar *
@@ -15,6 +19,8 @@
     }
   s[format.w]='\0';
   g_strchug(s);
+
+  return s;
 }
 
 
Index: psppire/src/missing_val_dialog.c
diff -u psppire/src/missing_val_dialog.c:1.3 
psppire/src/missing_val_dialog.c:1.4
--- psppire/src/missing_val_dialog.c:1.3        Sun Dec 11 10:14:39 2005
+++ psppire/src/missing_val_dialog.c    Fri Dec 23 23:34:03 2005
@@ -30,6 +30,8 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
+#include <string.h>
+
 #define _(A) A
 
 /* A simple (sub) dialog box for displaying user input errors */
@@ -180,7 +182,6 @@
 static void 
 range(GtkToggleButton *button, gpointer data)
 {
-  gint i;
   struct missing_val_dialog *dialog = data;
   
   const gboolean active = gtk_toggle_button_get_active (button);
@@ -195,7 +196,6 @@
 struct missing_val_dialog * 
 missing_val_dialog_create(GladeXML *xml)
 {
-  gint i;
   struct missing_val_dialog *dialog = g_malloc(sizeof(*dialog));
 
   dialog->window = get_widget_assert(xml, "missing_values_dialog");
Index: psppire/src/pspp-dict.c
diff -u psppire/src/pspp-dict.c:1.10 psppire/src/pspp-dict.c:1.11
--- psppire/src/pspp-dict.c:1.10        Sun Nov 20 12:26:14 2005
+++ psppire/src/pspp-dict.c     Fri Dec 23 23:34:03 2005
@@ -126,7 +126,6 @@
 pspp_dict_finalize (GObject *object)
 {
   PSPP_Dict *d = PSPP_DICT (object);
-  guint i;
   
   dict_destroy(d->dict);
 
Index: psppire/src/pspp-object.c
diff -u psppire/src/pspp-object.c:1.3 psppire/src/pspp-object.c:1.4
--- psppire/src/pspp-object.c:1.3       Thu Nov  3 05:42:48 2005
+++ psppire/src/pspp-object.c   Fri Dec 23 23:34:03 2005
@@ -91,11 +91,6 @@
 static void
 pspp_object_finalize (GObject *object)
 {
-  PSPP_Object *accel_group = PSPP_OBJECT (object);
-  guint i;
-  
-  /*   g_free (accel_group->priv_accels); */
-
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
Index: psppire/src/val_labs_dialog.c
diff -u psppire/src/val_labs_dialog.c:1.5 psppire/src/val_labs_dialog.c:1.6
--- psppire/src/val_labs_dialog.c:1.5   Wed Dec 14 11:39:12 2005
+++ psppire/src/val_labs_dialog.c       Fri Dec 23 23:34:03 2005
@@ -22,7 +22,7 @@
 /*  This module describes the behaviour of the Value Labels dialog box,
     used for input of the value labels in the variable sheet */
 
-
+#include <string.h>
 
 #include "val_labs_dialog.h"
 #include "value-labels.h"
@@ -112,12 +112,12 @@
 
 
   char *s;
-  if ( s = val_labs_find (dialog->labs, v) ) 
+  if ( (s = val_labs_find (dialog->labs, v)) ) 
     {
       gtk_entry_set_text(GTK_ENTRY(dialog->label_entry), s);
       gtk_widget_set_sensitive(dialog->add_button, FALSE);
       gtk_widget_set_sensitive(dialog->remove_button, TRUE);
-      select_treeview_from_value(dialog->treeview, &v);
+      select_treeview_from_value(GTK_TREE_VIEW(dialog->treeview), &v);
     }
   else
     {
@@ -373,7 +373,6 @@
   struct val_labs_iterator *vli = 0;
   struct val_lab *vl; 
 
-  GtkTreePath *path;
   GtkTreeIter iter;
 
   GtkListStore *list_store = gtk_list_store_new (2, 
Index: psppire/src/var_sheet.c
diff -u psppire/src/var_sheet.c:1.30 psppire/src/var_sheet.c:1.31
--- psppire/src/var_sheet.c:1.30        Thu Dec 22 08:56:59 2005
+++ psppire/src/var_sheet.c     Fri Dec 23 23:34:03 2005
@@ -29,6 +29,10 @@
 
 #include <glade/glade.h>
 #include <gtk/gtk.h>
+
+#include <stdlib.h>
+#include <string.h>
+
 #include "gtksheet.h"
 
 
@@ -722,27 +726,10 @@
     }
 }
 
-
-/* Repopulate the rows starting at position FROM, to position TO inclusive*/
-static void
-repopulate_rows(GtkSheet *sheet, PSPP_Dict *dict, gint from, gint to)
-{
-  gint r;
-
-  for ( r = from ; r <= to ; ++r ) 
-    {
-      struct variable *var = pspp_dict_get_var(dict, r);      
-      populate_row_from_var(sheet, var, r);
-    }
-}
-
-
 /* Remove a variable from the variable sheet */
 static gint
 remove_variable(GObject *obj, gint idx, gpointer data)
 {
-  PSPP_Dict *dict = PSPP_DICT(obj);
-
   GtkSheet *sheet = GTK_SHEET(data);
 
   g_signal_handlers_block_by_func(sheet,
@@ -774,7 +761,6 @@
                               gint int1, gint int2)
 {
   GtkWidget *sheet;
-  GtkWidget *entry;
   gint i;
 
   sheet = gtk_sheet_new(n_initial_rows, n_COLS, "variable sheet"); 
@@ -839,7 +825,7 @@
 update_variable(GtkSheet *sheet, gint row, gint col)
 {
   g_return_val_if_fail(sheet, FALSE);
-  gint r;
+
   g_assert(pspp_dictionary);
   g_assert(G_IS_PSPP_DICT(pspp_dictionary));
   
@@ -936,8 +922,6 @@
 static gint
 var_sheet_update_callback(GObject *obj, gint var_idx, gpointer data)
 {
-  gint c;
-
   PSPP_Dict *dict = PSPP_DICT(obj);
   GtkSheet *sheet   = GTK_SHEET(data);
 
Index: psppire/src/var_type_dialog.c
diff -u psppire/src/var_type_dialog.c:1.9 psppire/src/var_type_dialog.c:1.10
--- psppire/src/var_type_dialog.c:1.9   Thu Dec 22 08:56:59 2005
+++ psppire/src/var_type_dialog.c       Fri Dec 23 23:34:03 2005
@@ -25,6 +25,9 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "var_type_dialog.h"
 #include "misc.h"