[GME-commit] GMESRC/GME/Gme GMEView.h,1.58,1.59 GMEView.cpp,1.144,1.145

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

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

Modified Files:
	GMEView.h GMEView.cpp 
Log Message:
panning window refresh

CVS User: bogyom

Index: GMEView.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** GMEView.h	7 May 2004 20:58:25 -0000	1.58
--- GMEView.h	10 May 2004 20:05:17 -0000	1.59
***************
*** 40,43 ****
--- 40,44 ----
  
  public:
+ 	bool m_isActive;
  	void DoPannWinRefresh();
  

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** GMEView.cpp	10 May 2004 14:33:05 -0000	1.144
--- GMEView.cpp	10 May 2004 20:05:17 -0000	1.145
***************
*** 390,393 ****
--- 390,394 ----
  CGMEView::CGMEView()
  {
+ 	m_isActive = false;
  	m_preview = false;
  	m_scalePrnPages = 1;
***************
*** 730,733 ****
--- 731,735 ----
  		if (m_refreshpannwin)
  		{
+ 			TRACE("CGMEView::OnDraw\n");
  			m_refreshpannwin = false;
  			DoPannWinRefresh();
***************
*** 1426,1429 ****
--- 1428,1438 ----
  void CGMEView::Reset(bool doInvalidate)
  {
+ //	CGMEView* gmeviewA = (CGMEView*)GetActiveView();
+ //	if (gmeviewA)
+ 	if (m_isActive)
+ 	{
+ 		TRACE("CGMEView::Reset GetActiveView\n");
+ 		/*gmeviewA->*/m_refreshpannwin = true; 
+ 	}
  	try {
  		BeginTransaction(TRANSACTION_READ_ONLY);
***************
*** 1560,1570 ****
  
  	EndWaitCursor();
- 	CGMEView* gmeviewA = (CGMEView*)GetActiveView();
- 
- 	if (gmeviewA)
- 	{
- 		TRACE("CGMEView::Reset\n");
- 		gmeviewA->m_refreshpannwin = true; 
- 	}
  }
  
--- 1569,1572 ----
***************
*** 3188,3196 ****
  			selectedAnnotations.RemoveAll();
  
! 			CGMEView* gmeviewA = (CGMEView*)GetActiveView();
! 			if (gmeviewA)
  			{
! 				TRACE("CGMEView::ChangeAspect\n");
! 				gmeviewA->m_refreshpannwin = true; 
  			}
  			Invalidate();
--- 3190,3199 ----
  			selectedAnnotations.RemoveAll();
  
! //			CGMEView* gmeviewA = (CGMEView*)GetActiveView();
! //			if (gmeviewA)
! 			if (m_isActive)
  			{
! 				TRACE("CGMEView::ChangeAspect activeView\n");
! 				/*gmeviewA->*/m_refreshpannwin = true; 
  			}
  			Invalidate();
***************
*** 3216,3219 ****
--- 3219,3223 ----
  {
  	CMDIFrameWnd *pFrame = (CMDIFrameWnd*)AfxGetApp()->m_pMainWnd;
+ //	CMDIFrameWnd *pFrame = (CMDIFrameWnd*)AfxGetMainWnd( );
  	if (!pFrame)
  	{
***************
*** 3221,3224 ****
--- 3225,3230 ----
  	}
  	CMDIChildWnd *pChild = (CMDIChildWnd *) pFrame->GetActiveFrame();
+ //	BOOL ismax = FALSE;
+ //	CMDIChildWnd *pChild = pFrame->MDIGetActive(&ismax);
  	if (!pChild)
  	{
***************
*** 4693,4702 ****
  {
  
! 	CGMEView* gmeviewA = (CGMEView*)GetActiveView();
! 
! 	if (gmeviewA)
  	{
  		TRACE("CGMEView::OnActivateFrame\n");
! 		gmeviewA->m_refreshpannwin = true; 
  	}
  	CScrollZoomView::OnActivateFrame(nState, pFrameWnd);
--- 4699,4708 ----
  {
  
! //	CGMEView* gmeviewA = (CGMEView*)GetActiveView();
! //	if (gmeviewA)
! 	if (m_isActive)
  	{
  		TRACE("CGMEView::OnActivateFrame\n");
! 		/*gmeviewA->*/m_refreshpannwin = true; 
  	}
  	CScrollZoomView::OnActivateFrame(nState, pFrameWnd);
***************
*** 4729,4737 ****
  	CMainFrame::theInstance->UpdateTitle(theApp.projectName);
  
! 	CGMEView * gmeviewA = (CGMEView *)pActivateView;
! 	CGMEView * gmeviewI = (CGMEView *)pDeactiveView;
  	if (bActivate)
  	{
! 		if (gmeviewA  &&  guiMeta)
  		{
  			TRACE("CGMEView::OnActivateView DoPannWinRefresh\n");
--- 4735,4747 ----
  	CMainFrame::theInstance->UpdateTitle(theApp.projectName);
  
! //	CGMEView * gmeviewA = (CGMEView *)pActivateView;
! //	CGMEView * gmeviewI = (CGMEView *)pDeactiveView;
! 	if (bActivate)
! 		m_isActive = true;
! 	else 
! 		m_isActive = false;
  	if (bActivate)
  	{
! //		if (gmeviewA  &&  guiMeta)
  		{
  			TRACE("CGMEView::OnActivateView DoPannWinRefresh\n");