[GME-commit] GMESRC/GME/Gme GMEView.h,1.56,1.57 GMEView.cpp,1.139,1.140

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

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

Modified Files:
	GMEView.h GMEView.cpp 
Log Message:
Panning window background color

CVS User: bogyom

Index: GMEView.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** GMEView.h	5 May 2004 18:32:42 -0000	1.56
--- GMEView.h	6 May 2004 17:47:32 -0000	1.57
***************
*** 38,41 ****
--- 38,43 ----
  	unsigned int m_lastPrnPage;
  	void setZoomPoint(int curzoom, CPoint point);
+ 
+ public:
  	void DoPannWinRefresh();
  

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** GMEView.cpp	5 May 2004 18:32:42 -0000	1.139
--- GMEView.cpp	6 May 2004 17:47:32 -0000	1.140
***************
*** 105,109 ****
  			attrNeedsRefresh = false;
  		}
! 		view->m_refreshpannwin = true; // terge 
  		break;
  	}
--- 105,110 ----
  			attrNeedsRefresh = false;
  		}
! //		view->m_refreshpannwin = true; // terge 
! 		view->DoPannWinRefresh();
  		break;
  	}
***************
*** 506,509 ****
--- 507,511 ----
  	pannDC->SelectObject(pannBmp);
  
+ 	// set background color
  	pannDC->SetMapMode(MM_TEXT);
  	DWORD dw1 = GetSysColor(COLOR_WINDOW);
***************
*** 511,515 ****
  	BYTE g1 = GetGValue(dw1); 
  	BYTE b1 = GetBValue(dw1); 
! 	pannDC->FillSolidRect(&target, RGB(r1,g1,b1));
  
  	pannDC->SetMapMode(MM_ISOTROPIC);
--- 513,517 ----
  	BYTE g1 = GetGValue(dw1); 
  	BYTE b1 = GetBValue(dw1); 
! 	pannDC->FillSolidRect(&target, bgColor); // RGB(r1,g1,b1));
  
  	pannDC->SetMapMode(MM_ISOTROPIC);
***************
*** 541,545 ****
  	CMainFrame* main = (CMainFrame*)AfxGetMainWnd();
  
! 	main->m_pannWin.SetBitmapDC(pannDC, extent, target);
  }
  
--- 543,547 ----
  	CMainFrame* main = (CMainFrame*)AfxGetMainWnd();
  
! 	main->m_pannWin.SetBitmapDC(pannDC, extent, target, bgColor);
  }
  
***************
*** 727,736 ****
  		CPoint pt = GetScrollPosition();
  		onScreen->BitBlt(pt.x-5,pt.y-5,r.Width()+10,r.Height()+10,offScreen,pt.x-5,pt.y-5,SRCCOPY);
! 		if (m_refreshpannwin)
  		{
  			m_refreshpannwin = false;
  			DoPannWinRefresh();
  		}
! 	}
  }
  
--- 729,738 ----
  		CPoint pt = GetScrollPosition();
  		onScreen->BitBlt(pt.x-5,pt.y-5,r.Width()+10,r.Height()+10,offScreen,pt.x-5,pt.y-5,SRCCOPY);
! /*		if (m_refreshpannwin)
  		{
  			m_refreshpannwin = false;
  			DoPannWinRefresh();
  		}
! */	}
  }
  
***************
*** 1145,1149 ****
  
  	CRect extent(0,0,0,0), target(0,0,0,0); // terge
! 	main->m_pannWin.SetBitmapDC(NULL, extent, target);
  	CScrollZoomView::OnDestroy();
  }
--- 1147,1151 ----
  
  	CRect extent(0,0,0,0), target(0,0,0,0); // terge
! 	main->m_pannWin.SetBitmapDC(NULL, extent, target, bgColor);
  	CScrollZoomView::OnDestroy();
  }
***************
*** 1552,1556 ****
  
  	EndWaitCursor();
! 	m_refreshpannwin = true;	// terge - graphics modified
  }
  
--- 1554,1559 ----
  
  	EndWaitCursor();
! //	m_refreshpannwin = true;	// terge - graphics modified
! 	DoPannWinRefresh();
  }
  
***************
*** 3174,3178 ****
  			selectedAnnotations.RemoveAll();
  
! 			m_refreshpannwin = true;
  			Invalidate();
  		}
--- 3177,3182 ----
  			selectedAnnotations.RemoveAll();
  
! //			m_refreshpannwin = true;
! 			DoPannWinRefresh();
  			Invalidate();
  		}
***************
*** 3307,3311 ****
  		selectedAnnotations.RemoveAll();
  
! 		m_refreshpannwin = true;
  		Invalidate();
  	}
--- 3311,3316 ----
  		selectedAnnotations.RemoveAll();
  
! //		m_refreshpannwin = true;
! 		DoPannWinRefresh();
  		Invalidate();
  	}
***************
*** 4690,4696 ****
  	CGMEView * gmeviewI = (CGMEView *)pDeactiveView;
  	if (bActivate)
! 		gmeviewA->m_refreshpannwin = true; // ??
! 	else
! 		gmeviewI->m_refreshpannwin = false; // ??
  	CScrollZoomView::OnActivateView(bActivate, pActivateView, pDeactiveView);
  }
--- 4695,4704 ----
  	CGMEView * gmeviewI = (CGMEView *)pDeactiveView;
  	if (bActivate)
! 	{
! //		gmeviewA->m_refreshpannwin = true; // ??
! 		gmeviewA->DoPannWinRefresh();
! 	}
! //	else
! //		gmeviewI->m_refreshpannwin = false; // ??
  	CScrollZoomView::OnActivateView(bActivate, pActivateView, pDeactiveView);
  }