753b10b19784b1d07abaf7ec6b827c752e40416f
Merge parents 4880079 9c65dec
tdreszer
  Wed Nov 30 12:27:45 2011 -0800
Merge-o-rama
diff --cc src/hg/lib/hui.c
index 5845d9e,0009253..d77e044
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@@ -16,38 -16,38 +16,39 @@@
  #include "chainDb.h"
  #include "netCart.h"
  #include "obscure.h"
  #include "wiggle.h"
  #include "phyloTree.h"
  #include "hgMaf.h"
  #include "udc.h"
  #include "customTrack.h"
  #include "encode/encodePeak.h"
  #include "mdb.h"
  #include "web.h"
  #include "hPrint.h"
  #include "fileUi.h"
  #include "bigBed.h"
  #include "bigWig.h"
 +#include "regexHelper.h"
  #include "vcfUi.h"
  #include "vcf.h"
  #include "errCatch.h"
  #include "samAlignment.h"
  #include "makeItemsItem.h"
  #include "bedDetail.h"
  #include "pgSnp.h"
+ #include "memgfx.h"
  
  #define SMALLBUF 128
  #define MAX_SUBGROUP 9
  #define ADD_BUTTON_LABEL        "add"
  #define CLEAR_BUTTON_LABEL      "clear"
  #define JBUFSIZE 2048
  
  #ifdef BUTTONS_BY_CSS
  #define BUTTON_PM  "<span class='pmButton' onclick=\"setCheckBoxesThatContain('%s',%s,true,'%s','','%s')\">%c</span>"
  #define BUTTON_DEF "<span class='pmButton' onclick=\"setCheckBoxesThatContain('%s',true,false,'%s','','%s'); " \
                                                      "setCheckBoxesThatContain('%s',false,false,'%s','_defOff','%s');\" style='width:56px;font-weight:normal; font-family:default;'>default</span>"
  #define DEFAULT_BUTTON(nameOrId,anc,beg,contains) printf(BUTTON_DEF,(nameOrId),        (beg),(contains),(nameOrId),(beg),(contains))
  #define    PLUS_BUTTON(nameOrId,anc,beg,contains) printf(BUTTON_PM, (nameOrId),"true", (beg),(contains),'+')
  #define   MINUS_BUTTON(nameOrId,anc,beg,contains) printf(BUTTON_PM, (nameOrId),"false",(beg),(contains),'-')
  #else///ifndef BUTTONS_BY_CSS