src/hg/hgTracks/hgTracks.c 1.1602

Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1601
retrieving revision 1.1602
diff -b -B -U 4 -r1.1601 -r1.1602
--- src/hg/hgTracks/hgTracks.c	8 Oct 2009 06:38:23 -0000	1.1601
+++ src/hg/hgTracks/hgTracks.c	1 Nov 2009 19:46:03 -0000	1.1602
@@ -1262,9 +1262,9 @@
     Color labelColor = (track->labelColor ?
                         track->labelColor : track->ixColor);
     hvGfxTextCentered(hvg, insideX, y+1, insideWidth, insideHeight,
                         labelColor, font, track->longLabel);
-    if (withNextItemArrows && track->labelNextItemButtonable && track->labelNextPrevItem && !tdbIsComposite(track->tdb))
+    if (withNextItemArrows && track->nextItemButtonable && track->nextPrevItem && !tdbIsComposite(track->tdb))
 	doLabelNextItemButtons(track, parentTrack, hvg, font, y, trackPastTabX,
 			  trackPastTabWidth, fontHeight, insideHeight, labelColor);
     else
 	mapBoxToggleVis(hvg, trackPastTabX, y+1,
@@ -1916,11 +1916,11 @@
                 {
                 if (isSubtrackVisible(subtrack))
                     y = doLeftLabels(subtrack, hvg, font, y);
                 //if (track->limitedVis == tvDense)
-                //track->labelNextItemButtonable = FALSE;
+                //track->nextItemButtonable = FALSE;
                 }
-            track->labelNextItemButtonable = FALSE; // Composites are not NextItemButtonable (but subtracks may be)
+            track->nextItemButtonable = FALSE; // Composites are not NextItemButtonable (but subtracks may be)
             }
         else
             y = doLeftLabels(track, hvg, font, y);
         }
@@ -2849,9 +2849,9 @@
     AllocVar(mp);
     mp->ct = ct;
 
     tg->customPt = mp;
-    tg->labelNextItemButtonable = FALSE;
+    tg->nextItemButtonable = FALSE;
     }
 else if (sameString(type, "wig"))
     {
     tg = trackFromTrackDb(tdb);
@@ -2859,15 +2859,15 @@
 	tg->loadItems = wigLoadItems;
     else
 	tg->loadItems = ctWigLoadItems;
     tg->customPt = ct;
-    tg->labelNextItemButtonable = FALSE;
+    tg->nextItemButtonable = FALSE;
     }
 else if (sameString(type, "bigWig"))
     {
     tg = trackFromTrackDb(tdb);
     tg->bbiFileName = trackDbSetting(tdb, "bigDataUrl");
-    tg->labelNextItemButtonable = FALSE;
+    tg->nextItemButtonable = FALSE;
     }
 else if (sameString(type, "bigBed"))
     {
     /* Figure out file name from settings. */
@@ -2884,18 +2884,18 @@
 
     /* Finish wrapping track around tdb. */
     tg = trackFromTrackDb(tdb);
     tg->bbiFileName = fileName;
-    tg->labelNextItemButtonable = FALSE;
+    tg->nextItemButtonable = FALSE;
     }
 else if (sameString(type, "bedGraph"))
     {
     tg = trackFromTrackDb(tdb);
     tg->canPack = FALSE;
     tg->customPt = ct;
     ct->wigFile = ctFileName;
     tg->mapItemName = ctMapItemName;
-    tg->labelNextItemButtonable = FALSE;
+    tg->nextItemButtonable = FALSE;
     }
 else if (sameString(type, "bed"))
     {
     tg = trackFromTrackDb(tdb);
@@ -2927,38 +2927,38 @@
 	tg->loadItems = ctLoadGappedBed;
 	}
     tg->mapItemName = ctMapItemName;
     tg->canPack = TRUE;
-    tg->labelNextItemButtonable = TRUE;
+    tg->nextItemButtonable = TRUE;
     tg->customPt = ct;
     }
 else if (sameString(type, "chromGraph"))
     {
     tdb->type = NULL;	/* Swap out type for the moment. */
     tg = trackFromTrackDb(tdb);
     chromGraphMethodsCt(tg);
-    tg->labelNextItemButtonable = FALSE;
+    tg->nextItemButtonable = FALSE;
     tdb->type = typeOrig;
     }
 else if (sameString(type, "array"))
     {
     tg = trackFromTrackDb(tdb);
     expRatioMethodsFromCt(tg);
-    tg->labelNextItemButtonable = TRUE;
+    tg->nextItemButtonable = TRUE;
     tg->customPt = ct;
     }
 else if (sameString(type, "coloredExon"))
     {
     tg = trackFromTrackDb(tdb);
     coloredExonMethodsFromCt(tg);
-    tg->labelNextItemButtonable = TRUE;
+    tg->nextItemButtonable = TRUE;
     tg->customPt = ct;
     }
 else if (sameString(type, "encodePeak"))
     {
     tg = trackFromTrackDb(tdb);
     encodePeakMethodsCt(tg);
-    tg->labelNextItemButtonable = TRUE;
+    tg->nextItemButtonable = TRUE;
     tg->customPt = ct;
     }
 #ifdef USE_BAM
 else if (sameString(type, "bam"))
@@ -2977,9 +2977,9 @@
     {
     errAbort("Unrecognized custom track type %s", type);
     }
 if (!ct->dbTrack)
-    tg->labelNextItemButtonable = FALSE;
+    tg->nextItemButtonable = FALSE;
 tg->hasUi = TRUE;
 freez(&typeDupe);
 return tg;
 }
@@ -3764,10 +3764,10 @@
 /* In case a next item arrow was clicked on a track, change */
 /* position (i.e. winStart, winEnd, etc.) based on what track it was */
 {
 struct track *track = trackFindByName(trackList, trackName);
-if ((track != NULL) && (track->labelNextPrevItem != NULL))
-    track->labelNextPrevItem(track, goNext);
+if ((track != NULL) && (track->nextPrevItem != NULL))
+    track->nextPrevItem(track, goNext);
 }
 
 char *collapseGroupVar(char *name)
 /* Construct cart variable name for collapsing group */