Cleanse back-end code of all references to X11 types

[xboard.git] / nengineoutput.c

diff --git a/nengineoutput.c b/nengineoutput.c
index e17f76b..f494a7e 100644 (file)
--- a/nengineoutput.c
+++ b/nengineoutput.c
@@ -52,6 +52,7 @@ extern char *getenv();
 #include "frontend.h"
 #include "backend.h"
 #include "dialogs.h"
+#include "menus.h"
 #include "engineoutput.h"
 #include "gettext.h"
 
@@ -70,16 +71,16 @@ int  windowMode = 1;
 char *mem1, *mem2; // dummies, as this dialog can never be OK'ed
 
 Option engoutOptions[] = {
-{  0,  LL|T2T,           17, NULL, NULL, "", NULL, Label, "" },
+{  0,  LL|T2T,           17, NULL, NULL, NULL, NULL, Label, " " },
 {  0, L2L|T2T|SAME_ROW, 163, NULL, NULL, NULL, NULL, Label, N_("engine name") },
-{  0,     T2T|SAME_ROW,  30, NULL, NULL, "", NULL, Label, "" },
+{  0,     T2T|SAME_ROW,  30, NULL, NULL, NULL, NULL, Label, " " },
 {  0, R2R|T2T|SAME_ROW, 188, NULL, NULL, NULL, NULL, Label, N_("move") },
 {  0,  RR|T2T|SAME_ROW,  80, NULL, NULL, NULL, NULL, Label, N_("NPS") },
 {200, T_VSCRL | T_TOP,  500, NULL, (void*) &mem1, "", NULL, TextBox, "" },
 {  0,         0,         0, NULL, NULL, "", NULL, Break , "" },
-{  0,  LL|T2T,           17, NULL, NULL, "", NULL, Label, "" },
+{  0,  LL|T2T,           17, NULL, NULL, NULL, NULL, Label, " " },
 {  0, L2L|T2T|SAME_ROW, 163, NULL, NULL, NULL, NULL, Label, N_("engine name") },
-{  0,     T2T|SAME_ROW,  30, NULL, NULL, "", NULL, Label, "" },
+{  0,     T2T|SAME_ROW,  30, NULL, NULL, NULL, NULL, Label, " " },
 {  0, R2R|T2T|SAME_ROW, 188, NULL, NULL, NULL, NULL, Label, N_("move") },
 {  0,  RR|T2T|SAME_ROW,  80, NULL, NULL, NULL, NULL, Label, N_("NPS") },
 {200, T_VSCRL | T_TOP,  500, NULL, (void*) &mem2, "", NULL, TextBox, "" },
@@ -89,7 +90,7 @@ Option engoutOptions[] = {
 void
 SetIcon (int which, int field, int nIcon)
 {   // first call into xengineoutput.c to pick up icon pixmap
-    if( nIcon ) DrawIcon(&engoutOptions[STRIDE*which + field - 1], nIcon);
+    if( nIcon ) DrawWidgetIcon(&engoutOptions[STRIDE*which + field - 1], nIcon);
 }
 
 void
@@ -123,7 +124,7 @@ EngineOutputPopUp ()
        AddHandler(&engoutOptions[MEMO], 6);
        AddHandler(&engoutOptions[MEMO+STRIDE], 6);
        if( needInit ) {
-           InitializeEngineOutput(&engoutOptions[0], &engoutOptions[MEMO]); // make icon bitmaps
+           InitEngineOutput(&engoutOptions[0], &engoutOptions[MEMO]); // make icon bitmaps
            needInit = FALSE;
        }
         SetEngineColorIcon( 0 );
@@ -135,7 +136,7 @@ EngineOutputPopUp ()
        SetDialogTitle(EngOutDlg, _(title));
     }
 
-    MarkMenu("Show Engine Output", EngOutDlg);
+    MarkMenu("View.EngineOutput", EngOutDlg);
 
     ShowThinkingEvent(); // [HGM] thinking: might need to prompt engine for thinking output
 }
@@ -153,7 +154,7 @@ EngineOutputDialogExists ()
 }
 
 void
-EngineOutputProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
+EngineOutputProc ()
 {
   if (!PopDown(EngOutDlg)) EngineOutputPopUp();
 }