projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into charset
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-var-sheet.c
diff --git
a/src/ui/gui/psppire-var-sheet.c
b/src/ui/gui/psppire-var-sheet.c
index bffcfd1dd922bedf016d2e36c2b2d8d865a63a86..94b88050a135d2d90fcb6a313fa7181cc2dbd60f 100644
(file)
--- a/
src/ui/gui/psppire-var-sheet.c
+++ b/
src/ui/gui/psppire-var-sheet.c
@@
-16,7
+16,7
@@
#include <config.h>
#include "psppire-var-sheet.h"
#include <config.h>
#include "psppire-var-sheet.h"
-#include <ui/gui/sheet/psppire-axis
-impl
.h>
+#include <ui/gui/sheet/psppire-axis.h>
#include "helper.h"
#include "helper.h"
@@
-286,7
+286,6
@@
traverse_cell_callback (PsppireSheet *sheet,
-
/*
Callback whenever the active cell changes on the var sheet.
*/
/*
Callback whenever the active cell changes on the var sheet.
*/
@@
-296,7
+295,6
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
gint oldrow, gint oldcolumn,
gpointer data)
{
gint oldrow, gint oldcolumn,
gpointer data)
{
- PsppireSheetCellAttr attributes;
PsppireVarStore *var_store;
PsppireVarSheetClass *vs_class =
PSPPIRE_VAR_SHEET_CLASS(G_OBJECT_GET_CLASS (vs));
PsppireVarStore *var_store;
PsppireVarSheetClass *vs_class =
PSPPIRE_VAR_SHEET_CLASS(G_OBJECT_GET_CLASS (vs));
@@
-313,8
+311,6
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
g_return_if_fail (oldcolumn == PSPPIRE_VAR_STORE_COL_NAME ||
row < psppire_var_store_get_var_cnt (var_store));
g_return_if_fail (oldcolumn == PSPPIRE_VAR_STORE_COL_NAME ||
row < psppire_var_store_get_var_cnt (var_store));
- psppire_sheet_get_attributes (sheet, row, column, &attributes);
-
var = psppire_var_store_get_var (var_store, row);
switch (column)
var = psppire_var_store_get_var (var_store, row);
switch (column)
@@
-430,7
+426,8
@@
var_sheet_change_active_cell (PsppireVarSheet *vs,
case PSPPIRE_VAR_STORE_COL_DECIMALS:
case PSPPIRE_VAR_STORE_COL_COLUMNS:
{
case PSPPIRE_VAR_STORE_COL_DECIMALS:
case PSPPIRE_VAR_STORE_COL_COLUMNS:
{
- if ( attributes.is_editable)
+ if ( psppire_sheet_model_is_editable (PSPPIRE_SHEET_MODEL(var_store),
+ row, column))
{
gint r_min, r_max;
{
gint r_min, r_max;
@@
-492,7
+489,8
@@
psppire_var_sheet_realize (GtkWidget *w)
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (vs));
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (vs));
- vs->val_labs_dialog = val_labs_dialog_create (GTK_WINDOW (toplevel));
+ vs->val_labs_dialog = val_labs_dialog_create (GTK_WINDOW (toplevel),
+ PSPPIRE_SHEET (vs));
vs->missing_val_dialog = missing_val_dialog_create (GTK_WINDOW (toplevel));
vs->var_type_dialog = var_type_dialog_create (GTK_WINDOW (toplevel));
vs->missing_val_dialog = missing_val_dialog_create (GTK_WINDOW (toplevel));
vs->var_type_dialog = var_type_dialog_create (GTK_WINDOW (toplevel));
@@
-553,13
+551,13
@@
GtkWidget*
psppire_var_sheet_new (void)
{
gint i;
psppire_var_sheet_new (void)
{
gint i;
- PsppireAxis
Impl *ha = psppire_axis_impl
_new ();
- PsppireAxis
Impl *va = psppire_axis_impl
_new ();
+ PsppireAxis
*ha = psppire_axis
_new ();
+ PsppireAxis
*va = psppire_axis
_new ();
GtkWidget *w = g_object_new (psppire_var_sheet_get_type (), NULL);
for (i = 0 ; i < 10 ; ++i)
GtkWidget *w = g_object_new (psppire_var_sheet_get_type (), NULL);
for (i = 0 ; i < 10 ; ++i)
- psppire_axis_
impl_
append (ha, column_def[i].width);
+ psppire_axis_append (ha, column_def[i].width);
g_object_set (va,
"default-size", 25,
g_object_set (va,
"default-size", 25,