mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 345275 make eAction_*'s definition to where they belong and remove
e*_Action enum patch by nian liu at sun.com r=aaronleventhal sr=neil
This commit is contained in:
parent
2d2f802923
commit
fc2834f355
@ -121,11 +121,6 @@ class nsAccessible : public nsAccessNodeWrap,
|
||||
public nsIAccessibleValue
|
||||
{
|
||||
public:
|
||||
// to eliminate the confusion of "magic numbers" -- if ( 0 ){ foo; }
|
||||
enum { eAction_Switch=0, eAction_Jump=0, eAction_Click=0, eAction_Select=0, eAction_Expand=1 };
|
||||
// how many actions
|
||||
enum { eNo_Action=0, eSingle_Action=1, eDouble_Action=2 };
|
||||
|
||||
nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
|
||||
virtual ~nsAccessible();
|
||||
|
||||
|
@ -71,6 +71,8 @@ public:
|
||||
class nsLinkableAccessible : public nsHyperTextAccessible
|
||||
{
|
||||
public:
|
||||
enum { eAction_Jump = 0 };
|
||||
|
||||
nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
NS_IMETHOD GetNumActions(PRUint8 *_retval);
|
||||
|
@ -96,7 +96,7 @@ nsFormControlAccessible(aNode, aShell)
|
||||
*/
|
||||
NS_IMETHODIMP nsRadioButtonAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -49,6 +49,7 @@
|
||||
class nsFormControlAccessible : public nsAccessibleWrap
|
||||
{
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
nsFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
NS_IMETHOD GetFirstChild(nsIAccessible **_retval);
|
||||
|
@ -65,7 +65,7 @@ NS_IMETHODIMP nsHTMLCheckboxAccessible::GetRole(PRUint32 *_retval)
|
||||
|
||||
NS_IMETHODIMP nsHTMLCheckboxAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -148,7 +148,7 @@ nsFormControlAccessible(aNode, aShell)
|
||||
|
||||
NS_IMETHODIMP nsHTMLButtonAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -243,7 +243,7 @@ nsLeafAccessible(aNode, aShell)
|
||||
|
||||
NS_IMETHODIMP nsHTML4ButtonAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;;
|
||||
}
|
||||
|
||||
@ -389,7 +389,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetExtState(PRUint32 *aExtState)
|
||||
|
||||
NS_IMETHODIMP nsHTMLTextFieldAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;;
|
||||
}
|
||||
|
||||
|
@ -80,6 +80,8 @@ class nsHTML4ButtonAccessible : public nsLeafAccessible
|
||||
{
|
||||
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
|
||||
nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
|
||||
NS_IMETHOD GetRole(PRUint32 *_retval);
|
||||
NS_IMETHOD GetState(PRUint32 *_retval);
|
||||
@ -93,6 +95,8 @@ class nsHTMLTextFieldAccessible : public nsHyperTextAccessible
|
||||
{
|
||||
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
|
||||
|
@ -51,6 +51,9 @@ class nsHTMLImageAccessible : public nsLinkableAccessible
|
||||
{
|
||||
|
||||
public:
|
||||
//action0 may exist depends on whether an onclick is associated with it
|
||||
enum { eAction_ShowLongDescription = 1 };
|
||||
|
||||
nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
|
||||
NS_IMETHOD GetName(nsAString& _retval);
|
||||
NS_IMETHOD GetState(PRUint32 *_retval);
|
||||
|
@ -586,7 +586,7 @@ NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetActionName(PRUint8 index, nsAStri
|
||||
|
||||
NS_IMETHODIMP nsHTMLSelectOptionAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -1081,7 +1081,7 @@ nsLeafAccessible(aDOMNode, aShell)
|
||||
/** Just one action ( click ). */
|
||||
NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetNumActions(PRUint8 *aNumActions)
|
||||
{
|
||||
*aNumActions = eSingle_Action;
|
||||
*aNumActions = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -149,6 +149,7 @@ protected:
|
||||
class nsHTMLSelectOptionAccessible : public nsLeafAccessible
|
||||
{
|
||||
public:
|
||||
enum { eAction_Select = 0 };
|
||||
|
||||
nsHTMLSelectOptionAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
|
||||
virtual ~nsHTMLSelectOptionAccessible() {}
|
||||
@ -248,6 +249,7 @@ public:
|
||||
class nsHTMLComboboxButtonAccessible : public nsLeafAccessible
|
||||
{
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
|
||||
nsHTMLComboboxButtonAccessible(nsIAccessible* aParent, nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
|
||||
virtual ~nsHTMLComboboxButtonAccessible() {}
|
||||
|
@ -72,7 +72,7 @@ nsAccessibleWrap(aNode, aShell)
|
||||
*/
|
||||
NS_IMETHODIMP nsXULButtonAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -211,7 +211,7 @@ nsFormControlAccessible(aNode, aShell)
|
||||
*/
|
||||
NS_IMETHODIMP nsXULDropmarkerAccessible::GetNumActions(PRUint8 *aResult)
|
||||
{
|
||||
*aResult = eSingle_Action;
|
||||
*aResult = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -313,7 +313,7 @@ NS_IMETHODIMP nsXULCheckboxAccessible::GetRole(PRUint32 *_retval)
|
||||
*/
|
||||
NS_IMETHODIMP nsXULCheckboxAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -750,7 +750,7 @@ NS_IMETHODIMP nsXULTextFieldAccessible::GetRole(PRUint32 *aRole)
|
||||
*/
|
||||
NS_IMETHODIMP nsXULTextFieldAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -50,6 +50,7 @@ class nsXULButtonAccessible : public nsAccessibleWrap
|
||||
// Don't inherit from nsFormControlAccessible - it doesn't allow children and a button can have a dropmarker child
|
||||
{
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
nsXULButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
|
||||
NS_IMETHOD GetRole(PRUint32 *_retval);
|
||||
NS_IMETHOD GetState(PRUint32 *_retval);
|
||||
@ -149,6 +150,8 @@ public:
|
||||
class nsXULTextFieldAccessible : public nsHyperTextAccessible
|
||||
{
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
nsXULTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
|
||||
|
@ -47,7 +47,7 @@
|
||||
#include "nsIPresShell.h"
|
||||
#include "nsIContent.h"
|
||||
#include "nsGUIEvent.h"
|
||||
|
||||
#include "nsXULFormControlAccessible.h"
|
||||
|
||||
// ------------------------ Menu Item -----------------------------
|
||||
|
||||
@ -273,7 +273,7 @@ NS_IMETHODIMP nsXULMenuitemAccessible::DoAction(PRUint8 index)
|
||||
PRUint32 state;
|
||||
buttonAccessible->GetFinalState(&state);
|
||||
if (state & STATE_PRESSED)
|
||||
buttonAccessible->DoAction(eAction_Click);
|
||||
buttonAccessible->DoAction(nsXULButtonAccessible::eAction_Click);
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
@ -294,7 +294,7 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetActionName(PRUint8 index, nsAString& _
|
||||
|
||||
NS_IMETHODIMP nsXULMenuitemAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -48,6 +48,8 @@
|
||||
class nsXULMenuitemAccessible : public nsAccessibleWrap
|
||||
{
|
||||
public:
|
||||
enum { eAction_Select = 0 };
|
||||
|
||||
nsXULMenuitemAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell);
|
||||
NS_IMETHOD GetName(nsAString& _retval);
|
||||
NS_IMETHOD GetDescription(nsAString& aDescription);
|
||||
|
@ -144,6 +144,8 @@ public:
|
||||
class nsXULListitemAccessible : public nsXULMenuitemAccessible
|
||||
{
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
nsXULListitemAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
|
||||
|
@ -57,14 +57,14 @@ nsLeafAccessible(aNode, aShell)
|
||||
/** Only one action available */
|
||||
NS_IMETHODIMP nsXULTabAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/** Return the name of our only action */
|
||||
NS_IMETHODIMP nsXULTabAccessible::GetActionName(PRUint8 index, nsAString& _retval)
|
||||
{
|
||||
if (index == eAction_Click) {
|
||||
if (index == eAction_Switch) {
|
||||
nsAccessible::GetTranslatedString(NS_LITERAL_STRING("switch"), _retval);
|
||||
return NS_OK;
|
||||
}
|
||||
@ -233,7 +233,7 @@ NS_IMETHODIMP nsXULTabsAccessible::GetRole(PRUint32 *_retval)
|
||||
/** no actions */
|
||||
NS_IMETHODIMP nsXULTabsAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eNo_Action;
|
||||
*_retval = 0;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -47,6 +47,8 @@
|
||||
class nsXULTabAccessible : public nsLeafAccessible
|
||||
{
|
||||
public:
|
||||
enum { eAction_Switch = 0 };
|
||||
|
||||
nsXULTabAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell);
|
||||
NS_IMETHOD GetRole(PRUint32 *_retval);
|
||||
NS_IMETHOD GetState(PRUint32 *_retval);
|
||||
|
@ -548,9 +548,9 @@ NS_IMETHODIMP nsXULTreeitemAccessible::GetNumActions(PRUint8 *_retval)
|
||||
PRBool isContainer;
|
||||
mTreeView->IsContainer(mRow, &isContainer);
|
||||
if (isContainer)
|
||||
*_retval = eDouble_Action;
|
||||
*_retval = 2;
|
||||
else
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -841,7 +841,7 @@ NS_IMETHODIMP nsXULTreeColumnsAccessible::GetRole(PRUint32 *_retval)
|
||||
|
||||
NS_IMETHODIMP nsXULTreeColumnsAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
@ -922,7 +922,7 @@ NS_IMETHODIMP nsXULTreeColumnitemAccessible::GetRole(PRUint32 *_retval)
|
||||
|
||||
NS_IMETHODIMP nsXULTreeColumnitemAccessible::GetNumActions(PRUint8 *_retval)
|
||||
{
|
||||
*_retval = eSingle_Action;
|
||||
*_retval = 1;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -90,6 +90,8 @@ protected:
|
||||
class nsXULTreeitemAccessible : public nsLeafAccessible
|
||||
{
|
||||
public:
|
||||
enum { eAction_Click = 0, eAction_Expand = 1 };
|
||||
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
nsXULTreeitemAccessible(nsIAccessible *aParent, nsIDOMNode *aDOMNode, nsIWeakReference *aShell, PRInt32 aRow, nsITreeColumn* aColumn = nsnull);
|
||||
@ -127,6 +129,8 @@ protected:
|
||||
class nsXULTreeColumnsAccessible : public nsAccessibleWrap
|
||||
{
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
nsXULTreeColumnsAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
|
||||
@ -147,6 +151,8 @@ public:
|
||||
class nsXULTreeColumnitemAccessible : public nsLeafAccessible
|
||||
{
|
||||
public:
|
||||
enum { eAction_Click = 0 };
|
||||
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
nsXULTreeColumnitemAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell);
|
||||
|
Loading…
Reference in New Issue
Block a user