OpenCanopy: Correct Childs->Children in array var names

This commit is contained in:
MikeBeaton 2021-06-28 09:28:59 +01:00
parent ff5da7278a
commit e6fd5f7db6
3 changed files with 26 additions and 26 deletions

View File

@ -1156,7 +1156,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED GUI_OBJ_CLICKABLE mBootPickerSelectorButton = {
0
};
STATIC GUI_OBJ_CHILD *mBootPickerSelectorContainerChilds[] = {
STATIC GUI_OBJ_CHILD *mBootPickerSelectorContainerChildren[] = {
&mBootPickerSelectorBackground,
&mBootPickerSelectorButton.Hdr
};
@ -1168,13 +1168,13 @@ GLOBAL_REMOVE_IF_UNREFERENCED GUI_OBJ_CHILD mBootPickerSelectorContainer = {
NULL,
GuiObjDelegatePtrEvent,
NULL,
ARRAY_SIZE (mBootPickerSelectorContainerChilds),
mBootPickerSelectorContainerChilds
ARRAY_SIZE (mBootPickerSelectorContainerChildren),
mBootPickerSelectorContainerChildren
},
&mBootPickerContainer.Obj
};
STATIC GUI_OBJ_CHILD *mBootPickerContainerChilds[] = {
STATIC GUI_OBJ_CHILD *mBootPickerContainerChildren[] = {
&mBootPickerSelectorContainer,
&mBootPicker.Hdr
};
@ -1186,8 +1186,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED GUI_OBJ_CHILD mBootPickerContainer = {
NULL,
GuiObjDelegatePtrEvent,
NULL,
ARRAY_SIZE (mBootPickerContainerChilds),
mBootPickerContainerChilds
ARRAY_SIZE (mBootPickerContainerChildren),
mBootPickerContainerChildren
},
NULL
};
@ -1255,7 +1255,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED GUI_OBJ_CHILD mBootPickerVersionLabel = {
NULL
};
STATIC GUI_OBJ_CHILD *mBootPickerViewChilds[] = {
STATIC GUI_OBJ_CHILD *mBootPickerViewChildren[] = {
&mBootPickerContainer,
&mCommonActionButtonsContainer,
&mBootPickerLeftScroll.Hdr,
@ -1263,7 +1263,7 @@ STATIC GUI_OBJ_CHILD *mBootPickerViewChilds[] = {
&mBootPickerVersionLabel
};
STATIC GUI_OBJ_CHILD *mBootPickerViewChildsMinimal[] = {
STATIC GUI_OBJ_CHILD *mBootPickerViewChildrenMinimal[] = {
&mBootPickerContainer,
&mBootPickerLeftScroll.Hdr,
&mBootPickerRightScroll.Hdr,
@ -1273,8 +1273,8 @@ STATIC GUI_OBJ_CHILD *mBootPickerViewChildsMinimal[] = {
GLOBAL_REMOVE_IF_UNREFERENCED GUI_VIEW_CONTEXT mBootPickerViewContext = {
InternalCommonViewDraw,
InternalCommonViewPtrEvent,
ARRAY_SIZE (mBootPickerViewChilds),
mBootPickerViewChilds,
ARRAY_SIZE (mBootPickerViewChildren),
mBootPickerViewChildren,
InternalBootPickerViewKeyEvent,
InternalGetCursorImage,
InternalBootPickerExitLoop,
@ -1285,8 +1285,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED GUI_VIEW_CONTEXT mBootPickerViewContext = {
GLOBAL_REMOVE_IF_UNREFERENCED GUI_VIEW_CONTEXT mBootPickerViewContextMinimal = {
InternalCommonViewDraw,
InternalCommonViewPtrEvent,
ARRAY_SIZE (mBootPickerViewChildsMinimal),
mBootPickerViewChildsMinimal,
ARRAY_SIZE (mBootPickerViewChildrenMinimal),
mBootPickerViewChildrenMinimal,
InternalBootPickerViewKeyEvent,
InternalGetCursorImage,
InternalBootPickerExitLoop,

View File

@ -540,7 +540,7 @@ InternalCommonRestartPtrEvent (
extern GUI_OBJ_CHILD mCommonFocus;
STATIC GUI_OBJ_CHILD *mCommonActionButtonsContainerChilds[] = {
STATIC GUI_OBJ_CHILD *mCommonActionButtonsContainerChildren[] = {
&mCommonRestart.Hdr,
&mCommonShutDown.Hdr,
&mCommonFocus
@ -554,9 +554,9 @@ InternalCommonActionButtonFocus (
)
{
if (!Focus) {
mCommonActionButtonsContainer.Obj.NumChildren = ARRAY_SIZE (mCommonActionButtonsContainerChilds) - 1;
mCommonActionButtonsContainer.Obj.NumChildren = ARRAY_SIZE (mCommonActionButtonsContainerChildren) - 1;
} else {
mCommonActionButtonsContainer.Obj.NumChildren = ARRAY_SIZE (mCommonActionButtonsContainerChilds);
mCommonActionButtonsContainer.Obj.NumChildren = ARRAY_SIZE (mCommonActionButtonsContainerChildren);
GuiRequestDrawCrop (
DrawContext,
@ -642,8 +642,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED GUI_OBJ_CHILD mCommonActionButtonsContainer = {
NULL,
GuiObjDelegatePtrEvent,
NULL,
ARRAY_SIZE (mCommonActionButtonsContainerChilds) - 1,
mCommonActionButtonsContainerChilds
ARRAY_SIZE (mCommonActionButtonsContainerChildren) - 1,
mCommonActionButtonsContainerChildren
},
NULL
};

View File

@ -571,13 +571,13 @@ InternalPasswordExitLoop (
return FALSE;
}
STATIC GUI_OBJ_CHILD *mPasswordViewChilds[] = {
STATIC GUI_OBJ_CHILD *mPasswordViewChildren[] = {
&mPasswordLock,
&mPasswordBoxContainer,
&mCommonActionButtonsContainer
};
STATIC GUI_OBJ_CHILD *mPasswordViewChildsMinimal[] = {
STATIC GUI_OBJ_CHILD *mPasswordViewChildrenMinimal[] = {
&mPasswordLock,
&mPasswordBoxContainer
};
@ -585,8 +585,8 @@ STATIC GUI_OBJ_CHILD *mPasswordViewChildsMinimal[] = {
STATIC GUI_VIEW_CONTEXT mPasswordViewContext = {
InternalCommonViewDraw,
InternalPasswordViewPtrEvent,
ARRAY_SIZE (mPasswordViewChilds),
mPasswordViewChilds,
ARRAY_SIZE (mPasswordViewChildren),
mPasswordViewChildren,
InternalPasswordViewKeyEvent,
InternalGetCursorImage,
InternalPasswordExitLoop,
@ -597,8 +597,8 @@ STATIC GUI_VIEW_CONTEXT mPasswordViewContext = {
STATIC GUI_VIEW_CONTEXT mPasswordViewContextMinimal = {
InternalCommonViewDraw,
InternalPasswordViewPtrEvent,
ARRAY_SIZE (mPasswordViewChildsMinimal),
mPasswordViewChildsMinimal,
ARRAY_SIZE (mPasswordViewChildrenMinimal),
mPasswordViewChildrenMinimal,
InternalPasswordViewKeyEvent,
InternalGetCursorImage,
InternalPasswordExitLoop,
@ -654,7 +654,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED GUI_OBJ_CLICKABLE mPasswordEnter = {
0
};
STATIC GUI_OBJ_CHILD *mPasswordBoxContainerChilds[] = {
STATIC GUI_OBJ_CHILD *mPasswordBoxContainerChildren[] = {
&mPasswordBox.Hdr,
&mPasswordEnter.Hdr
};
@ -666,8 +666,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED GUI_OBJ_CHILD mPasswordBoxContainer = {
InternalPasswordBoxKeyEvent,
GuiObjDelegatePtrEvent,
InternalPasswordBoxFocus,
ARRAY_SIZE (mPasswordBoxContainerChilds),
mPasswordBoxContainerChilds
ARRAY_SIZE (mPasswordBoxContainerChildren),
mPasswordBoxContainerChildren
},
NULL
};