/[pspp]/psppire/src/var_sheet.c
ViewVC logotype

Diff of /psppire/src/var_sheet.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by jmd, Tue Mar 29 14:44:49 2005 UTC revision 1.3 by jmd, Wed Mar 30 11:54:12 2005 UTC
# Line 29  Line 29 
29  #include "interface.h"  #include "interface.h"
30  #include "support.h"  #include "support.h"
31    
32  #include "gsubject.h"  #include "pspp-dict.h"
33    
34  #define _(A) A  #define _(A) A
35  #define N_(A) A  #define N_(A) A
36    
37    
38  extern GSubject *subject;  extern PSPP_Dict *pspp_dictionary;
39    
40  /* The next new row */  /* The next new row */
41  static gint next_new_row=0;  static gint next_new_row=0;
# Line 49  void var_sheet_row_close(GtkSheet *sheet Line 49  void var_sheet_row_close(GtkSheet *sheet
49  static gint  static gint
50  update_variable(GtkSheet *sheet, gint row, gint col)  update_variable(GtkSheet *sheet, gint row, gint col)
51  {  {
52    g_assert(subject);    g_assert(pspp_dictionary);
53    g_assert(G_IS_SUBJECT(subject));    g_assert(G_IS_PSPP_DICT(pspp_dictionary));
54    
55    if ( col == 0 )    if ( col == 0 )
56      g_subject_set_name(subject, row, gtk_sheet_cell_get_text(sheet, row, col));      pspp_dict_set_name(pspp_dictionary, row,
57                           gtk_sheet_cell_get_text(sheet, row, col));
58    
59        
60    var_sheet_row_open(sheet,row);    var_sheet_row_open(sheet, row);
61    
62    return FALSE;    return FALSE;
63  }  }
# Line 69  var_sheet_update_callback(GObject *obj, Line 70  var_sheet_update_callback(GObject *obj,
70  {  {
71    guint i;    guint i;
72    
73    GSubject *subj = G_SUBJECT(obj);    PSPP_Dict *dict = PSPP_DICT(obj);
74    GtkSheet *sheet   = GTK_SHEET(data);    GtkSheet *sheet   = GTK_SHEET(data);
75    
76    GtkSheetRange entireSheet;    GtkSheetRange entireSheet;
# Line 79  var_sheet_update_callback(GObject *obj, Line 80  var_sheet_update_callback(GObject *obj,
80    
81    gtk_sheet_range_clear(sheet, &entireSheet);    gtk_sheet_range_clear(sheet, &entireSheet);
82    
83    for ( i = 0 ; i < subj->array->len ; ++i )    for ( i = 0 ; i < dict->array->len ; ++i )
84      {      {
85        struct variable *var;        struct variable *var;
86                
87        var = g_ptr_array_index(subj->array,i);        var = g_ptr_array_index(dict->array,i);
88                
89        gtk_sheet_set_cell_text (sheet,i,0,var->name);        gtk_sheet_set_cell_text (sheet, i, 0, var->name);
   
90      }      }
91    
   
92    return FALSE;    return FALSE;
93  }  }
94    
# Line 281  psppire_variable_sheet_create (gchar *wi Line 280  psppire_variable_sheet_create (gchar *wi
280                                     &colour_enabled,FALSE,TRUE);                                     &colour_enabled,FALSE,TRUE);
281    
282    
283    g_signal_connect(subject,"subject_changed",    g_signal_connect(pspp_dictionary,"changed",
284                     G_CALLBACK(var_sheet_update_callback),sheet);                     G_CALLBACK(var_sheet_update_callback),sheet);
285    
286    g_signal_connect (GTK_OBJECT (sheet), "deactivate",    g_signal_connect (GTK_OBJECT (sheet), "deactivate",

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26