[GME-commit] GMESRC/GME/Gme GME.dsp,1.86,1.87 GMEApp.cpp,1.115,1.116 GMEView.cpp,1.148,1.149 GmePrintDialog.cpp,1.4,1.5 ModelPropertiesDlgBar.cpp,1.4,1.5 PannButton.cpp,1.6,1.7 PannWinDlg.cpp,1.4,1.5 PreviewWnd.cpp,1.2,1.3

Tue May 18 09:31:02 CDT 2004

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

Modified Files:
	GME.dsp GMEApp.cpp GMEView.cpp GmePrintDialog.cpp 
	ModelPropertiesDlgBar.cpp PannButton.cpp PannWinDlg.cpp 
	PreviewWnd.cpp 
Log Message:
Eliminated _ALL_ warning messages.

CVS User: volgy

Index: GME.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.dsp,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** GME.dsp	22 Apr 2004 12:25:51 -0000	1.86
--- GME.dsp	18 May 2004 13:30:59 -0000	1.87
***************
*** 801,804 ****
--- 801,818 ----
  # End Target
  # End Project
+ # Section GME : {72ADFD7B-2C39-11D0-9903-00A0C91BC942}
+ # 	1:17:ID_INDICATOR_TIME:103
+ # 	2:2:BH:
+ # 	2:17:ID_INDICATOR_TIME:ID_INDICATOR_TIME
+ # End Section
+ # Section GME : {B718CCF7-5055-40DD-9CBD-AB17F72AB113}
+ # 	2:5:Class:CSearch
+ # 	2:10:HeaderFile:search.h
+ # 	2:8:ImplFile:search.cpp
+ # End Section
+ # Section GME : {72ADFD78-2C39-11D0-9903-00A0C91BC942}
+ # 	1:10:IDB_SPLASH:112
+ # 	2:21:SplashScreenInsertKey:4.0
+ # End Section
  # Section GME : {A7DC846C-DAE3-4B3F-B947-71D85B5F6437}
  # 	2:5:Class:CObjectInspector
***************
*** 815,838 ****
  # 	2:8:ImplFile:activebrowser.cpp
  # End Section
- # Section GME : {B718CCF7-5055-40DD-9CBD-AB17F72AB113}
- # 	2:5:Class:CSearch
- # 	2:10:HeaderFile:search.h
- # 	2:8:ImplFile:search.cpp
- # End Section
- # Section GME : {5C402C8B-C848-11D3-9A6E-00902721DB65}
- # 	2:21:DefaultSinkHeaderFile:activebrowser.h
- # 	2:16:DefaultSinkClass:CActiveBrowser
- # End Section
  # Section GME : {B786F53C-297F-4DB8-8060-D45057217AEE}
  # 	2:21:DefaultSinkHeaderFile:objectinspector.h
  # 	2:16:DefaultSinkClass:CObjectInspector
  # End Section
! # Section GME : {72ADFD7B-2C39-11D0-9903-00A0C91BC942}
! # 	1:17:ID_INDICATOR_TIME:103
! # 	2:2:BH:
! # 	2:17:ID_INDICATOR_TIME:ID_INDICATOR_TIME
! # End Section
! # Section GME : {72ADFD78-2C39-11D0-9903-00A0C91BC942}
! # 	1:10:IDB_SPLASH:112
! # 	2:21:SplashScreenInsertKey:4.0
  # End Section
--- 829,838 ----
  # 	2:8:ImplFile:activebrowser.cpp
  # End Section
  # Section GME : {B786F53C-297F-4DB8-8060-D45057217AEE}
  # 	2:21:DefaultSinkHeaderFile:objectinspector.h
  # 	2:16:DefaultSinkClass:CObjectInspector
  # End Section
! # Section GME : {5C402C8B-C848-11D3-9A6E-00902721DB65}
! # 	2:21:DefaultSinkHeaderFile:activebrowser.h
! # 	2:16:DefaultSinkClass:CActiveBrowser
  # End Section

Index: GMEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** GMEApp.cpp	14 May 2004 13:27:15 -0000	1.115
--- GMEApp.cpp	18 May 2004 13:30:59 -0000	1.116
***************
*** 449,453 ****
--- 449,455 ----
  	// Save the project
  	try {
+ #pragma warning(disable: 4310) // cast truncates constant value
  		COMTHROW(mgaProject->Save(CComBSTR(conn), VARIANT_TRUE));
+ #pragma warning(default: 4310) // cast truncates constant value
  		CGMEEventLogger::LogGMEEvent("CGMEApp::Autosave succeeded " + 
  			conn + "\r\n");

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** GMEView.cpp	17 May 2004 17:50:33 -0000	1.148
--- GMEView.cpp	18 May 2004 13:30:59 -0000	1.149
***************
*** 506,522 ****
  	CClientDC tmpDC(this);

! 	BOOL ret1 = pannDC->CreateCompatibleDC(&tmpDC);
  	CBitmap * pannBmp = new CBitmap();

! 
! 	BOOL ret2 = pannBmp->CreateCompatibleBitmap(&tmpDC, target.Width(), target.Height());
  	pannDC->SelectObject(pannBmp);

  	// set background color
  	pannDC->SetMapMode(MM_TEXT);
! 	DWORD dw1 = GetSysColor(COLOR_WINDOW);
! 	BYTE r1 = GetRValue(dw1);
! 	BYTE g1 = GetGValue(dw1); 
! 	BYTE b1 = GetBValue(dw1); 
  	pannDC->FillSolidRect(&target, bgColor); // RGB(r1,g1,b1));

--- 506,523 ----
  	CClientDC tmpDC(this);

! 	// TODO: Error checking
! 	pannDC->CreateCompatibleDC(&tmpDC);
  	CBitmap * pannBmp = new CBitmap();

! 	// TODO: Error checking
! 	pannBmp->CreateCompatibleBitmap(&tmpDC, target.Width(), target.Height());
  	pannDC->SelectObject(pannBmp);

  	// set background color
  	pannDC->SetMapMode(MM_TEXT);
! 	// DWORD dw1 = GetSysColor(COLOR_WINDOW);
! 	// BYTE r1 = GetRValue(dw1);
! 	// BYTE g1 = GetGValue(dw1); 
! 	// BYTE b1 = GetBValue(dw1); 
  	pannDC->FillSolidRect(&target, bgColor); // RGB(r1,g1,b1));

***************
*** 950,956 ****

  	CBitmap logo;
! 	BOOL ret = logo.LoadBitmap(IDB_BITMAP_LOGO);
  	CDC logoDC;
! 	BOOL ret1 = logoDC.CreateCompatibleDC(pDC);
  	logoDC.SetMapMode(MM_TEXT);
  	CBitmap * bmp = logoDC.SelectObject(&logo);
--- 951,959 ----

  	CBitmap logo;
! 	// TODO: Error checking
! 	logo.LoadBitmap(IDB_BITMAP_LOGO);
  	CDC logoDC;
! 	// TODO: Error checking
! 	logoDC.CreateCompatibleDC(pDC);
  	logoDC.SetMapMode(MM_TEXT);
  	CBitmap * bmp = logoDC.SelectObject(&logo);
***************
*** 959,963 ****
  		pDC->SetStretchBltMode(HALFTONE);
  //	BOOL ret2 = pDC->StretchBlt(0, txty-LOGOSIZE/4,LOGOSIZE/4,LOGOSIZE/4,&logoDC,0,0,LOGOSIZE, LOGOSIZE, SRCCOPY);
! 	BOOL ret2 = pDC->StretchBlt(0, txty-LOGOSIZE/2,LOGOSIZE/2,LOGOSIZE/2,&logoDC,0,0,LOGOSIZE, LOGOSIZE, SRCCOPY);
  	if (bmp)
  		bmp = logoDC.SelectObject((CBitmap*)bmp);
--- 962,967 ----
  		pDC->SetStretchBltMode(HALFTONE);
  //	BOOL ret2 = pDC->StretchBlt(0, txty-LOGOSIZE/4,LOGOSIZE/4,LOGOSIZE/4,&logoDC,0,0,LOGOSIZE, LOGOSIZE, SRCCOPY);
! 	// TODO: Error checking
! 	pDC->StretchBlt(0, txty-LOGOSIZE/2,LOGOSIZE/2,LOGOSIZE/2,&logoDC,0,0,LOGOSIZE, LOGOSIZE, SRCCOPY);
  	if (bmp)
  		bmp = logoDC.SelectObject((CBitmap*)bmp);
***************
*** 1082,1086 ****
  					else
  						devmode->dmOrientation = (short)DMORIENT_PORTRAIT;
! 					BOOL ret2 = cdc.ResetDC(devmode); // done for the AttribDC
  					cdc.Detach();
  				}
--- 1086,1091 ----
  					else
  						devmode->dmOrientation = (short)DMORIENT_PORTRAIT;
! 					// TODO: Error checking
! 					cdc.ResetDC(devmode); // done for the AttribDC
  					cdc.Detach();
  				}
***************
*** 6010,6017 ****
  }

! LRESULT CGMEView::OnZoom(WPARAM wParam, LPARAM lParam)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnZoom() in "+path+name+"\r\n");
! 	BOOL userdef = (BOOL)wParam;
  	int zoom = (int)lParam;

--- 6015,6022 ----
  }

! LRESULT CGMEView::OnZoom(WPARAM, LPARAM lParam)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnZoom() in "+path+name+"\r\n");
! 	// BOOL userdef = (BOOL)wParam;
  	int zoom = (int)lParam;

***************
*** 6089,6093 ****
  }

! LRESULT CGMEView::OnPannRefresh(WPARAM wParam, LPARAM lParam)
  {
  	DoPannWinRefresh();
--- 6094,6098 ----
  }

! LRESULT CGMEView::OnPannRefresh(WPARAM, LPARAM)
  {
  	DoPannWinRefresh();

Index: GmePrintDialog.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GmePrintDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GmePrintDialog.cpp	25 Mar 2004 16:45:06 -0000	1.4
--- GmePrintDialog.cpp	18 May 2004 13:30:59 -0000	1.5
***************
*** 226,234 ****
  	CClientDC demoDC(&m_demo);

! 	BOOL ret1 = peviewDC->CreateCompatibleDC(&demoDC);
  	CBitmap * prevBmp = new CBitmap();

! 	BOOL ret2 = prevBmp->CreateCompatibleBitmap(&demoDC, bitRect.Width(), bitRect.Height());
  	peviewDC->SelectObject(prevBmp);

--- 226,236 ----
  	CClientDC demoDC(&m_demo);

! 	// TODO: Error checking
! 	peviewDC->CreateCompatibleDC(&demoDC);
  	CBitmap * prevBmp = new CBitmap();

! 	// TODO: Error checking
! 	prevBmp->CreateCompatibleBitmap(&demoDC, bitRect.Width(), bitRect.Height());
  	peviewDC->SelectObject(prevBmp);

Index: ModelPropertiesDlgBar.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/ModelPropertiesDlgBar.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ModelPropertiesDlgBar.cpp	11 Mar 2004 18:05:07 -0000	1.4
--- ModelPropertiesDlgBar.cpp	18 May 2004 13:30:59 -0000	1.5
***************
*** 69,73 ****
  	{
  		char buff[100];
! 		int len = edit->GetLine(0, buff, sizeof(buff)-1);
  		int kk = atoi(buff);
  		kk = abs(kk);
--- 69,73 ----
  	{
  		char buff[100];
! 		// int len = edit->GetLine(0, buff, sizeof(buff)-1);
  		int kk = atoi(buff);
  		kk = abs(kk);
***************
*** 150,154 ****
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
  	char buff[100];
! 	int len = edit->GetLine(0, buff, sizeof(buff)-1);
  	kk = atoi(buff);
  	if (!kk)
--- 150,154 ----
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
  	char buff[100];
! 	// int len = edit->GetLine(0, buff, sizeof(buff)-1);
  	kk = atoi(buff);
  	if (!kk)
***************
*** 168,172 ****
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
  	char buff[100];
! 	int len = edit->GetLine(0, buff, sizeof(buff)-1);
  	kk = atoi(buff);
  	if (!kk)
--- 168,172 ----
  	CEdit* edit = (CEdit*)(zoom->GetDlgItem(1001));
  	char buff[100];
! 	// int len = edit->GetLine(0, buff, sizeof(buff)-1);
  	kk = atoi(buff);
  	if (!kk)

Index: PannButton.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/PannButton.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PannButton.cpp	7 May 2004 20:58:25 -0000	1.6
--- PannButton.cpp	18 May 2004 13:30:59 -0000	1.7
***************
*** 109,114 ****
  	dd = (dd < 1)? dd: 1; 

! 	clientr.right = min(clientr.right, dd * m_bitmapSizeStored.Width());
! 	clientr.bottom = min(clientr.bottom, dd * m_bitmapSizeStored.Height());
  	m_bitmapOnScreen = clientr;
  }
--- 109,114 ----
  	dd = (dd < 1)? dd: 1; 

! 	clientr.right = min(clientr.right, (LONG)(dd * m_bitmapSizeStored.Width()));
! 	clientr.bottom = min(clientr.bottom, (LONG)(dd * m_bitmapSizeStored.Height()));
  	m_bitmapOnScreen = clientr;
  }
***************
*** 119,126 ****
  	m_storedToScreenRy = (double)(m_bitmapOnScreen.Height())/ m_bitmapSizeStored.Height();
  	vRect = CRect(0,0,0,0);
! 	vRect.left = m_viewRectOnStored.left * m_storedToScreenRx;
! 	vRect.right = m_viewRectOnStored.right * m_storedToScreenRx;
! 	vRect.top = m_viewRectOnStored.top * m_storedToScreenRy;
! 	vRect.bottom = m_viewRectOnStored.bottom * m_storedToScreenRy;
  	vRect.right = min(vRect.right, m_bitmapOnScreen.right);
  	vRect.bottom = min(vRect.bottom, m_bitmapOnScreen.bottom);
--- 119,126 ----
  	m_storedToScreenRy = (double)(m_bitmapOnScreen.Height())/ m_bitmapSizeStored.Height();
  	vRect = CRect(0,0,0,0);
! 	vRect.left = (LONG)(m_viewRectOnStored.left * m_storedToScreenRx);
! 	vRect.right = (LONG)(m_viewRectOnStored.right * m_storedToScreenRx);
! 	vRect.top = (LONG)(m_viewRectOnStored.top * m_storedToScreenRy);
! 	vRect.bottom = (LONG)(m_viewRectOnStored.bottom * m_storedToScreenRy);
  	vRect.right = min(vRect.right, m_bitmapOnScreen.right);
  	vRect.bottom = min(vRect.bottom, m_bitmapOnScreen.bottom);
***************
*** 158,162 ****
  	// transform bitmap to screen
  	bmpToScreen(clientr);
! 	BOOL ret = dc.StretchBlt(0, 0, m_bitmapOnScreen.Width(), m_bitmapOnScreen.Height(), m_bitmapDC, 
  							 0, 0, m_bitmapSizeStored.Width(), m_bitmapSizeStored.Height(), SRCCOPY);
  	CBrush brush1;
--- 158,163 ----
  	// transform bitmap to screen
  	bmpToScreen(clientr);
! 	// TODO: Error checking
! 	dc.StretchBlt(0, 0, m_bitmapOnScreen.Width(), m_bitmapOnScreen.Height(), m_bitmapDC, 
  							 0, 0, m_bitmapSizeStored.Width(), m_bitmapSizeStored.Height(), SRCCOPY);
  	CBrush brush1;

Index: PannWinDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/PannWinDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PannWinDlg.cpp	7 May 2004 20:58:25 -0000	1.4
--- PannWinDlg.cpp	18 May 2004 13:30:59 -0000	1.5
***************
*** 35,39 ****
  {
  	BOOL ret = CDialog::OnInitDialog();
! 	bool rett = m_pvbutton.Create();
  	return ret;
  }
--- 35,40 ----
  {
  	BOOL ret = CDialog::OnInitDialog();
! 	// TODO: Error checking
! 	m_pvbutton.Create();
  	return ret;
  }

Index: PreviewWnd.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/PreviewWnd.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PreviewWnd.cpp	1 Mar 2004 20:15:52 -0000	1.2
--- PreviewWnd.cpp	18 May 2004 13:30:59 -0000	1.3
***************
*** 51,55 ****

  		m_bitmapDC->SetMapMode(MM_TEXT);
! 		BOOL ret = dc.BitBlt(0, 0, vrect.Width(), vrect.Height(), m_bitmapDC, 0, 0, SRCCOPY);
  		dc.Detach(); 
  	}
--- 51,56 ----

  		m_bitmapDC->SetMapMode(MM_TEXT);
! 		// TODO: Error checking
! 		dc.BitBlt(0, 0, vrect.Width(), vrect.Height(), m_bitmapDC, 0, 0, SRCCOPY);
  		dc.Detach(); 
  	}