From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Wed, 20 Feb 2013 18:26:17 +0000 (+0100)
Subject: Fix -topLevel option
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=45609e1f60534051fc729485d692081aa7bf1314;p=xboard.git

Fix -topLevel option

This option was copletely ignored, after the refactorig.
---

diff --git a/dialogs.c b/dialogs.c
index 0e76041..5412018 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -922,7 +922,7 @@ IcsTextProc ()
    textOptions[i].target = NULL;
    textOptions[i].min = 2;
    MarkMenu("View.ICStextmenu", TextMenuDlg);
-   GenericPopUp(textOptions, _("ICS text menu"), TextMenuDlg, BoardWindow, NONMODAL, 1);
+   GenericPopUp(textOptions, _("ICS text menu"), TextMenuDlg, BoardWindow, NONMODAL, appData.topLevel);
 }
 
 //---------------------------------------------------- Edit Comment -----------------------------------
@@ -982,7 +982,7 @@ NewCommentPopup (char *title, char *text, int index)
     if(commentText) free(commentText); commentText = strdup(text);
     commentIndex = index;
     MarkMenu("View.Comments", CommentDlg);
-    if(GenericPopUp(commentOptions, title, CommentDlg, BoardWindow, NONMODAL, 1))
+    if(GenericPopUp(commentOptions, title, CommentDlg, BoardWindow, NONMODAL, appData.topLevel))
 	AddHandler(&commentOptions[0], CommentDlg, 1);
 }
 
@@ -1057,7 +1057,7 @@ NewTagsPopup (char *text, char *msg)
     if(tagsText) free(tagsText); tagsText = strdup(text);
     tagsOptions[0].name = msg;
     MarkMenu("View.Tags", TagsDlg);
-    GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL, 1);
+    GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL, appData.topLevel);
 }
 
 void
@@ -2199,7 +2199,7 @@ BoardPopUp (int squareSize, int lineGap, void *clockFontThingy)
     if(!appData.showButtonBar) for(i=W_BUTTON; i<W_BOARD; i++) mainOptions[i].type = -1;
     for(i=0; i<8; i++) mainOptions[i+1].choice = (char**) menuBar[i].mi;
     AppendEnginesToMenu(appData.recentEngineList);
-    GenericPopUp(mainOptions, "XBoard", BoardWindow, BoardWindow, NONMODAL, 1);
+    GenericPopUp(mainOptions, "XBoard", BoardWindow, BoardWindow, NONMODAL, 1); // allways top-level
     return mainOptions;
 }
 
@@ -2232,7 +2232,7 @@ SlavePopUp ()
     dualOptions[3].value = BOARD_HEIGHT*(squareSize + lineGap) + lineGap;
     dualOptions[3].max = dualOptions[2].max = size; // board width
     dualOptions[0].max = dualOptions[1].max = size/2 - 3; // clock width
-    GenericPopUp(dualOptions, "XBoard", DummyDlg, BoardWindow, NONMODAL, 1);
+    GenericPopUp(dualOptions, "XBoard", DummyDlg, BoardWindow, NONMODAL, appData.topLevel);
     SlaveResize(dualOptions+3);
 }
 
diff --git a/nengineoutput.c b/nengineoutput.c
index 088cc1c..76f8eb1 100644
--- a/nengineoutput.c
+++ b/nengineoutput.c
@@ -152,7 +152,7 @@ EngineOutputPopUp ()
     static int  needInit = TRUE;
     static char *title = N_("Engine output");
 
-    if (GenericPopUp(engoutOptions, _(title), EngOutDlg, BoardWindow, NONMODAL, 1)) {
+    if (GenericPopUp(engoutOptions, _(title), EngOutDlg, BoardWindow, NONMODAL, appData.topLevel)) {
 	if(engoutOptions[STRIDE-1].type != Break)
 	    DisplayFatalError(_("Mismatch of STRIDE in nengineoutput.c\nChange and recompile!"), 0, 2);
 	AddHandler(&engoutOptions[MEMO], EngOutDlg, 6);
diff --git a/nevalgraph.c b/nevalgraph.c
index 5ab171c..d7b9923 100644
--- a/nevalgraph.c
+++ b/nevalgraph.c
@@ -132,7 +132,7 @@ EvalCallback (int button, int x, int y)
 void
 EvalGraphPopUp ()
 {
-    if (GenericPopUp(graphOptions, _(title), EvalGraphDlg, BoardWindow, NONMODAL, 1)) {
+    if (GenericPopUp(graphOptions, _(title), EvalGraphDlg, BoardWindow, NONMODAL, appData.topLevel)) {
 	InitializeEvalGraph(&graphOptions[0], wpEvalGraph.width, wpEvalGraph.height); // first time: add callbacks and initialize pens
 	disp = graphOptions;
     } else {
diff --git a/ngamelist.c b/ngamelist.c
index cf937ac..0d466f5 100644
--- a/ngamelist.c
+++ b/ngamelist.c
@@ -151,7 +151,7 @@ static int
 GameListCreate (char *name)
 {
     int new;
-    if(new = GenericPopUp(gamesOptions, name, GameListDlg, BoardWindow, NONMODAL, 1))
+    if(new = GenericPopUp(gamesOptions, name, GameListDlg, BoardWindow, NONMODAL, appData.topLevel))
 	AddHandler(&gamesOptions[1], GameListDlg, 4),
 	AddHandler(&gamesOptions[0], GameListDlg, 5);
     FocusOnWidget(&gamesOptions[0], GameListDlg);
@@ -278,7 +278,7 @@ ShowGameListProc ()
 	PopDown(GameListDlg);
 	return;
     }
-    GenericPopUp(NULL, NULL, GameListDlg, BoardWindow, NONMODAL, 1); // first two args ignored when shell exists!
+    GenericPopUp(NULL, NULL, GameListDlg, BoardWindow, NONMODAL, appData.topLevel); // first two args ignored when shell exists!
     MarkMenu("View.GameList", GameListDlg);
     GameListHighlight(lastLoadGameNumber);
 }
diff --git a/nhistory.c b/nhistory.c
index 809cbfb..eef26cf 100644
--- a/nhistory.c
+++ b/nhistory.c
@@ -106,7 +106,7 @@ MoveHistoryDialogExists ()
 void
 HistoryPopUp ()
 {
-    if(GenericPopUp(historyOptions, _("Move list"), HistoryDlg, BoardWindow, NONMODAL, 1))
+    if(GenericPopUp(historyOptions, _("Move list"), HistoryDlg, BoardWindow, NONMODAL, appData.topLevel))
 	AddHandler(&historyOptions[0], HistoryDlg, 0);
     MarkMenu("View.MoveHistory", HistoryDlg);
 }