/*\r
* woptions.h -- Options dialog box routines for WinBoard\r
*\r
- * Copyright 2003, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.\r
+ * Copyright 2003, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.\r
*\r
* ------------------------------------------------------------------------\r
*\r
LayoutOptions(int firstOption, int endOption, char *groupName, Option *optionList)\r
{\r
int i, b = strlen(groupName), stop, prefix, right, nextOption, firstButton = buttons;\r
- Control lastType, nextType;\r
+ Control lastType, nextType=Label;\r
\r
nextOption = firstOption;\r
while(nextOption < endOption) {\r
GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)\r
// read out all controls, and if value is altered, remember it and send it to the engine\r
{\r
- HANDLE hwndCombo;\r
int i, k, new=0, changed=0, len;\r
char **choices, newText[MSG_SIZ], buf[MSG_SIZ], *text;\r
BOOL success;\r
break;\r
case ComboBox:\r
choices = (char**) optionList[j].textValue;\r
- hwndCombo = GetDlgItem(hDlg, 2001+2*i);\r
success = GetDlgItemText( hDlg, 2001+2*i, newText, MSG_SIZ );\r
if(!success) break;\r
new = -1;\r
int extra, num = ES_NUMBER;\r
\r
switch(type) {\r
- case Slider+100:\r
+ case Spin+100:\r
num = 0; // needs text control for accepting negative numbers\r
case Slider:\r
case Spin:\r
\r
void PseudoOK(HWND hDlg)\r
{\r
- void (*saveOK)();\r
- saveOK = okFunc; okFunc = 0;\r
+ if(matchMode) return;\r
+ okFunc = 0;\r
GetOptionValues(hDlg, activeCps, activeList);\r
EndDialog( hDlg, 0 );\r
comboCallback = NULL; activeCps = NULL;\r
\r
if(autoinc) appData.loadGameIndex = appData.loadPositionIndex = -(twice + 1); else\r
if(!appData.loadGameFile[0]) appData.loadGameIndex = -2*twice; // kludge to pass value of "twice" for use in GUI book\r
+ if(!autoinc && !twice) { // prevent auto-inc being remembered in index value if checkboxes not ticked\r
+ if(appData.loadGameIndex < 0) appData.loadGameIndex = 0;\r
+ if(appData.loadPositionIndex < 0) appData.loadPositionIndex = 0;\r
+ }\r
if(swiss) { appData.defaultMatchGames = 1; appData.tourneyType = -1; }\r
+ ASSIGN(appData.tourneyFile, tfName);\r
}\r
\r
char *GetParticipants(HWND hDlg)\r