X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xedittags.c;h=e9484f4c98cecec5ae432a5c376f36e4de972603;hb=039ec08b2e0355d7fdd1cc496f7aa800be51bab3;hp=d4c3dbec93edfd27c52775178ba11242ded59193;hpb=7b4dacf6fe9f8c10b6eb4d6070869a3d933dbeb5;p=xboard.git

diff --git a/xedittags.c b/xedittags.c
index d4c3dbe..e9484f4 100644
--- a/xedittags.c
+++ b/xedittags.c
@@ -1,7 +1,7 @@
 /*
  * xedittags.c -- Tags edit window, part of X front end for XBoard
  *
- * Copyright 1995,2009 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010 Free Software Foundation, Inc.
  *
  * ------------------------------------------------------------------------
  *
@@ -205,12 +205,8 @@ Widget TagsCreate(name, text, msg, mutable, callback)
     XtSetArg(args[j], XtNresizable, True);  j++;
     XtSetArg(args[j], XtNwidth, bw_width/2);  j++;
     XtSetArg(args[j], XtNheight, bw_width/3);  j++;
-#if 0
-    XtSetArg(args[j], XtNscrollVertical, XawtextScrollWhenNeeded);  j++;
-#else
     /* !!Work around an apparent bug in XFree86 4.0.1 (X11R6.4.3) */
     XtSetArg(args[j], XtNscrollVertical, XawtextScrollAlways);  j++;
-#endif
     XtSetArg(args[j], XtNautoFill, False);  j++;
     textw =
       XtCreateManagedWidget("text", asciiTextWidgetClass, form, args, j);
@@ -252,18 +248,6 @@ Widget TagsCreate(name, text, msg, mutable, callback)
 	  XtCreateManagedWidget(_("cancel"), commandWidgetClass, form, args, j);
 	XtAddCallback(b_cancel, XtNcallback, callback, (XtPointer) 0);
 
-#if 0
-	j = 0;
-	XtSetArg(args[j], XtNfromVert, msgw);  j++;
-	XtSetArg(args[j], XtNfromHoriz, b);  j++;
-	XtSetArg(args[j], XtNtop, XtChainBottom); j++;
-	XtSetArg(args[j], XtNbottom, XtChainBottom); j++;
-	XtSetArg(args[j], XtNleft, XtChainLeft); j++;
-	XtSetArg(args[j], XtNright, XtChainLeft); j++;
-	b_clear = b =
-	  XtCreateManagedWidget("clear", commandWidgetClass, form, args, j);
-	XtAddCallback(b_clear, XtNcallback, callback, (XtPointer) 0);
-#endif
     } else {
 	j = 0;
 	XtSetArg(args[j], XtNfromVert, msgw);  j++;
@@ -359,14 +343,15 @@ void TagsPopUp(tags, msg)
 
     tagsUp = True;
     j = 0;
-    XtSetArg(args[j], XtNleftBitmap, None); j++;
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Edit Tags"),
+    XtSetArg(args[j], XtNleftBitmap, xMarkPixmap); j++;
+    XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Tags"),
 		args, j);
 }
 
 
-void EditTagsPopUp(tags)
+void EditTagsPopUp(tags, dest)
      char *tags;
+     char **dest;
 {
     Widget textw;
     Arg args[16];
@@ -392,7 +377,7 @@ void EditTagsPopUp(tags)
     editTagsUp = True;
     j = 0;
     XtSetArg(args[j], XtNleftBitmap, xMarkPixmap); j++;
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Edit Tags"),
+    XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Tags"),
 		args, j);
 }
 
@@ -418,7 +403,7 @@ void TagsPopDown()
     tagsUp = editTagsUp = False;
     j = 0;
     XtSetArg(args[j], XtNleftBitmap, None); j++;
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Edit Tags"),
+    XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Tags"),
 		args, j);
 }