[GME-commit] GMESRC/GME/Gme ScrollZoomView.cpp,1.12,1.13

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

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

Modified Files:
	ScrollZoomView.cpp 
Log Message:
scroll corrected


CVS User: bogyom

Index: ScrollZoomView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/ScrollZoomView.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ScrollZoomView.cpp	27 May 2004 16:46:35 -0000	1.12
--- ScrollZoomView.cpp	31 May 2004 22:13:54 -0000	1.13
***************
*** 334,349 ****
  
  	// now in device coordinates - limit if out of range
! //	int xMax = GetScrollLimit(SB_HORZ);
! //	int yMax = GetScrollLimit(SB_VERT);
! 	int xMin, xMax, yMin, yMax;
! 	GetScrollRange(SB_HORZ, &xMin, &xMax); // it does not work correctly ?? !!
! 	GetScrollRange(SB_VERT, &yMin, &yMax);
  	if (m_noHscroll)   // hack terge
  	{
! 		xMin = xMax = 0;
  	}
  	if (m_noVscroll)   // hack terge
  	{
! 		yMin = yMax = 0;
  	}
  
--- 334,349 ----
  
  	// now in device coordinates - limit if out of range
! 	int xMax = GetScrollLimit(SB_HORZ);
! 	int yMax = GetScrollLimit(SB_VERT);
! //	int xMin, xMax, yMin, yMax;
! //	GetScrollRange(SB_HORZ, &xMin, &xMax); // it does not work correctly ?? !!
! //	GetScrollRange(SB_VERT, &yMin, &yMax);
  	if (m_noHscroll)   // hack terge
  	{
! 		xMax = 0;
  	}
  	if (m_noVscroll)   // hack terge
  	{
! 		yMax = 0;
  	}
  
***************
*** 422,430 ****
  	ASSERT(ptDev.x >= 0);
  	ASSERT(ptDev.y >= 0);
! 	int maxh; // = GetScrollLimit(SB_HORZ);
! 	int maxv; // = GetScrollLimit(SB_VERT);
! 	int xMin, yMin;
! 	GetScrollRange(SB_HORZ, &xMin, &maxh);
! 	GetScrollRange(SB_VERT, &yMin, &maxv);
  	if (maxh == 0  &&  maxv == 0)
  	{
--- 422,430 ----
  	ASSERT(ptDev.x >= 0);
  	ASSERT(ptDev.y >= 0);
! 	int maxh = GetScrollLimit(SB_HORZ);
! 	int maxv = GetScrollLimit(SB_VERT);
! //	int xMin, yMin;
! //	GetScrollRange(SB_HORZ, &xMin, &maxh);
! //	GetScrollRange(SB_VERT, &yMin, &maxv);
  	if (maxh == 0  &&  maxv == 0)
  	{
***************
*** 556,562 ****
  	else
  	{
! 		int xMin, xMax;
! 		GetScrollRange(SB_HORZ, &xMin, &xMax);
! //		int xMax = GetScrollLimit(SB_HORZ);
  		if (xDesired > xMax)
  			xDesired = xMax;
--- 556,562 ----
  	else
  	{
! //		int xMin, xMax;
! //		GetScrollRange(SB_HORZ, &xMin, &xMax);
! 		int xMax = GetScrollLimit(SB_HORZ);
  		if (xDesired > xMax)
  			xDesired = xMax;
***************
*** 569,575 ****
  	else
  	{
! 		int yMin, yMax;
! 		GetScrollRange(SB_VERT, &yMin, &yMax);
! //		int yMax = GetScrollLimit(SB_VERT);
  		if (yDesired > yMax)
  			yDesired = yMax;
--- 569,575 ----
  	else
  	{
! //		int yMin, yMax;
! //		GetScrollRange(SB_VERT, &yMin, &yMax);
! 		int yMax = GetScrollLimit(SB_VERT);
  		if (yDesired > yMax)
  			yDesired = yMax;
***************
*** 1081,1087 ****
  	// adjust current x position
  	xOrig = x = GetScrollPos(SB_HORZ);
! 	int xMax, xMin;
! 	GetScrollRange(SB_HORZ, &xMin, &xMax);
! //	int xMax = GetScrollLimit(SB_HORZ);
  	x += sizeScroll.cx;
  	if (x < 0)
--- 1081,1087 ----
  	// adjust current x position
  	xOrig = x = GetScrollPos(SB_HORZ);
! //	int xMax, xMin;
! //	GetScrollRange(SB_HORZ, &xMin, &xMax);
! 	int xMax = GetScrollLimit(SB_HORZ);
  	x += sizeScroll.cx;
  	if (x < 0)
***************
*** 1092,1098 ****
  	// adjust current y position
  	yOrig = y = GetScrollPos(SB_VERT);
! 	int yMin, yMax;
! 	GetScrollRange(SB_VERT, &yMin, &yMax);
! //	int yMax = GetScrollLimit(SB_VERT);
  	y += sizeScroll.cy;
  	if (y < 0)
--- 1092,1098 ----
  	// adjust current y position
  	yOrig = y = GetScrollPos(SB_VERT);
! //	int yMin, yMax;
! //	GetScrollRange(SB_VERT, &yMin, &yMax);
! 	int yMax = GetScrollLimit(SB_VERT);
  	y += sizeScroll.cy;
  	if (y < 0)