e7b2da51ba638fe7f6f4379c6c9470321ac0a88e
tdreszer
  Thu Dec 22 11:20:00 2011 -0800
Removed old ifdefs.  No functional change here.
diff --git src/hg/hgTracks/imageV2.h src/hg/hgTracks/imageV2.h
index 66ae117..be36b97 100644
--- src/hg/hgTracks/imageV2.h
+++ src/hg/hgTracks/imageV2.h
@@ -1,44 +1,41 @@
 /* imageV2 - API for creating the image V2 features. */
 
 #ifndef IMAGEV2_H
 #define IMAGEV2_H
 
 // set IN_PLACE_UPDATE 1 to update the hgTracks image in-place in the client.
 #define IN_PLACE_UPDATE  1
 
-//  UNCOMMENT IMAGEv2_DRAG_SCROLL and IMAGEv2_DRAG_SCROLL_SZ to allow dragScroll
-//  NOTE: 1x should work fine. Set IMAGEv2_DRAG_SCROLL_SZ > 1 (3=3x) to see hidden image while dragging.
+//  DRAG_SCROLL means dragging the image left-right to reposition the viwing window on the chromosome.
+//  NOTE: 1x works fine and is released. Set IMAGEv2_DRAG_SCROLL_SZ > 1 (3=3x) to see hidden image while dragging.
 //        Problems with >1x: nextExon and nextItem arrows not addressed.  Dynamic resize occasionally fails.
-#define IMAGEv2_DRAG_SCROLL
 #define IMAGEv2_DRAG_SCROLL_SZ 1
 
-#ifdef IMAGEv2_DRAG_SCROLL
     #if defined(IMAGEv2_DRAG_SCROLL_SZ) && (IMAGEv2_DRAG_SCROLL_SZ > 1)
         #define IMAGEv2_SHORT_MAPITEMS
         //#define IMAGEv2_SHORT_TOGGLE
         //#define IMAGEv2_NO_LEFTLABEL_ON_FULL
         // Because the sideLabel clipping will leave a no longer needed label
         // aligned with the centerLabel, we will need to either: remove sideLabels
-        // (which otherwise work) or add a new side-slice to match the centerlabel
+    // (which otherwise work) OR add a new side-slice to match the centerlabel
     #endif //defined(IMAGEv2_DRAG_SCROLL_SZ) && (IMAGEv2_DRAG_SCROLL_SZ > 1)
-#endif//def IMAGEv2_DRAG_SCROLL
 
 // CURRENT PROBLEMS with dragScroll > 1X:
 // o Dynamic height for data/label based on image map currently works EXCEPT, occasionally does not resize.  Consider resize while dragging!
 // o next item feature '>>' arrows should check if items are in the wings
-// o next exon feature '>>' arrows are only seen in the wings and only look belond the wings
+// o next exon feature '>>' arrows are only seen in the wings and only look beyond the wings
 
 // UNCOMMENT  USE_NAVIGATION_LINKS for so far experimental UI changes to replace buttons at top with more streamlined links
 //#define USE_NAVIGATION_LINKS
 
 extern struct imgBox   *theImgBox;   // Make this global for now to avoid huge rewrite
 //extern struct image    *theOneImg;   // Make this global for now to avoid huge rewrite
 extern struct imgTrack *curImgTrack; // Make this global for now to avoid huge rewrite
 //extern struct imgSlice *curSlice;    // Make this global for now to avoid huge rewrite
 //extern struct mapSet   *curMap;      // Make this global for now to avoid huge rewrite
 //extern struct mapItem  *curMapItem;  // Make this global for now to avoid huge rewrite
 
 /////////////////////////
 // FLAT TRACKS
 // A simplistic way of flattening the track list before building the image
 // NOTE: Strategy is NOT to use imgBox->imgTracks, since this should be independednt of imageV2