Add -topLevel option

[xboard.git] / xhistory.c

diff --git a/xhistory.c b/xhistory.c
index 1a0d2e5..4211de1 100644 (file)
--- a/xhistory.c
+++ b/xhistory.c
@@ -50,6 +50,7 @@
 #include "backend.h"
 #include "xhistory.h"
 #include "xboard.h"
+#include "dialogs.h"
 #include "gettext.h"
 
 #ifdef ENABLE_NLS
@@ -80,7 +81,7 @@ HighlightMove (int from, int to, Boolean highlight)
 void
 ClearHistoryMemo ()
 {
-    ClearTextWidget(&historyOptions[0]);
+    SetWidgetText(&historyOptions[0], "", HistoryDlg);
 }
 
 // the bold argument says 0 = normal, 1 = bold typeface
@@ -129,8 +130,8 @@ SelectMove (Widget w, XEvent * event, String * params, Cardinal * nParams)
 }
 
 Option historyOptions[] = {
-{ 0xD, 200, 400, NULL, (void*) &historyText, "", NULL, TextBox, "" },
-{   0,  2,    0, NULL, (void*) NULL, "", NULL, EndMark , "" }
+{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 400, NULL, (void*) &historyText, "", NULL, TextBox, "" },
+{   0,           NO_OK,             0, NULL, (void*) NULL, "", NULL, EndMark , "" }
 };
 
 // ------------ standard entry points into MoveHistory code -----------
@@ -138,31 +139,31 @@ Option historyOptions[] = {
 Boolean
 MoveHistoryIsUp ()
 {
-    return shellUp[7];
+    return shellUp[HistoryDlg];
 }
 
 Boolean
 MoveHistoryDialogExists ()
 {
-    return shells[7] != NULL;
+    return DialogExists(HistoryDlg);
 }
 
 void
 HistoryPopUp ()
 {
-    if(GenericPopUp(historyOptions, _("Move list"), 7))
-       XtOverrideTranslations(historyOptions[0].handle, XtParseTranslationTable(historyTranslations));
-    MarkMenu("menuView.Show Move History", 7);
+    if(GenericPopUp(historyOptions, _("Move list"), HistoryDlg, BoardWindow, NONMODAL, 1))
+       AddHandler(&historyOptions[0], 0);
+    MarkMenu("Show Move History", HistoryDlg);
 }
 
 void
-HistoryShowProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
+HistoryShowProc ()
 {
-  if (!shellUp[7]) {
+  if (!shellUp[HistoryDlg]) {
     ASSIGN(historyText, "");
     HistoryPopUp();
     RefreshMemoContent();
     MemoContentUpdated();
-  } else PopDown(7);
+  } else PopDown(HistoryDlg);
   ToNrEvent(currentMove);
 }