mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 22:01:30 +00:00
bug 657719 - nsXformsSelectableAccessible::IsItemSelected() -> IsSelected() r=surkov
From b302c0e2cc2b8fc912192e9836e1c35fbb25b664 Mon Sep 17 00:00:00 2001 --- accessible/src/xforms/nsXFormsAccessible.cpp | 4 ++-- accessible/src/xforms/nsXFormsAccessible.h | 2 +- .../src/xforms/nsXFormsFormControlsAccessible.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-)
This commit is contained in:
parent
fe1a84785a
commit
36f0907e08
@ -562,8 +562,8 @@ nsXFormsSelectableItemAccessible::DoAction(PRUint8 aIndex)
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
PRBool
|
bool
|
||||||
nsXFormsSelectableItemAccessible::IsItemSelected()
|
nsXFormsSelectableItemAccessible::IsSelected()
|
||||||
{
|
{
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
|
|
||||||
|
@ -194,7 +194,7 @@ public:
|
|||||||
NS_IMETHOD DoAction(PRUint8 aIndex);
|
NS_IMETHOD DoAction(PRUint8 aIndex);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
PRBool IsItemSelected();
|
bool IsSelected();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -502,7 +502,7 @@ nsXFormsItemCheckgroupAccessible::NativeState()
|
|||||||
{
|
{
|
||||||
PRUint64 state = nsXFormsSelectableItemAccessible::NativeState();
|
PRUint64 state = nsXFormsSelectableItemAccessible::NativeState();
|
||||||
|
|
||||||
if (IsItemSelected())
|
if (IsSelected())
|
||||||
state |= states::CHECKED;
|
state |= states::CHECKED;
|
||||||
|
|
||||||
return state;
|
return state;
|
||||||
@ -514,7 +514,7 @@ nsXFormsItemCheckgroupAccessible::GetActionName(PRUint8 aIndex, nsAString& aName
|
|||||||
if (aIndex != eAction_Click)
|
if (aIndex != eAction_Click)
|
||||||
return NS_ERROR_INVALID_ARG;
|
return NS_ERROR_INVALID_ARG;
|
||||||
|
|
||||||
if (IsItemSelected())
|
if (IsSelected())
|
||||||
aName.AssignLiteral("uncheck");
|
aName.AssignLiteral("uncheck");
|
||||||
else
|
else
|
||||||
aName.AssignLiteral("check");
|
aName.AssignLiteral("check");
|
||||||
@ -544,7 +544,7 @@ nsXFormsItemRadiogroupAccessible::NativeState()
|
|||||||
{
|
{
|
||||||
PRUint64 state = nsXFormsSelectableItemAccessible::NativeState();
|
PRUint64 state = nsXFormsSelectableItemAccessible::NativeState();
|
||||||
|
|
||||||
if (IsItemSelected())
|
if (IsSelected())
|
||||||
state |= states::CHECKED;
|
state |= states::CHECKED;
|
||||||
|
|
||||||
return state;
|
return state;
|
||||||
@ -627,7 +627,7 @@ nsXFormsItemComboboxAccessible::NativeState()
|
|||||||
return state;
|
return state;
|
||||||
|
|
||||||
state |= states::SELECTABLE;
|
state |= states::SELECTABLE;
|
||||||
if (IsItemSelected())
|
if (IsSelected())
|
||||||
state |= states::SELECTED;
|
state |= states::SELECTED;
|
||||||
|
|
||||||
return state;
|
return state;
|
||||||
|
Loading…
Reference in New Issue
Block a user