[q-lang-cvs] qcalc qcalc.q,1.153,1.154

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/qcalc
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14457

Modified Files:
	qcalc.q 
Log Message:
disable word wrap on computed cells

Index: qcalc.q
===================================================================
RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** qcalc.q	16 Nov 2007 07:25:34 -0000	1.153
--- qcalc.q	16 Nov 2007 08:59:23 -0000	1.154
***************
*** 936,940 ****
  		= qt TABLE "setItem" (I,J,IT) ||
  		  qt IT "setSpan" (N,M) ||
! 		  qt IT "setWordWrap" true ||
  		  insert_cells ((I,J),IT) || IT
  		    if not is_nil IT
--- 936,940 ----
  		= qt TABLE "setItem" (I,J,IT) ||
  		  qt IT "setSpan" (N,M) ||
! 		  qt IT "setWordWrap" $ not member (get EVAL) (I,J) ||
  		  insert_cells ((I,J),IT) || IT
  		    if not is_nil IT
***************
*** 1087,1092 ****
  		    otherwise;
  
  set_cell (I,J) S
! 		= qt TABLE "setText" (I,J,S) if (I,J) = real_index (I,J);
  
  set_pixmap (I,J) PM
--- 1087,1100 ----
  		    otherwise;
  
+ init_wrap (I,J)	= qt IT "setWordWrap" $ not member (get EVAL) (I,J)
+ 		    if not is_nil IT
+ 		    where IT:QtObject = qt TABLE "item" (I,J);
+ 
+ init_cell (I,J,S)
+ 		= qt TABLE "setText" (I,J,S) || init_wrap (I,J);
+ 
  set_cell (I,J) S
! 		= qt TABLE "setText" (I,J,S) || init_wrap (I,J)
! 		    if (I,J) = real_index (I,J);
  
  set_pixmap (I,J) PM
***************
*** 2003,2007 ****
  		      EVAL := hdict (zip KEYS2 (zip3 VALS2 XVALS2 DEPS)) ||
  		      make_xref ||
! 		      do (qt TABLE "setText") L1 ||
  		      do (\I.qt TABLE "setRowHeight" (I,DEF_HT)) ROWS ||
  		      do (\J.qt TABLE "setColumnWidth" (J,DEF_WD)) COLS ||
--- 2011,2015 ----
  		      EVAL := hdict (zip KEYS2 (zip3 VALS2 XVALS2 DEPS)) ||
  		      make_xref ||
! 		      do init_cell L1 ||
  		      do (\I.qt TABLE "setRowHeight" (I,DEF_HT)) ROWS ||
  		      do (\J.qt TABLE "setColumnWidth" (J,DEF_WD)) COLS ||