From 6d3853b27968efe7d1560e1256c51da8ab3a2ffd Mon Sep 17 00:00:00 2001 From: "kyle.yuan%sun.com" Date: Thu, 20 Mar 2003 08:17:27 +0000 Subject: [PATCH] Bug 196644 get rid of class nsMenuListenerAccessible r=aaronl, sr=henry.jia --- .../src/base/nsBaseWidgetAccessible.cpp | 70 ------------------- accessible/src/base/nsBaseWidgetAccessible.h | 32 --------- 2 files changed, 102 deletions(-) diff --git a/accessible/src/base/nsBaseWidgetAccessible.cpp b/accessible/src/base/nsBaseWidgetAccessible.cpp index 8ae74e93ac3c..4adcb110c30c 100644 --- a/accessible/src/base/nsBaseWidgetAccessible.cpp +++ b/accessible/src/base/nsBaseWidgetAccessible.cpp @@ -383,73 +383,3 @@ PRBool nsLinkableAccessible::IsALink() mIsALinkCached = PR_TRUE; // Cached that there is no link return PR_FALSE; } - -// ------------ -// nsMenuListenerAccessible -// ------------ - -NS_IMPL_ISUPPORTS_INHERITED1(nsMenuListenerAccessible, nsAccessible, nsIDOMXULListener) - -nsMenuListenerAccessible::nsMenuListenerAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell): -nsAccessible(aDOMNode, aShell) -{ - mRegistered = PR_FALSE; - mOpen = PR_FALSE; -} - -nsMenuListenerAccessible::~nsMenuListenerAccessible() -{ - if (mRegistered) { - nsCOMPtr eventReceiver(do_QueryInterface(mDOMNode)); - if (eventReceiver) - eventReceiver->RemoveEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE); - } -} - -NS_IMETHODIMP nsMenuListenerAccessible::PopupShowing(nsIDOMEvent* aEvent) -{ - mOpen = PR_TRUE; - - /* TBD send state change event */ - - return NS_OK; -} - -NS_IMETHODIMP nsMenuListenerAccessible::PopupHiding(nsIDOMEvent* aEvent) -{ - mOpen = PR_FALSE; - - /* TBD send state change event */ - - return NS_OK; -} - -NS_IMETHODIMP nsMenuListenerAccessible::Close(nsIDOMEvent* aEvent) -{ - mOpen = PR_FALSE; - - /* TBD send state change event */ - - return NS_OK; -} - -void -nsMenuListenerAccessible::SetupMenuListener() -{ - // if not already one, register ourselves as a popup listener - if (!mRegistered) { - nsCOMPtr eventReceiver(do_QueryInterface(mDOMNode)); - if (!eventReceiver) { - return; - } - - nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("popupshowing"), this, PR_TRUE); - - if (NS_FAILED(rv)) { - return; - } - - mRegistered = PR_TRUE; - } -} - diff --git a/accessible/src/base/nsBaseWidgetAccessible.h b/accessible/src/base/nsBaseWidgetAccessible.h index 51b9b8f2027e..85e6a5b05b99 100644 --- a/accessible/src/base/nsBaseWidgetAccessible.h +++ b/accessible/src/base/nsBaseWidgetAccessible.h @@ -114,37 +114,5 @@ protected: PRBool mIsLinkVisited; }; -/* - * A base class that can listen to menu events. Its used by selects so the - * button and the window accessibles can change their name and role - * depending on whether the drop down list is dropped down on not - */ -class nsMenuListenerAccessible : public nsAccessible, public nsIDOMXULListener -{ -public: - - NS_DECL_ISUPPORTS_INHERITED - - nsMenuListenerAccessible(nsIDOMNode* aDOMNode, nsIWeakReference* aShell); - virtual ~nsMenuListenerAccessible(); - - // popup listener - NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent); - NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) { return NS_OK; } - NS_IMETHOD PopupHiding(nsIDOMEvent* aEvent); - NS_IMETHOD PopupHidden(nsIDOMEvent* aEvent) { return NS_OK; } - - NS_IMETHOD Close(nsIDOMEvent* aEvent); - NS_IMETHOD Command(nsIDOMEvent* aEvent) { return NS_OK; } - NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; } - NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; } - NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; } - - virtual void SetupMenuListener(); - - PRBool mRegistered; - PRBool mOpen; -}; - #endif