Commit 82a365a3 authored by Claes Sjofors's avatar Claes Sjofors Committed by Claes Sjöfors

wb menu method override bugfix, object method was overridden by superclass method

parent 33ca3ccd
...@@ -947,16 +947,10 @@ void wb_session::getAllMenuItems(ldh_sMenuCall* ip, ldh_sMenuItem** Item, ...@@ -947,16 +947,10 @@ void wb_session::getAllMenuItems(ldh_sMenuCall* ip, ldh_sMenuItem** Item,
for (int i = 0; i < *nItems; i++) { for (int i = 0; i < *nItems; i++) {
if (ldh_lMenuItem[i].Level == Level if (ldh_lMenuItem[i].Level == Level
&& streq(ldh_lMenuItem[i].Name, mbp->ButtonName)) { && streq(ldh_lMenuItem[i].Name, mbp->ButtonName)) {
(*Item)->Disabled = 1;
for (int j = i + 1; j < *nItems; j++) {
if (ldh_lMenuItem[j].Level > ldh_lMenuItem[i].Level)
(*Item)->Disabled = 1;
else if (ldh_lMenuItem[j].Level == ldh_lMenuItem[i].Level)
break; break;
} }
} }
} }
}
(*Item)->Level = Level; (*Item)->Level = Level;
(*Item)->Item = ldh_eMenuItem_Button; (*Item)->Item = ldh_eMenuItem_Button;
...@@ -992,16 +986,10 @@ void wb_session::getAllMenuItems(ldh_sMenuCall* ip, ldh_sMenuItem** Item, ...@@ -992,16 +986,10 @@ void wb_session::getAllMenuItems(ldh_sMenuCall* ip, ldh_sMenuItem** Item,
for (int i = 0; i < *nItems; i++) { for (int i = 0; i < *nItems; i++) {
if (ldh_lMenuItem[i].Level == Level if (ldh_lMenuItem[i].Level == Level
&& streq(ldh_lMenuItem[i].Name, mcp->ButtonName)) { && streq(ldh_lMenuItem[i].Name, mcp->ButtonName)) {
ldh_lMenuItem[i].Disabled = 1;
for (int j = i + 1; j < *nItems; j++) {
if (ldh_lMenuItem[j].Level > ldh_lMenuItem[i].Level)
ldh_lMenuItem[j].Disabled = 1;
else if (ldh_lMenuItem[j].Level == ldh_lMenuItem[i].Level)
break; break;
} }
} }
} }
}
(*Item)->Level = Level; (*Item)->Level = Level;
(*Item)->Item = ldh_eMenuItem_Cascade; (*Item)->Item = ldh_eMenuItem_Cascade;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment