[GME-commit] GMESRC/GME/Gme ScrollZoomView.cpp,1.9,1.10 PanningWindow.cpp,1.3,1.4 GMEView.cpp,1.145,1.146 GMEBrowser.cpp,1.27,1.28

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

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

Modified Files:
	ScrollZoomView.cpp PanningWindow.cpp GMEView.cpp 
	GMEBrowser.cpp 
Log Message:
panning win off state managed & browser min size set

CVS User: bogyom

Index: ScrollZoomView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/ScrollZoomView.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ScrollZoomView.cpp	12 May 2004 18:16:29 -0000	1.9
--- ScrollZoomView.cpp	12 May 2004 19:38:41 -0000	1.10
***************
*** 380,383 ****
--- 380,387 ----
  void CScrollZoomView::notifyPanning(CPoint pt)
  {
+ 	CMainFrame* main = (CMainFrame*)AfxGetMainWnd();
+ 
+ 	if (!main  ||  !main->m_pannWin.IsVisible())
+ 		return;
  	CRect client;
  	GetClientRect(&client);
***************
*** 391,397 ****
  	pannw.NormalizeRect();
  
! 	CMainFrame* main = (CMainFrame*)AfxGetMainWnd();
! 	if(main)
! 		main->m_pannWin.SetViewRect(pannw);
  }
  
--- 395,399 ----
  	pannw.NormalizeRect();
  
! 	main->m_pannWin.SetViewRect(pannw);
  }
  

Index: PanningWindow.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/PanningWindow.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PanningWindow.cpp	7 May 2004 20:58:25 -0000	1.3
--- PanningWindow.cpp	12 May 2004 19:38:41 -0000	1.4
***************
*** 39,46 ****
  int CPanningWindow::OnCreate(LPCREATESTRUCT lpCreateStruct) 
  {
- 	m_szMin = CSize(120,120);
-     m_szFloat = CSize(250,250); 
- 	m_szHorz = CSize(170,170);
-     m_szVert = CSize(170,170);
  	lpCreateStruct->cx = lpCreateStruct->cy = 150;
  	if (CSizingControlBar::OnCreate(lpCreateStruct) == -1)
--- 39,42 ----
***************
*** 50,53 ****
--- 46,53 ----
  		return -1;
  
+ 	m_szMin = CSize(120,120);
+     m_szFloat = CSize(250,250); 
+ 	m_szHorz = CSize(170,170);
+     m_szVert = CSize(170,170);
  
  	return 0;

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** GMEView.cpp	10 May 2004 20:05:17 -0000	1.145
--- GMEView.cpp	12 May 2004 19:38:41 -0000	1.146
***************
*** 485,488 ****
--- 485,493 ----
  void CGMEView::DoPannWinRefresh()
  {
+ 	CMainFrame* main = (CMainFrame*)AfxGetMainWnd();
+ 
+ 	if (!main  ||  !main->m_pannWin.IsVisible())
+ 		return;
+ 
  	// the original size of the image
  	CRect extent, objext, annext;
***************
*** 540,545 ****
  
  	// force CPanningWindow to reset the DC 
- 	CMainFrame* main = (CMainFrame*)AfxGetMainWnd();
- 
  	main->m_pannWin.SetBitmapDC(this, pannDC, extent, target, bgColor);
  	notifyPanning(GetDeviceScrollPosition());
--- 545,548 ----

Index: GMEBrowser.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEBrowser.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** GMEBrowser.cpp	17 Dec 2003 13:45:02 -0000	1.27
--- GMEBrowser.cpp	12 May 2004 19:38:41 -0000	1.28
***************
*** 93,96 ****
--- 93,97 ----
  		return -1;
  
+ 	m_szMin = CSize(200,200);
      m_szFloat = CSize(350,600); 
  	m_szHorz = CSize(300,200);