Fix -Wshadow warnings in newmenu_create_structure
This commit is contained in:
parent
f3a4a6fef8
commit
2dce0cd92d
|
@ -1165,7 +1165,7 @@ static window_event_result newmenu_key_command(window *, const d_event &event, n
|
||||||
|
|
||||||
static void newmenu_create_structure( newmenu *menu )
|
static void newmenu_create_structure( newmenu *menu )
|
||||||
{
|
{
|
||||||
int j,aw, tw, th, twidth,fm,right_offset;
|
int aw, tw, th, twidth,fm,right_offset;
|
||||||
int nmenus, nothers;
|
int nmenus, nothers;
|
||||||
grs_canvas *save_canvas;
|
grs_canvas *save_canvas;
|
||||||
|
|
||||||
|
@ -1349,7 +1349,8 @@ static void newmenu_create_structure( newmenu *menu )
|
||||||
i.y += BORDERY;
|
i.y += BORDERY;
|
||||||
if (i.type == NM_TYPE_RADIO) {
|
if (i.type == NM_TYPE_RADIO) {
|
||||||
fm = -1; // find first marked one
|
fm = -1; // find first marked one
|
||||||
for ( j=0; j<menu->nitems; j++ ) {
|
for (unsigned j = 0; j < menu->nitems; ++j)
|
||||||
|
{
|
||||||
if (menu->items[j].type == NM_TYPE_RADIO && menu->items[j].group == i.group) {
|
if (menu->items[j].type == NM_TYPE_RADIO && menu->items[j].group == i.group) {
|
||||||
if (fm==-1 && menu->items[j].value)
|
if (fm==-1 && menu->items[j].value)
|
||||||
fm = j;
|
fm = j;
|
||||||
|
|
Loading…
Reference in a new issue