src/hg/hgTracks/hgTracks.c 1.1596

Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1595
retrieving revision 1.1596
diff -b -B -U 4 -r1.1595 -r1.1596
--- src/hg/hgTracks/hgTracks.c	27 Aug 2009 00:10:15 -0000	1.1595
+++ src/hg/hgTracks/hgTracks.c	4 Sep 2009 18:24:50 -0000	1.1596
@@ -1598,9 +1598,9 @@
     hPrintf("<input type='hidden' name='c' value='%s'>\n", chromName);
     hPrintf("<input type='hidden' name='l' value='%d'>\n", winStart);
     hPrintf("<input type='hidden' name='r' value='%d'>\n", winEnd);
     hPrintf("<input type='hidden' name='pix' value='%d'>\n", tl.picWidth);
-    #ifdef IMAGEv2_USE_PORTAL
+    #ifdef IMAGEv2_DRAG_SCROLL
     // If a portal was established, then set the global dimensions to the entire image size
     if(imgBoxPortalDimensions(theImgBox,&winStart,&winEnd,&(tl.picWidth),NULL,NULL,NULL,NULL,NULL))
         {
         pixWidth = tl.picWidth;
@@ -1608,9 +1608,9 @@
         insideWidth = tl.picWidth-gfxBorder-insideX;
         if (withLeftLabels)
             sideSliceOffsetX = (revCmplDisp?(tl.picWidth - sideSliceWidth): 0);
         }
-    #endif//def IMAGEv2_USE_PORTAL
+    #endif//def IMAGEv2_DRAG_SCROLL
     dataSliceWidth   = tl.picWidth - sideSliceWidth;
     }
 #endif//def IMAGEv2_UI
 
@@ -2369,17 +2369,17 @@
 #ifdef IMAGEv2_UI
 if(theImgBox)
     {
     imageBoxDraw(theImgBox);
-    #ifdef IMAGEv2_USE_PORTAL
+    #ifdef IMAGEv2_DRAG_SCROLL
     // If a portal was established, then set the global dimensions back to the portal size
     if(imgBoxPortalDimensions(theImgBox,NULL,NULL,NULL,NULL,&winStart,&winEnd,&(tl.picWidth),NULL))
         {
         pixWidth = tl.picWidth;
         winBaseCount = winEnd - winStart;
         insideWidth = tl.picWidth-gfxBorder-insideX;
         }
-    #endif//def IMAGEv2_USE_PORTAL
+    #endif//def IMAGEv2_DRAG_SCROLL
     imgBoxFree(&theImgBox);
     }
 else
 #endif//def IMAGEv2_UI
@@ -3973,18 +3973,18 @@
     int sideSliceWidth  = 0;   // Just being explicit
     if (withLeftLabels)
         sideSliceWidth   = (insideX - gfxBorder*3) + 2;
     theImgBox = imgBoxStart(database,chromName,winStart,winEnd,(!revCmplDisp),sideSliceWidth,tl.picWidth);
-    #ifdef IMAGEv2_USE_PORTAL
+    #ifdef IMAGEv2_DRAG_SCROLL
     // Define a portal with a default expansion size, then set the global dimensions to the full image size
     if(imgBoxPortalDefine(theImgBox,&winStart,&winEnd,&(tl.picWidth),0))
         {
         winBaseCount = winEnd - winStart;
         insideWidth = tl.picWidth-gfxBorder-insideX;
         }
-    #endif//def IMAGEv2_USE_PORTAL
+    #endif//def IMAGEv2_DRAG_SCROLL
     }
-    #endif//def IMAGEv2_UI
+#endif//def IMAGEv2_UI
 /* Tell tracks to load their items. */
 for (track = trackList; track != NULL; track = track->next)
     {
     /* adjust track visibility based on supertrack just before load loop */
@@ -4034,9 +4034,9 @@
         }
     }
 
 #ifdef IMAGEv2_UI
-#ifdef IMAGEv2_USE_PORTAL
+#ifdef IMAGEv2_DRAG_SCROLL
 if(theImgBox)
     {
     // If a portal was established, then set the global dimensions back to the portal size
     if(imgBoxPortalDimensions(theImgBox,NULL,NULL,NULL,NULL,&winStart,&winEnd,&(tl.picWidth),NULL))
@@ -4044,9 +4044,9 @@
         winBaseCount = winEnd - winStart;
         insideWidth = tl.picWidth-gfxBorder-insideX;
         }
     }
-#endif//def IMAGEv2_USE_PORTAL
+#endif//def IMAGEv2_DRAG_SCROLL
 #endif//def IMAGEv2_UI
 /* Center everything from now on. */
 hPrintf("<CENTER>\n");