Load ncbi (6.1.20040202) into ncbi-tools6/branches/upstream/current.

10 files changed, 200 insertions, 71 deletions

diff --git a/desktop/biosrc.c b/desktop/biosrc.c
index 5483b797..b52f139a 100644
--- a/desktop/biosrc.c
+++ b/desktop/biosrc.c
@@ -29,7 +29,7 @@
 *
 * Version Creation Date:   1/22/95
 *
-* $Revision: 6.42 $
+* $Revision: 6.43 $
 *
 * File Description: 
 *
@@ -109,10 +109,10 @@ ENUM_ALIST(subsource_subtype_alist)
   {"Plasmid-name",          19},
   {"Plastid-name",          22},
   {"Pop-variant",           17},
+  {"Rearranged",            15},
   {"Segment",               24},
   {"Sex",                    7},
   {"Subclone",               4},
-  {"Rearranged",            15},
   {"Tissue-lib",            18},
   {"Tissue-type",           10},
   {"Transgenic",            26},
diff --git a/desktop/cdrgn.c b/desktop/cdrgn.c
index f30c029e..587ced29 100644
--- a/desktop/cdrgn.c
+++ b/desktop/cdrgn.c
@@ -29,7 +29,7 @@
 *
 * Version Creation Date:   1/22/95
 *
-* $Revision: 6.55 $
+* $Revision: 6.57 $
 *
 * File Description: 
 *
@@ -4696,7 +4696,7 @@ static ENUM_ALIST(rna_type_alist)
   {"snRNA",        5},
   {"scRNA",        6},
   {"snoRNA",       7},
-  {"Other RNA",  255},
+  {"misc_RNA",   255},
 END_ENUM_ALIST
 
 static Uint1 check_rna_type (Uint1 type)
@@ -4818,6 +4818,7 @@ static void RnaRefPtrToRnaPage (DialoG d, Pointer data)
 
   rpp = (RnaPagePtr) GetObjectExtra (d);
   rrp = (RnaRefPtr) data;
+
   if (rpp != NULL) {
     SetEnumPopup (rpp->type, rna_type_alist,
                   (UIEnum) check_rna_type (rrp->type));
@@ -4885,6 +4886,12 @@ static void RnaRefPtrToRnaPage (DialoG d, Pointer data)
             head = NULL;
             for (j = 0; j < 6; j++) {
               if (trna->codon [j] < 64) {
+				/* Note - it is important to set the fourth character in the codon array to NULL
+				 * because CodonForIndex only fills in the three characters of actual codon,
+				 * so if you StringCpy the codon array and the NULL character is not found after
+				 * the three codon characters, you will write in memory you did not intend to.
+				 */
+				codon [3] = 0;
                 if (CodonForIndex (trna->codon [j], Seq_code_iupacna, codon)) {
                   StringCpy (str, (CharPtr) codon);
                   str [3] = '\0';
diff --git a/desktop/dlgutil1.c b/desktop/dlgutil1.c
index afa78016..9cd7b606 100644
--- a/desktop/dlgutil1.c
+++ b/desktop/dlgutil1.c
@@ -29,7 +29,7 @@
 *
 * Version Creation Date:   1/22/95
 *
-* $Revision: 6.40 $
+* $Revision: 6.42 $
 *
 * File Description: 
 *
@@ -515,6 +515,7 @@ static Boolean GeneGatherFunc (GatherContextPtr gcp)
 {
   FeatureFormPtr  ffp;
   GeneGatherPtr   ggp;
+  GeneRefPtr      grp;
   ObjMgrTypePtr   omtp;
   SeqFeatPtr      sfp;
   Char            thislabel [41];
@@ -548,6 +549,22 @@ static Boolean GeneGatherFunc (GatherContextPtr gcp)
         }
         if (vnp != NULL) {
           vnp->data.ptrvalue = StringSave (thislabel);
+          grp = (GeneRefPtr) sfp->data.value.ptrvalue;
+          if (grp != NULL) {
+            if (grp->locus != NULL) {
+              vnp->choice = 1;
+            } else if (grp->desc != NULL) {
+              vnp->choice = 2;
+            } else if (grp->locus_tag != NULL) {
+              vnp->choice = 3;
+            } else if (grp->syn != NULL) {
+              vnp->choice = 4;
+            } else if (grp->db != NULL) {
+              vnp->choice = 5;
+            } else if (grp->maploc != NULL) {
+              vnp->choice = 6;
+            }
+          }
         }
       }
     }
@@ -648,11 +665,21 @@ static Boolean GeneMatchFunc (GatherContextPtr gcp)
         genexref = ggp->genexref;
         if (genexref != NULL) {
           grp = (GeneRefPtr) sfp->data.value.ptrvalue;
-          if (StringICmp (genexref->locus, grp->locus) == 0) {
-            ggp->val = ggp->idx;
-            ggp->xrefmatch = TRUE;
-            if (ffp != NULL) {
-              SetValue (ffp->useGeneXref, 2);
+          if (! StringHasNoText (genexref->locus)) {
+            if (StringICmp (genexref->locus, grp->locus) == 0) {
+              ggp->val = ggp->idx;
+              ggp->xrefmatch = TRUE;
+              if (ffp != NULL) {
+                SetValue (ffp->useGeneXref, 2);
+              }
+            }
+          } else if (! StringHasNoText (genexref->locus_tag)) {
+            if (StringICmp (genexref->locus_tag, grp->locus_tag) == 0) {
+              ggp->val = ggp->idx;
+              ggp->xrefmatch = TRUE;
+              if (ffp != NULL) {
+                SetValue (ffp->useGeneXref, 2);
+              }
             }
           }
         }
@@ -1127,7 +1154,14 @@ extern Boolean FeatFormReplaceWithoutUpdateProc (ForM f)
               i--;
             }
             if (vnp != NULL) {
-              grp = CreateNewGeneRef ((CharPtr) vnp->data.ptrvalue, NULL, NULL, FALSE);
+              if (vnp->choice == 1) {
+                grp = CreateNewGeneRef ((CharPtr) vnp->data.ptrvalue, NULL, NULL, FALSE);
+              } else if (vnp->choice == 3) {
+                grp = GeneRefNew ();
+                if (grp != NULL) {
+                  grp->locus_tag = StringSave ((CharPtr) vnp->data.ptrvalue);
+                }
+              }
             }
           }
           if (grp != NULL) {
@@ -2965,7 +2999,7 @@ static void SeqLocPtrToIntervalPage (DialoG d, Pointer data)
 static Pointer IntervalPageToSeqLocPtr (DialoG d)
 
 {
-  BioseqPtr        bsp;
+  BioseqPtr        bsp, prev_bsp;
   Char             ch;
   SeqLocPtr        firstSlp;
   Int4             from;
@@ -2992,7 +3026,7 @@ static Pointer IntervalPageToSeqLocPtr (DialoG d)
   SeqIntPtr        sip;
   SeqLocPtr        slp;
   SeqPntPtr        spp;
-  Int2             strand;
+  Int2             strand, prev_strand;
   TagListPtr       tlp;
   Int4             tmp;
   SeqLocPtr        tmploc1;
@@ -3008,6 +3042,8 @@ static Pointer IntervalPageToSeqLocPtr (DialoG d)
   tlp = GetObjectExtra (ipp->ivals);
   if (tlp == NULL) return NULL;
 
+  prev_bsp = NULL;
+  prev_strand = Seq_strand_unknown;
   slp = NULL;
   sfp = SeqFeatNew ();
   if (sfp != NULL) {
@@ -3119,10 +3155,9 @@ static Pointer IntervalPageToSeqLocPtr (DialoG d)
             if (strand > Seq_strand_both_rev) {
               strand = Seq_strand_other;
             }
+            prev_strand = strand;
           } else {
-            /*
-            okay = FALSE;
-            */
+            strand = prev_strand;
           }
           MemFree (txt);
         }
@@ -3136,10 +3171,24 @@ static Pointer IntervalPageToSeqLocPtr (DialoG d)
         bsp = NULL;
         txt = ExtractTagListColumn ((CharPtr) vnp->data.ptrvalue, ipp->nucsOK ? 3 : 2);
         if (txt != NULL) {
-          if (StrToInt (txt, &val2) && val2 > 0 && val2 <= ipp->count) {
+          if (! StrToInt (txt, &val2) || val2 <= 0)
+          {
+            if (prev_bsp != NULL)
+            {
+              bsp = prev_bsp;
+            }
+            else
+            {
+              okay = FALSE;
+            }
+          }
+          else if (val2 <= ipp->count)
+          {
             sep = ipp->bsptr [val2];
-            if (sep != NULL && sep->choice == 1) {
+            if (sep != NULL && sep->choice == 1)
+            {
               bsp = (BioseqPtr) sep->data.ptrvalue;
+              prev_bsp = bsp;
             } else {
               okay = FALSE;
             }
diff --git a/desktop/dlgutil2.c b/desktop/dlgutil2.c
index 9e10333b..aa89ad9c 100644
--- a/desktop/dlgutil2.c
+++ b/desktop/dlgutil2.c
@@ -29,7 +29,7 @@
 *
 * Version Creation Date:   1/22/95
 *
-* $Revision: 6.39 $
+* $Revision: 6.42 $
 *
 * File Description: 
 *
@@ -1297,6 +1297,10 @@ static void GeneXrefWarn (GrouP g)
 
 {
   Int2  val;
+  Boolean indexerVersion;
+
+  indexerVersion = (Boolean) (GetAppProperty ("InternalNcbiSequin") != NULL);
+  if (indexerVersion) return;
 
   val = GetValue (g);
   if (val == 2) {
@@ -1670,10 +1674,17 @@ extern Boolean FileToScrollText (TexT t, CharPtr path)
 
   if (t != NULL && path != NULL && *path != '\0') {
     len = FileLength (path);
+    max = (Int4) INT2_MAX;
 #ifdef WIN_MOTIF
     max = INT4_MAX;
-#else
-    max = (Int4) INT2_MAX;
+#endif
+#ifdef WIN_MSWIN
+    max = INT4_MAX;
+#endif
+#ifdef WIN_MAC
+#ifdef OS_UNIX_DARWIN
+    max = INT4_MAX;
+#endif
 #endif
     if (len > 0 && len < max - 4) {
       str = MemNew (sizeof (char) * (len + 3));
diff --git a/desktop/e2docsum.c b/desktop/e2docsum.c
index 8f502c81..00b0d6e3 100644
--- a/desktop/e2docsum.c
+++ b/desktop/e2docsum.c
@@ -29,7 +29,7 @@
 *
 * Version Creation Date:   10/30/01
 *
-* $Revision: 6.46 $
+* $Revision: 6.47 $
 *
 * File Description: 
 *
@@ -2480,11 +2480,12 @@ static Int4Ptr GetCheckedUids (SummFormPtr sfp, Int2Ptr nump)
 static void LaunchMedlineViewer (Int4 uid)
 
 {
-  Pointer         dataptr;
-  Uint2           datatype;
-  Uint2           entityID;
-  Int2            handled;
-  PubmedEntryPtr  pep;
+  Pointer          dataptr;
+  Uint2            datatype;
+  Uint2            entityID;
+  Int2             handled;
+  MedlineEntryPtr  mep;
+  PubmedEntryPtr   pep;
 
   WatchCursor ();
   Update ();
@@ -2496,7 +2497,11 @@ static void LaunchMedlineViewer (Int4 uid)
     return;
   }
   datatype = OBJ_MEDLINE_ENTRY;
-  dataptr = (Pointer) (MedlineEntryPtr) pep->medent;
+  mep = (MedlineEntryPtr) pep->medent;
+  if (mep != NULL && mep->uid == 0) {
+    mep->uid = uid;
+  }
+  dataptr = (Pointer) mep;
   entityID = ObjMgrRegister (datatype, dataptr);
   if (dataptr == NULL || entityID == 0) {
     ArrowCursor ();
diff --git a/desktop/gbfview.c b/desktop/gbfview.c
index c368cc39..e3d03dd3 100644
--- a/desktop/gbfview.c
+++ b/desktop/gbfview.c
@@ -29,7 +29,7 @@
 *
 * Version Creation Date:   2/5/97
 *
-* $Revision: 6.70 $
+* $Revision: 6.71 $
 *
 * File Description: 
 *
@@ -568,6 +568,7 @@ typedef struct lookforids {
   Boolean isNTorNW;
   Boolean isNC;
   Boolean isTPA;
+  Boolean isAEorCH;
 } LookForIDs, PNTR LookForIDsPtr;
 
 static void LookForSeqIDs (BioseqPtr bsp, Pointer userdata)
@@ -584,6 +585,14 @@ static void LookForSeqIDs (BioseqPtr bsp, Pointer userdata)
       case SEQID_EMBL :
       case SEQID_DDBJ :
         lfip->isGED = TRUE;
+        tsip = (TextSeqIdPtr) sip->data.ptrvalue;
+        if (tsip != NULL) {
+          if (StringNCmp (tsip->accession, "AE", 2) == 0) {
+            lfip->isAEorCH = TRUE;
+          } else if (StringNCmp (tsip->accession, "CH", 2) == 0) {
+            lfip->isAEorCH = TRUE;
+          }
+        }
         break;
       case SEQID_TPG :
       case SEQID_TPE :
@@ -613,7 +622,8 @@ static void LookForGEDetc (
   BoolPtr isGED,
   BoolPtr isNTorNW,
   BoolPtr isNC,
-  BoolPtr isTPA
+  BoolPtr isTPA,
+  BoolPtr isAEorCH
 )
 
 {
@@ -625,6 +635,7 @@ static void LookForGEDetc (
   *isNTorNW = lfi.isNTorNW;
   *isNC = lfi.isNC;
   *isTPA = lfi.isTPA;
+  *isAEorCH = lfi.isAEorCH;
 }
 
 static void LookForNonLocalID (BioseqPtr bsp, Pointer userdata)
@@ -894,6 +905,7 @@ static void PopulateFlatFile (BioseqViewPtr bvp, FmtType format, FlgType flags)
   FILE             *fp;
   Boolean          hastpaaligns;
   Int2             into;
+  Boolean          isAEorCH;
   Boolean          isGED;
   Boolean          isNTorNW;
   Boolean          isNC;
@@ -964,7 +976,7 @@ static void PopulateFlatFile (BioseqViewPtr bvp, FmtType format, FlgType flags)
   bsp = bvp->bsp;
   entityID = ObjMgrGetEntityIDForPointer (bsp);
   topsep = GetTopSeqEntryForEntityID (entityID);
-  LookForGEDetc (topsep, &isGED, &isNTorNW, &isNC, &isTPA);
+  LookForGEDetc (topsep, &isGED, &isNTorNW, &isNC, &isTPA, &isAEorCH);
 
   if ((flags & SHOW_CONTIG_FEATURES) != 0 || (flags & SHOW_CONTIG_SOURCES) != 0) {
     if (isNTorNW || isTPA) {
@@ -1067,6 +1079,8 @@ static void PopulateFlatFile (BioseqViewPtr bvp, FmtType format, FlgType flags)
       flags |= ONLY_NEAR_FEATURES;
     } else if (isNC) {
       flags |= NEAR_FEATURES_SUPPRESS;
+    } else if (isAEorCH) {
+      flags |= NEAR_FEATURES_SUPPRESS;
     }
   }
   if (bvp->useScrollText) {
diff --git a/desktop/salogif.c b/desktop/salogif.c
index dd913e65..91a50c59 100644
--- a/desktop/salogif.c
+++ b/desktop/salogif.c
@@ -1,4 +1,4 @@
-/*  $RCSfile: salogif.c,v $  $Revision: 6.3 $  $Date: 2003/07/15 14:36:31 $
+/*  $RCSfile: salogif.c,v $  $Revision: 6.6 $  $Date: 2004/01/23 22:48:57 $
 * ==========================================================================
 *
 *                            PUBLIC DOMAIN NOTICE
@@ -25,13 +25,22 @@
 *
 * Author:	Jinghui Zhang
 *
-* $Revision: 6.3 $
+* $Revision: 6.6 $
 *
 * File Description:
 *	 The Blast Search result visualization utilities  
 *
 * --------------------------------------------------------------------------
 * $Log: salogif.c,v $
+* Revision 6.6  2004/01/23 22:48:57  jianye
+* restore seqid in PrintOneAlignmentOverview and initialize some varialbes
+*
+* Revision 6.5  2003/11/20 18:36:08  dondosha
+* Added function PrintOneAlignmentOverview to create an overview gif for one of the multiple query sequences
+*
+* Revision 6.4  2003/10/31 02:51:14  dondosha
+* Always use first seqid for master (query) sequence instead of "best" id in ModMaxAlign
+*
 * Revision 6.3  2003/07/15 14:36:31  dondosha
 * Added #defines for substitutes to fprintf and fflush, needed for gzip compression of Web BLAST results
 *
@@ -244,7 +253,7 @@ static Boolean print_defline_for_sequence
 static Boolean PrintImageMapForGlobal
 (GlobalDrawPtr g_draw, Int4 pntX, Int4 pntY, 
  Int4 scale, CharPtr title_buf, SeqAlignPtr align,
- FILE *fp, const Char* formname)
+ FILE *fp, const Char* formname, int query_index)
 {
   AlignRegionPtr arp;
   ValNodePtr curr;
@@ -262,7 +271,7 @@ static Boolean PrintImageMapForGlobal
       if(gbp->has_fish_align == FALSE && gbp->arp_list != NULL)
         {
           if(retval == FALSE)
-            fprintf(fp, "<map name=img_map>\n"); 
+            fprintf(fp, "<map name=img_map%d>\n", query_index); 
           for(curr = gbp->arp_list; curr != NULL; curr = curr->next)
             {
               arp = (AlignRegionPtr)curr->data.ptrvalue;
@@ -343,7 +352,7 @@ static Boolean alignment_is_redundant
   Int4 c_len, r_len;
   Boolean load;
   Int2 i;
-  Int4 start, stop;
+  Int4 start = 0 , stop = 0;
   SeqIdPtr sip;
 
   len = 0;
@@ -441,7 +450,7 @@ static void update_redundant_val
   Int4 c_len;
   Boolean load;
   Int2 i;
-  Int4 start, stop;
+  Int4 start = 0, stop = 0;
 
   switch(align->segtype) {
   case 3:
@@ -629,7 +638,7 @@ static SeqAlignPtr ModMaxAlign
     return (*h_align);
   if(*h_align == NULL || m_bsp == NULL)
     return (*h_align); 
-  m_sip = SeqIdFindBest(m_bsp->id, 0);
+  m_sip = m_bsp->id;
 
   val = (Uint1Ptr)MemNew((size_t)m_bsp->length * sizeof(Int1));
   curr = *h_align;
@@ -684,6 +693,19 @@ NLM_EXTERN Boolean PrintAlignmentOverview
  const Char* gif_name,
  const Char* title)
 {
+   return PrintOneAlignmentOverview(h_annot, fp, formname, href, gif_name, 
+                                    title, 1);
+}
+
+NLM_EXTERN Boolean PrintOneAlignmentOverview
+(SeqAnnotPtr h_annot,
+ FILE*       fp,
+ const Char* formname,
+ const Char* href,
+ const Char* gif_name,
+ const Char* title,
+ int query_index)
+{
   SeqEntryPtr sep;
   Boolean is_new_sep;
   SeqAnnotPtr sap, annot, prev;
@@ -699,6 +721,7 @@ NLM_EXTERN Boolean PrintAlignmentOverview
   FILE *gif_fp;
   Int4 align_num;
   Char title_buf[201], tmpbuf[64];
+  SeqIdPtr idtemp;
 
   if(h_annot == NULL || fp == NULL)
     return FALSE;
@@ -710,6 +733,8 @@ NLM_EXTERN Boolean PrintAlignmentOverview
   if(master_bsp == NULL)
     return FALSE;
   bsp = master_bsp;
+  idtemp= bsp->id->next;
+  bsp->id->next = NULL;
   sep = SeqEntryFind(bsp->id);
   if(sep == NULL)
     {
@@ -770,7 +795,8 @@ NLM_EXTERN Boolean PrintAlignmentOverview
 
     /*print out the image map*/
     if(!PrintImageMapForGlobal(g_draw, pBox.left, pBox.top, 1, title_buf,
-                               (SeqAlignPtr)(annot->data), fp, formname))
+                               (SeqAlignPtr)(annot->data), fp, formname,
+                               query_index))
       printf("Fail to print the image map\n");
     fflush(fp);
 
@@ -797,9 +823,9 @@ NLM_EXTERN Boolean PrintAlignmentOverview
     ExitMuskStyles();
     fprintf(fp, "<CENTER>\n");
 
-    fprintf(fp, "<IMG WIDTH=%d HEIGHT=%d USEMAP=#img_map BORDER=1 "
+    fprintf(fp, "<IMG WIDTH=%d HEIGHT=%d USEMAP=#img_map%d ORDER=1 "
             "SRC=\"%s%s\" ISMAP>", 
-            (int)width, (int)height, href, gif_name);
+            (int)width, (int)height, query_index, href, gif_name);
 
     fprintf(fp, "</CENTER>\n");
     fprintf(fp, "<HR>\n<PRE>\n");
@@ -829,7 +855,7 @@ NLM_EXTERN Boolean PrintAlignmentOverview
   else
     prev->next = NULL;
   SeqAnnotFree(sap);
-
+  master_bsp->id->next = idtemp;  /*restore seqid*/
   BioseqUnlock(master_bsp);
 
   return retval;
diff --git a/desktop/salogif.h b/desktop/salogif.h
index e3e4c351..8c8b086f 100644
--- a/desktop/salogif.h
+++ b/desktop/salogif.h
@@ -1,7 +1,7 @@
 #ifndef SALOGIF__H
 #define SALOGIF__H
 
-/*  $RCSfile: salogif.h,v $  $Revision: 6.1 $  $Date: 2000/03/20 19:00:28 $
+/*  $RCSfile: salogif.h,v $  $Revision: 6.2 $  $Date: 2003/11/20 18:36:08 $
 * ==========================================================================
 *
 *                            PUBLIC DOMAIN NOTICE
@@ -33,6 +33,9 @@
 *
 * --------------------------------------------------------------------------
 * $Log: salogif.h,v $
+* Revision 6.2  2003/11/20 18:36:08  dondosha
+* Added function PrintOneAlignmentOverview to create an overview gif for one of the multiple query sequences
+*
 * Revision 6.1  2000/03/20 19:00:28  shavirin
 * Initial revision in the new location.
 *
@@ -71,6 +74,20 @@ NLM_EXTERN Boolean PrintAlignmentOverview
  const Char* title      /* title printed at the top of generated HTML output */
  );
 
+/* Shows alignments gif image for one query 
+ * from a set of multiple queries. 
+ */
+NLM_EXTERN Boolean PrintOneAlignmentOverview
+(SeqAnnotPtr h_annot,   /* output of blast search */
+ FILE*       fp,        /* file where output goes to */
+ const Char* formname,  /* it is needed to specify name of embeded HTML form,
+                           * create this form before if there is no one */
+ const Char* href,      /* hyperlink location of the GIF file */
+ const Char* gif_name,  /* GIF file name */
+ const Char* title,     /* title printed at the top of generated HTML output */
+ int query_index        /* Index of this query in the set of queries */
+ );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/desktop/smdlg2.c b/desktop/smdlg2.c
index 8d237f1d..bfac9ecc 100644
--- a/desktop/smdlg2.c
+++ b/desktop/smdlg2.c
@@ -29,7 +29,7 @@
 *
 * Version Creation Date:   8/10/95
 *
-* $Revision: 6.0 $
+* $Revision: 6.1 $
 *
 * File Description: 
 *
@@ -182,7 +182,7 @@ static void
 }
 
 static void
-/*FCN*/UpdateControls (
+/*FCN*/UpdateDlgControls (
   void
 ){
   if ( totalFeatures == 0 ){
@@ -322,7 +322,7 @@ static void
   FillGroupList(TRUE);
   SetGroupValue ( curGroupInd );
   SaveGroupArray();
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void
@@ -347,7 +347,7 @@ static void
   FillGroupList(TRUE);
   SetGroupValue ( curGroupInd );
   SaveGroupArray();
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void
@@ -382,7 +382,7 @@ static void
     curFeatureInd = 0;
     SetFeatValue ( curFeatureInd );
   }
-  UpdateControls();
+  UpdateDlgControls();
   SaveGroupArray();
 }
 
@@ -436,7 +436,7 @@ static void
       SetFeatValue ( curFeatureInd );
     }
     SaveGroupArray();
-    UpdateControls();
+    UpdateDlgControls();
   }
 }
 
@@ -457,7 +457,7 @@ static void
   FillGroupList(TRUE);
   SetGroupValue ( curGroupInd );
   SaveGroupArray();
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void
@@ -491,7 +491,7 @@ static void
     curFeatureInd = 0;
     SetFeatValue ( curFeatureInd );
   }
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void
@@ -504,7 +504,7 @@ static void
     curFeatureInd = GetValue ( featList ) - 1;
   }
   if ( curFeatureInd > nHideFeatures ) curFeatureInd--;
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void
@@ -521,7 +521,7 @@ static void
   FillFeatList(TRUE);
   SetFeatValue ( curFeatureInd );
   SaveFeatureArray();
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void
@@ -546,7 +546,7 @@ static void
   FillFeatList(TRUE);
   SetFeatValue ( curFeatureInd );
   SaveFeatureArray();
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void
@@ -581,7 +581,7 @@ static void
   FillFeatList(TRUE);
   SetFeatValue ( curFeatureInd );
   SaveFeatureArray();
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void
@@ -601,7 +601,7 @@ static void
   FillFeatList(TRUE);
   SetFeatValue ( curFeatureInd );
   SaveFeatureArray();
-  UpdateControls();
+  UpdateDlgControls();
 }
 
 static void 
@@ -694,7 +694,7 @@ GrouP
   FillGroupList(FALSE);
   SetGroupValue (curGroupInd);
   FillFeatPopup(FALSE);
-  UpdateControls ();
+  UpdateDlgControls ();
   return g;
 }
 
diff --git a/desktop/smdlg3.c b/desktop/smdlg3.c
index e6100192..f51dcc48 100644
--- a/desktop/smdlg3.c
+++ b/desktop/smdlg3.c
@@ -29,7 +29,7 @@
 *
 * Version Creation Date:   8/10/95
 *
-* $Revision: 6.0 $
+* $Revision: 6.1 $
 *
 * File Description: 
 *
@@ -319,7 +319,7 @@ static void
 }
 
 static void
-/*FCN*/UpdateControls ( 
+/*FCN*/UpdateDlgControls ( 
   Boolean panel,
   Boolean other
 ){
@@ -617,7 +617,7 @@ static void
     Nlm_SetMuskCParamEd( curClass, inClipSchema[i].subClass,
                          inClipSchema[i].pType, inClipBoard[i] );
   }
-  UpdateControls(TRUE,TRUE);
+  UpdateDlgControls(TRUE,TRUE);
 }
 
 static void
@@ -702,7 +702,7 @@ static void
 ){
   LoadFeatAr ();
   FillFetureList(TRUE);
-  UpdateControls(TRUE,TRUE);
+  UpdateDlgControls(TRUE,TRUE);
   UpdateTools();
 }
 
@@ -711,7 +711,7 @@ static void
   LisT l
 ){
   curExtraInd = GetValue (l) - 1;
-  UpdateControls(TRUE,TRUE);
+  UpdateDlgControls(TRUE,TRUE);
   UpdateTools();
 }
 
@@ -758,7 +758,7 @@ static void
       Enable ( applayButton );
     }
   }
-  UpdateControls(TRUE,TRUE);
+  UpdateDlgControls(TRUE,TRUE);
   UpdateTools();
 }
 
@@ -782,7 +782,7 @@ static void
   if ( GetStatus(b) ) val = (BigScalar)TRUE;
   else val = (BigScalar)FALSE;
   Nlm_SetMuskCParamEd(curClass,MSM_SEG_BORD,MSM_TRUEFALSE,val);
-  UpdateControls(TRUE,FALSE);
+  UpdateDlgControls(TRUE,FALSE);
 }
 
 static void
@@ -804,7 +804,7 @@ static void
   }
   val = (BigScalar)(GetValue(g)-1);
   Nlm_SetMuskCParamEd(curClass,MSM_FGAP,MSM_STYLE,val);
-  UpdateControls(TRUE,FALSE);
+  UpdateDlgControls(TRUE,FALSE);
 }
 
 static void
@@ -846,7 +846,7 @@ static void
     }
   }
   Nlm_SetMuskCParamEd(curClass,curSubClass,MSM_STYLE,val);
-  UpdateControls(TRUE,FALSE);
+  UpdateDlgControls(TRUE,FALSE);
 }
 
 static void
@@ -882,7 +882,7 @@ static void
     if ( GetStatus (orientCheckBox[curDlg]) ) val |= MSM_SEG_SHOWORIENT;
   }
   Nlm_SetMuskCParamEd(curClass,MSM_SEGMENT, MSM_STYLE, val);
-  UpdateControls(TRUE,FALSE);
+  UpdateDlgControls(TRUE,FALSE);
   UpdateTools ();
 }
 
@@ -905,7 +905,7 @@ static void
   }
   val = (BigScalar)GetValue(p) * 2 + 2;
   Nlm_SetMuskCParamEd(curClass,MSM_SEGMENT, MSM_HEIGHT, val);
-  UpdateControls(TRUE,FALSE);
+  UpdateDlgControls(TRUE,FALSE);
 }
 
 static void
@@ -1236,7 +1236,7 @@ static GrouP
                    NULL );
   }
   curSubDlg[curDlg] = 0;
-  UpdateControls (FALSE,TRUE);
+  UpdateDlgControls (FALSE,TRUE);
   return gRet;
 } /* End of CreateDlgFeatures () */
 
@@ -1308,7 +1308,7 @@ static void
       Nlm_SetMuskCParamEd(curClass,curSubClass,MSM_HEIGHT,fsize);
     }
   }
-  UpdateControls ( TRUE, TRUE );
+  UpdateDlgControls ( TRUE, TRUE );
 }
 
 static void  Nlm_SetTDef (
@@ -1322,7 +1322,7 @@ static void  Nlm_SetTDef (
     Show ( featPopuP );
     LoadFeatAr();
     FillFetureList (TRUE);
-    UpdateControls (TRUE,TRUE);
+    UpdateDlgControls (TRUE,TRUE);
   }
   UpdateTools();
 }