Fixing bustage, checking in correct atk changes from patch.

accessible/src/atk/Makefile.in

@@ -100,6 +100,8 @@ EXPORTS = \
   nsAccessibleWrap.h \
   nsDocAccessibleWrap.h \
   nsRootAccessibleWrap.h \
+  nsTextAccessibleWrap.h \
+  nsAccessibleText.h \
   $(NULL)
 
 # we want to force the creation of a static lib.

accessible/src/atk/nsAccessibleText.h

@@ -48,15 +48,15 @@
 #include "nsIEditor.h"
 #include "nsISelectionController.h"
 #include "nsITextControlFrame.h"
+#include "nsTextAccessibleWrap.h"
 #include "nsTextAccessible.h"
 
 enum EGetTextType { eGetBefore=-1, eGetAt=0, eGetAfter=1 };
 
-class nsTextAccessibleWrap : public nsTextAccessible,
-                             public nsIAccessibleText
+class nsAccessibleText : public nsIAccessibleText
 {
 public:
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_ISUPPORTS
   NS_DECL_NSIACCESSIBLETEXT
 
   nsAccessibleText(nsIDOMNode *aNode);
@@ -65,6 +65,8 @@ public:
   static PRBool gSuppressedNotifySelectionChanged;
 
 protected:
+  nsCOMPtr<nsIDOMNode> mTextNode;
+
   nsresult GetSelections(nsISelectionController **aSelCon, nsISelection **aDomSel);
   nsresult GetTextHelperCore(EGetTextType aType, nsAccessibleTextBoundary aBoundaryType,
                              PRInt32 aOffset, PRInt32 *aStartOffset, PRInt32 *aEndOffset,

accessible/src/atk/nsTextAccessibleWrap.h

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape Corp.
+ * Portions created by Netscape Corp.are Copyright (C) 2003 Netscape
+ * Corp. All Rights Reserved.
+ *
+ * Original Author: Aaron Leventhal
+ *
+ * Contributor(s):
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef _nsTextAccessibleWrap_H_
+#define _nsTextAccessibleWrap_H_
+
+#include "nsTextAccessible.h"
+#include "nsAccessibleText.h"
+
+#endif