[GME-commit] GMESRC/GME/ObjectInspector InPlaceManager.cpp,1.23,1.24 InspectorList.cpp,1.39,1.40 ItemData.cpp,1.21,1.22

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/ObjectInspector
In directory escher:/tmp/cvs-serv19351

Modified Files:
	InPlaceManager.cpp InspectorList.cpp ItemData.cpp 
Log Message:
Fixes for:
-1 character typed in Multiline attribute and lost it
-draw attribute text as is (no '&' -> '_' conversion)


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: InPlaceManager.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/InPlaceManager.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** InPlaceManager.cpp	13 May 2005 17:40:48 -0000	1.23
--- InPlaceManager.cpp	6 Jul 2005 20:10:10 -0000	1.24
***************
*** 63,74 ****
  				
  				DisplayMultilineEdit(rectInPlace);
! 				CString strText;
! 				for(int i=0;i<=ListItem.Value.stringVal.GetUpperBound();i++)
  				{
  					strText+=ListItem.Value.stringVal[i];
! 					strText+="\r\n";
  				}
! 				// Without the last newline put into the edit box
! 				m_MultiEditCtrl.SetWindowText(strText.Left(strText.GetLength()-2));
  				m_MultiEditCtrl.SetFocus();
  				
--- 63,76 ----
  				
  				DisplayMultilineEdit(rectInPlace);
! 				CString strText; // zolmol modification
! 				int uLim = ListItem.Value.stringVal.GetUpperBound(); // if empty uLim == -1
! 				for(int i=0;i<=uLim;i++)
  				{
  					strText+=ListItem.Value.stringVal[i];
! 					if( i != uLim)
! 						strText+="\r\n";
  				}
! 				// there is no newline at the end of the last line
! 				m_MultiEditCtrl.SetWindowText(strText);//WAS: strText.Left(strText.GetLength()-2)
  				m_MultiEditCtrl.SetFocus();
  				
***************
*** 562,565 ****
--- 564,568 ----
  
  	int nLines=m_MultiEditCtrl.GetLineCount();
+ 	ASSERT( nLines); // nLines >= 1 always
  
  
***************
*** 576,579 ****
--- 579,583 ----
  			//nLineLength=m_MultiEditCtrl.LineLength(i); - does not work
  			int nRet=m_MultiEditCtrl.GetLine(i,strLine.GetBuffer(nLineLength), nLineLength);
+ 			ASSERT( nRet >= 0);
  			strLine.ReleaseBuffer(nRet);
  			strLine.TrimRight(_T("\r\n"));

Index: InspectorList.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/InspectorList.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** InspectorList.cpp	14 May 2004 13:27:16 -0000	1.39
--- InspectorList.cpp	6 Jul 2005 20:10:10 -0000	1.40
***************
*** 263,268 ****
  				ListItem.Value.toString(strTxt);
  				dc.DrawText(strTxt,CRect(rectRight.left,rectRight.top,
! 										rectRight.right,rectRight.bottom),DT_LEFT);
! 
  			}
  			else
--- 263,268 ----
  				ListItem.Value.toString(strTxt);
  				dc.DrawText(strTxt,CRect(rectRight.left,rectRight.top,
! 										rectRight.right,rectRight.bottom),DT_LEFT | DT_NOPREFIX);
! 				//DT_NOPREFIX by zolmol: draw string as is, do not interpret the & character
  			}
  			else
***************
*** 272,276 ****
  				dc.DrawText(strTxt,CRect(rectRight.left,rectRight.top,
  								rectRight.right,rectRight.bottom),
! 				DT_LEFT | DT_SINGLELINE);
  			}
  		}
--- 272,277 ----
  				dc.DrawText(strTxt,CRect(rectRight.left,rectRight.top,
  								rectRight.right,rectRight.bottom),
! 				DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);
! 				//DT_NOPREFIX by zolmol: draw string as is, do not interpret the & character			
  			}
  		}

Index: ItemData.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/ObjectInspector/ItemData.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ItemData.cpp	17 Jun 2005 19:31:26 -0000	1.21
--- ItemData.cpp	6 Jul 2005 20:10:10 -0000	1.22
***************
*** 351,358 ****
  				{
  					strString+=stringVal[i];
! 					strString+="\r\n";
  				}
! 				// Trimming last "\r\n"
! 				strString=strString.Left(strString.GetLength()-2);
  				bRetVal=true;
  			}
--- 351,359 ----
  				{
  					strString+=stringVal[i];
! 					if( i != nUpperBound)
! 						strString+="\r\n";
  				}
! 				//WAS: Trimming last "\r\n"
! 				//WAS: strString=strString.Left(strString.GetLength()-2);
  				bRetVal=true;
  			}