[GME-commit] GMESRC/GME/Gme ModelPropertiesDlgBar.cpp,1.5,1.6

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

Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv1357

Modified Files:
	ModelPropertiesDlgBar.cpp 
Log Message:
undo Peter - zoom

CVS User: bogyom

Index: ModelPropertiesDlgBar.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/ModelPropertiesDlgBar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ModelPropertiesDlgBar.cpp	18 May 2004 13:30:59 -0000	1.5
--- ModelPropertiesDlgBar.cpp	18 May 2004 20:08:09 -0000	1.6
***************
*** 64,73 ****
  	// enter pressed on which item
  	CWnd* fwin = GetFocus();
  	CWnd* zoom = GetDlgItem(IDC_ZOOMS);
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
  	if (fwin->m_hWnd == edit->m_hWnd)
  	{
  		char buff[100];
! 		// int len = edit->GetLine(0, buff, sizeof(buff)-1);
  		int kk = atoi(buff);
  		kk = abs(kk);
--- 64,79 ----
  	// enter pressed on which item
  	CWnd* fwin = GetFocus();
+ 	if (!fwin)
+ 		return;
  	CWnd* zoom = GetDlgItem(IDC_ZOOMS);
+ 	if (!zoom)
+ 		return;
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
+ 	if (!edit)
+ 		return;
  	if (fwin->m_hWnd == edit->m_hWnd)
  	{
  		char buff[100];
! 		int len = edit->GetLine(0, buff, sizeof(buff)-1);
  		int kk = atoi(buff);
  		kk = abs(kk);
***************
*** 148,154 ****
  	// related to the current one in the edit box 
  	CComboBox* zoom = (CComboBox*)GetDlgItem(IDC_ZOOMS);
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
  	char buff[100];
! 	// int len = edit->GetLine(0, buff, sizeof(buff)-1);
  	kk = atoi(buff);
  	if (!kk)
--- 154,164 ----
  	// related to the current one in the edit box 
  	CComboBox* zoom = (CComboBox*)GetDlgItem(IDC_ZOOMS);
+ 	if (!zoom)
+ 		return;
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
+ 	if (!edit)
+ 		return;
  	char buff[100];
! 	int len = edit->GetLine(0, buff, sizeof(buff)-1);
  	kk = atoi(buff);
  	if (!kk)
***************
*** 166,172 ****
  	// related to the current one in the edit box 
  	CComboBox* zoom = (CComboBox*)GetDlgItem(IDC_ZOOMS);
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
  	char buff[100];
! 	// int len = edit->GetLine(0, buff, sizeof(buff)-1);
  	kk = atoi(buff);
  	if (!kk)
--- 176,186 ----
  	// related to the current one in the edit box 
  	CComboBox* zoom = (CComboBox*)GetDlgItem(IDC_ZOOMS);
+ 	if (!zoom)
+ 		return;
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
+ 	if (!edit)
+ 		return;
  	char buff[100];
! 	int len = edit->GetLine(0, buff, sizeof(buff)-1);
  	kk = atoi(buff);
  	if (!kk)