[GME-commit] GMESRC/GME/Gme GMEOLEModel.cpp,1.4,1.5 GMEView.cpp,1.130,1.131

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

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

Modified Files:
	GMEOLEModel.cpp GMEView.cpp 
Log Message:
Metafiles were not released properly. Also added some primitive error handling.


CVS User: volgy

Index: GMEOLEModel.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEModel.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GMEOLEModel.cpp	25 Jan 2004 17:31:45 -0000	1.4
--- GMEOLEModel.cpp	12 Mar 2004 15:41:54 -0000	1.5
***************
*** 125,135 ****
  	PRECONDITION_VALID_MODEL
  
! 	CMetaFileDC * cDC = new CMetaFileDC();
! 	cDC->CreateEnhanced(m_view->GetDC(),filePath,NULL,_T("GME Model"));
! 	cDC->m_bPrinting = TRUE;		// HACK by Peter (c)
! 	m_view->OnDraw(cDC);
  
! 	cDC->CloseEnhanced();	
! 	delete cDC;
  }
  
--- 125,142 ----
  	PRECONDITION_VALID_MODEL
  
! 	CMetaFileDC cDC;
! 	BOOL ret = cDC.CreateEnhanced(m_view->GetDC(),filePath,NULL,_T("GME Model"));
! 	if (ret == FALSE) {
! 		AfxMessageBox("Unable to create metafile.", MB_OK | MB_ICONSTOP);
! 		return;
! 	}
  
! 	cDC.m_bPrinting = TRUE;		// HACK by Peter (c)
! 	m_view->OnDraw(&cDC);
! 
! 	HENHMETAFILE hEmf = cDC.CloseEnhanced();
! 	if ( hEmf ) {
! 		DeleteEnhMetaFile(hEmf);
! 	}
  }
  

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** GMEView.cpp	11 Mar 2004 22:25:52 -0000	1.130
--- GMEView.cpp	12 Mar 2004 15:41:54 -0000	1.131
***************
*** 5782,5789 ****
  	CMetaFileDC cDC;
  	BOOL ret = cDC.CreateEnhanced(GetDC(),filePath,NULL,_T("GME Model"));
  	cDC.m_bPrinting = TRUE;		// HACK by Peter (c)
  	OnDraw(&cDC);
  
! 	cDC.CloseEnhanced();	
  }
  
--- 5782,5797 ----
  	CMetaFileDC cDC;
  	BOOL ret = cDC.CreateEnhanced(GetDC(),filePath,NULL,_T("GME Model"));
+ 	if (ret == FALSE) {
+ 		AfxMessageBox("Unable to create metafile.", MB_OK | MB_ICONSTOP);
+ 		return;
+ 	}
+ 
  	cDC.m_bPrinting = TRUE;		// HACK by Peter (c)
  	OnDraw(&cDC);
  
! 	HENHMETAFILE hEmf = cDC.CloseEnhanced();
! 	if ( hEmf ) {
! 		DeleteEnhMetaFile(hEmf);
! 	}
  }