Fix some compile errors / warnings

[xboard.git] / dialogs.c

diff --git a/dialogs.c b/dialogs.c
index c8c7fc2..93e817a 100644 (file)
--- a/dialogs.c
+++ b/dialogs.c
@@ -1844,7 +1844,7 @@ PMSelect (int n)
     else EditPositionMenuEvent(pieceMenuTranslation[n - W_MENUW][values[n]], pmFromX, pmFromY);
 }
 
-int
+static void
 CCB (int n)
 {
     shiftKey = (ShiftKeys() & 3) != 0;
@@ -1911,6 +1911,7 @@ Exp (int n, int x, int y)
        if(but3) MovePV(x, y, lineGap + BOARD_HEIGHT * (squareSize + lineGap));
        return NULL;
     }
+    if(n != 10 && PopDown(PromoDlg)) fromX = fromY = -1; // user starts fiddling with board when promotion dialog is up
     shiftKey = ShiftKeys();
     controlKey = (shiftKey & 0xC) != 0;
     shiftKey = (shiftKey & 3) != 0;
@@ -2280,7 +2281,7 @@ DirSelProc (int n, int sel)
     }
 }
 
-FILE *
+void
 Browse (DialogClass dlg, char *label, char *proposed, char *ext, Boolean pathFlag, char *mode, char **name, FILE **fp)
 {
     int j=0;
@@ -2294,8 +2295,7 @@ Browse (DialogClass dlg, char *label, char *proposed, char *ext, Boolean pathFla
     browseOptions[6].textValue = (char*) (pathFlag ? NULL : &FileSelProc); // disable file listbox during path browsing
     ListDir(pathFlag);
     currentCps = NULL;
-    if(GenericPopUp(browseOptions, label, BrowserDlg, dlg, MODAL, 0)) {
-    }
+    GenericPopUp(browseOptions, label, BrowserDlg, dlg, MODAL, 0);
     SetWidgetLabel(&browseOptions[9], FileTypes[j]);
 }