Bug 216002 [ATK Accessibility] wrong inheritance for nsXULTreeColumnsAccessibleWrap

r=bolian.yin@sun.com
Not in the default build.

accessible/src/atk/nsXULTreeAccessibleWrap.cpp

@@ -338,10 +338,10 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::IsCellSelected(PRInt32 aRow, PRInt32 aCol
 // --------------------------------------------------------
 // nsXULTreeAccessibleWrap Accessible
 // --------------------------------------------------------
-NS_IMPL_ISUPPORTS_INHERITED1(nsXULTreeColumnsAccessibleWrap, nsAccessible, nsIAccessibleTable)
+NS_IMPL_ISUPPORTS_INHERITED1(nsXULTreeColumnsAccessibleWrap, nsXULTreeColumnsAccessible, nsIAccessibleTable)
 
 nsXULTreeColumnsAccessibleWrap::nsXULTreeColumnsAccessibleWrap(nsIDOMNode *aDOMNode, nsIWeakReference *aShell):
-nsAccessibleWrap(aDOMNode, aShell)
+nsXULTreeColumnsAccessible(aDOMNode, aShell)
 {
   mCaption = nsnull;
 }
@@ -353,6 +353,7 @@ NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::GetCaption(nsIAccessible **aCaptio
 
   return NS_OK;
 }
+
 NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::SetCaption(nsIAccessible *aCaption)
 {
   mCaption = aCaption;
@@ -364,6 +365,7 @@ NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::GetSummary(nsAString &aSummary)
   aSummary = mSummary;
   return NS_OK;
 }
+
 NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::SetSummary(const nsAString &aSummary)
 {
   mSummary = aSummary;

accessible/src/atk/nsXULTreeAccessibleWrap.h

@@ -58,7 +58,7 @@ private:
   nsString mSummary;
 };
 
-class nsXULTreeColumnsAccessibleWrap : public nsAccessibleWrap,
+class nsXULTreeColumnsAccessibleWrap : public nsXULTreeColumnsAccessible,
                                        public nsIAccessibleTable
 {
 public:

accessible/src/base/nsRootAccessible.cpp

@@ -466,11 +466,12 @@ NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
       FireAccessibleFocusEvent(accessible, targetNode);
   }
   else if (eventType.EqualsIgnoreCase("select")) {
-    if (treeBox && treeIndex >= 0) // it's a XUL <tree>
+    if (treeBox && treeIndex >= 0) { // it's a XUL <tree>
       // use EVENT_FOCUS instead of EVENT_ATK_SELECTION_CHANGE
       privAcc = do_QueryInterface(treeItemAccessible);
       privAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_FOCUS, 
                                 treeItemAccessible, nsnull);
+      }
   }
   else if (eventType.EqualsIgnoreCase("CheckboxStateChange") || // it's a XUL <checkbox>
            eventType.EqualsIgnoreCase("RadioStateChange")) { // it's a XUL <radio>