[Pspp-cvs] pspp/src/ui/gui ChangeLog psppire-data-store.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/12/16 22:13:12

Modified files:
        src/ui/gui     : ChangeLog psppire-data-store.c 

Log message:
        Don't assume that ALIGN_* and GTK_JUSTIFY_* values coincide.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- ChangeLog   16 Dec 2006 22:11:08 -0000      1.28
+++ ChangeLog   16 Dec 2006 22:13:12 -0000      1.29
@@ -1,3 +1,8 @@
+Sat Dec 16 14:13:07 2006  Ben Pfaff  <address@hidden>
+
+       * psppire-data-store.c (geometry_get_justification): Don't assume
+       that ALIGN_* and GTK_JUSTIFY_* values coincide.
+
 Sat Dec 16 14:10:43 2006  Ben Pfaff  <address@hidden>
 
        * psppire-var-store.c (text_for_column): Adjust to account for new

Index: psppire-data-store.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- psppire-data-store.c        16 Dec 2006 04:26:43 -0000      1.24
+++ psppire-data-store.c        16 Dec 2006 22:13:12 -0000      1.25
@@ -715,9 +715,9 @@
 
   pv = psppire_dict_get_variable(ds->dict, unit);
 
-  /* Kludge: Happily GtkJustification is defined similarly
-     to enum alignment from pspp/variable.h */
-  return var_get_alignment(pv);
+  return (var_get_alignment (pv) == ALIGN_LEFT ? GTK_JUSTIFY_LEFT
+          : var_get_alignment (pv) == ALIGN_RIGHT ? GTK_JUSTIFY_RIGHT
+          : GTK_JUSTIFY_CENTER);
 }