mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 01:48:00 +00:00
Rename dlg_listbox_addwithindex() to dlg_listbox_addwithid(), since the old
name was, not to put too fine a point on it, wrong. [originally from svn r2997]
This commit is contained in:
parent
8cf125c96e
commit
c8c17d2cef
8
config.c
8
config.c
@ -110,7 +110,7 @@ static void cipherlist_handler(union control *ctrl, void *dlg,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dlg_listbox_addwithindex(ctrl, dlg, cstr, c);
|
dlg_listbox_addwithid(ctrl, dlg, cstr, c);
|
||||||
}
|
}
|
||||||
dlg_update_done(ctrl, dlg);
|
dlg_update_done(ctrl, dlg);
|
||||||
|
|
||||||
@ -179,9 +179,9 @@ static void sshbug_handler(union control *ctrl, void *dlg,
|
|||||||
if (event == EVENT_REFRESH) {
|
if (event == EVENT_REFRESH) {
|
||||||
dlg_update_start(ctrl, dlg);
|
dlg_update_start(ctrl, dlg);
|
||||||
dlg_listbox_clear(ctrl, dlg);
|
dlg_listbox_clear(ctrl, dlg);
|
||||||
dlg_listbox_addwithindex(ctrl, dlg, "Auto", AUTO);
|
dlg_listbox_addwithid(ctrl, dlg, "Auto", AUTO);
|
||||||
dlg_listbox_addwithindex(ctrl, dlg, "Off", FORCE_OFF);
|
dlg_listbox_addwithid(ctrl, dlg, "Off", FORCE_OFF);
|
||||||
dlg_listbox_addwithindex(ctrl, dlg, "On", FORCE_ON);
|
dlg_listbox_addwithid(ctrl, dlg, "On", FORCE_ON);
|
||||||
switch (*(int *)ATOFFSET(data, ctrl->listbox.context.i)) {
|
switch (*(int *)ATOFFSET(data, ctrl->listbox.context.i)) {
|
||||||
case AUTO: dlg_listbox_select(ctrl, dlg, 0); break;
|
case AUTO: dlg_listbox_select(ctrl, dlg, 0); break;
|
||||||
case FORCE_OFF: dlg_listbox_select(ctrl, dlg, 1); break;
|
case FORCE_OFF: dlg_listbox_select(ctrl, dlg, 1); break;
|
||||||
|
4
dialog.h
4
dialog.h
@ -580,8 +580,8 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text);
|
|||||||
* strings in any listbox then you MUST not assign them different
|
* strings in any listbox then you MUST not assign them different
|
||||||
* IDs and expect to get meaningful results back.
|
* IDs and expect to get meaningful results back.
|
||||||
*/
|
*/
|
||||||
void dlg_listbox_addwithindex(union control *ctrl, void *dlg,
|
void dlg_listbox_addwithid(union control *ctrl, void *dlg,
|
||||||
char const *text, int id);
|
char const *text, int id);
|
||||||
int dlg_listbox_getid(union control *ctrl, void *dlg, int index);
|
int dlg_listbox_getid(union control *ctrl, void *dlg, int index);
|
||||||
/* dlg_listbox_index returns <0 if no single element is selected. */
|
/* dlg_listbox_index returns <0 if no single element is selected. */
|
||||||
int dlg_listbox_index(union control *ctrl, void *dlg);
|
int dlg_listbox_index(union control *ctrl, void *dlg);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: macctrls.c,v 1.14 2003/03/25 23:23:03 ben Exp $ */
|
/* $Id: macctrls.c,v 1.15 2003/03/25 23:45:56 ben Exp $ */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003 Ben Harris
|
* Copyright (c) 2003 Ben Harris
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
@ -1114,8 +1114,8 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
|
|||||||
dlg_macpopup_add(ctrl, dlg, text);
|
dlg_macpopup_add(ctrl, dlg, text);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dlg_macpopup_addwithindex(union control *ctrl, void *dlg,
|
static void dlg_macpopup_addwithid(union control *ctrl, void *dlg,
|
||||||
char const *text, int id)
|
char const *text, int id)
|
||||||
{
|
{
|
||||||
struct macctrls *mcs = dlg;
|
struct macctrls *mcs = dlg;
|
||||||
union macctrl *mc = findbyctrl(mcs, ctrl);
|
union macctrl *mc = findbyctrl(mcs, ctrl);
|
||||||
@ -1133,12 +1133,12 @@ static void dlg_macpopup_addwithindex(union control *ctrl, void *dlg,
|
|||||||
mc->popup.ids[index] = id;
|
mc->popup.ids[index] = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
void dlg_listbox_addwithindex(union control *ctrl, void *dlg,
|
void dlg_listbox_addwithid(union control *ctrl, void *dlg,
|
||||||
char const *text, int id)
|
char const *text, int id)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (ctrl->listbox.height == 0)
|
if (ctrl->listbox.height == 0)
|
||||||
dlg_macpopup_addwithindex(ctrl, dlg, text, id);
|
dlg_macpopup_addwithid(ctrl, dlg, text, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
int dlg_listbox_getid(union control *ctrl, void *dlg, int index)
|
int dlg_listbox_getid(union control *ctrl, void *dlg, int index)
|
||||||
|
@ -323,7 +323,7 @@ void dlg_listbox_del(union control *ctrl, void *dlg, int index)
|
|||||||
|
|
||||||
void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
|
void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
|
||||||
{
|
{
|
||||||
dlg_listbox_addwithindex(ctrl, dlg, text, 0);
|
dlg_listbox_addwithid(ctrl, dlg, text, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -333,8 +333,8 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
|
|||||||
* strings in any listbox then you MUST not assign them different
|
* strings in any listbox then you MUST not assign them different
|
||||||
* IDs and expect to get meaningful results back.
|
* IDs and expect to get meaningful results back.
|
||||||
*/
|
*/
|
||||||
void dlg_listbox_addwithindex(union control *ctrl, void *dlg,
|
void dlg_listbox_addwithid(union control *ctrl, void *dlg,
|
||||||
char const *text, int id)
|
char const *text, int id)
|
||||||
{
|
{
|
||||||
struct dlgparam *dp = (struct dlgparam *)dlg;
|
struct dlgparam *dp = (struct dlgparam *)dlg;
|
||||||
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
|
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
|
||||||
|
@ -2179,8 +2179,8 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
|
|||||||
* strings in any listbox then you MUST not assign them different
|
* strings in any listbox then you MUST not assign them different
|
||||||
* IDs and expect to get meaningful results back.
|
* IDs and expect to get meaningful results back.
|
||||||
*/
|
*/
|
||||||
void dlg_listbox_addwithindex(union control *ctrl, void *dlg,
|
void dlg_listbox_addwithid(union control *ctrl, void *dlg,
|
||||||
char const *text, int id)
|
char const *text, int id)
|
||||||
{
|
{
|
||||||
struct dlgparam *dp = (struct dlgparam *)dlg;
|
struct dlgparam *dp = (struct dlgparam *)dlg;
|
||||||
struct winctrl *c = dlg_findbyctrl(dp, ctrl);
|
struct winctrl *c = dlg_findbyctrl(dp, ctrl);
|
||||||
|
Loading…
Reference in New Issue
Block a user