e7b2da51ba638fe7f6f4379c6c9470321ac0a88e
tdreszer
  Thu Dec 22 11:20:00 2011 -0800
Removed old ifdefs.  No functional change here.
diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c
index f517ca2..4753323 100644
--- src/hg/hgTracks/simpleTracks.c
+++ src/hg/hgTracks/simpleTracks.c
@@ -489,32 +489,30 @@
     return '-';
 if (orient > 0)
     return '+';
 return '.';
 }
 
 
 struct dyString *uiStateUrlPart(struct track *toggleGroup)
 /* Return a string that contains all the UI state in CGI var
  * format.  If toggleGroup is non-null the visibility of that
  * track will be toggled in the string. */
 {
 struct dyString *dy = newDyString(512);
 
 dyStringPrintf(dy, "%s=%u", cartSessionVarName(), cartSessionId(cart));
-#define TOGGLE_SUBTRACKS
-#ifdef TOGGLE_SUBTRACKS
 if(toggleGroup != NULL && tdbIsCompositeChild(toggleGroup->tdb))
     {
     int vis = toggleGroup->visibility;
     struct trackDb *tdbParent = tdbGetComposite(toggleGroup->tdb);
     char *parentName = tdbParent->track;
     // Find parent track (as opposed to trackDb)
     struct track *tgParent =toggleGroup->parent;
     char *encodedTableName = cgiEncode(parentName);
     char *view = NULL;
     boolean setView = subgroupFind(toggleGroup->tdb,"view",&view);
     if(tgParent!=NULL&& tgParent->visibility != tvHide && tvCompare(tgParent->visibility,vis) > 0)
         {
         setView = FALSE; // Must open parent to see opened child
         vis = tgParent->visibility;
         }
@@ -534,31 +532,30 @@
         dyStringPrintf(dy, "&%s=%s", toggleGroup->tdb->parent->track, hStringFromTv(vis));
     #else///ifndef SUBTRACK_CFG
         char *encodeView = cgiEncode(view);
         dyStringPrintf(dy, "&%s.%s.vis=%s", encodedTableName,encodeView, hStringFromTv(vis));
         freeMem(encodeView);
     #endif///ndef SUBTRACK_CFG
         }
     else
         {
         dyStringPrintf(dy, "&%s=%s", encodedTableName, hStringFromTv(vis));
         }
     subgroupFree(&view);
     freeMem(encodedTableName);
     }
 else
-#endif//def TOGGLE_SUBTRACKS
     {
     if (toggleGroup != NULL)
         {
         int vis = toggleGroup->visibility;
         char *encodedMapName = cgiEncode(toggleGroup->track);
         if (vis == tvDense)
             {
             if(!toggleGroup->canPack || (tdbIsComposite(toggleGroup->tdb) && subgroupingExists(toggleGroup->tdb,"view")))
                 vis = tvFull;
             else
                 vis = tvPack;
             }
         else if (vis == tvFull || vis == tvPack || vis == tvSquish)
             vis = tvDense;
         dyStringPrintf(dy, "&%s=%s", encodedMapName, hStringFromTv(vis));
@@ -905,31 +902,31 @@
     clr = color;
     if (dots)
         {
         /* display bases identical to reference as dots */
         /* suppress for first line (self line) */
         if (!selfLine && match != NULL && match[i])
             if ((*text != ' ') && (toupper(*text) == toupper(match[i])))
                 cBuf[0] = '.';
 
 #ifdef FADE_IN_DOT_MODE
         /* Color gaps in lighter color, even when non-matching bases
            are displayed as dots instead of faded out */
         /* We may want to use this, or add a config setting for it */
         if (*text == '=' || *text == '-' || *text == '.' || *text == 'N')
             clr = noMatchColor;
-#endif
+#endif///def FADE_IN_DOT_MODE
         }
     else
         {
         /* display bases identical to reference in main color, mismatches
          * in alt color */
         if (match != NULL && match[i])
             if ((*text != ' ') && (toupper(*text) != toupper(match[i])))
                 clr = noMatchColor;
         }
     if(inMotif != NULL && textPos < textLength && inMotif[textPos])
 	{
 	hvGfxBox(hvg, x1+x, y, x2-x1, height, clr);
 	hvGfxTextCentered(hvg, x1+x, y, x2-x1, height, MG_WHITE, font, cBuf);
 	}
     else