Bug 560939 - nsAccessibleWrap::GetNativeInterface() always returns NULL on OS X. r=surkov.alexander a=dholbert_sheriff

accessible/src/mac/Makefile.in

@@ -48,6 +48,7 @@ LIBXUL_LIBRARY = 1
   
   
 CMMSRCS = nsAccessNodeWrap.mm \
+          nsDocAccessibleWrap.mm \
           nsRootAccessibleWrap.mm \
           nsAccessibleWrap.mm \
           mozAccessible.mm \

accessible/src/mac/nsDocAccessibleWrap.h

@@ -41,7 +41,18 @@
 
 #include "nsDocAccessible.h"
 
-typedef nsDocAccessible nsDocAccessibleWrap;
+class nsDocAccessibleWrap: public nsDocAccessible
+{
+public:
+    nsDocAccessibleWrap(nsIDOMNode *aNode, nsIWeakReference *aShell);
+    virtual ~nsDocAccessibleWrap();
+
+    // nsIAccessNode
+
+    /**
+     * Creates the native accessible connected to this one.
+     */
+    virtual nsresult Init ();
+};
 
 #endif
-

accessible/src/mac/nsDocAccessibleWrap.mm

@@ -0,0 +1,66 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 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 Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Original Author: Steven Michaud <smichaud@pobox.com>
+ *
+ * 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 MPL, 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 MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsDocAccessibleWrap.h"
+
+#import "mozAccessibleWrapper.h"
+
+nsDocAccessibleWrap::
+  nsDocAccessibleWrap(nsIDOMNode *aDOMNode, nsIWeakReference *aShell) :
+  nsDocAccessible(aDOMNode, aShell)
+{
+}
+
+nsDocAccessibleWrap::~nsDocAccessibleWrap()
+{
+}
+
+nsresult
+nsDocAccessibleWrap::Init () 
+{
+  nsresult rv = nsDocAccessible::Init();
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  NS_ASSERTION(!mNativeWrapper, "nsDocAccessibleWrap::Init() called more than once!");
+
+  if (!mNativeWrapper) {
+    // Create our native object using the class type specified in GetNativeType().
+    mNativeWrapper = new AccessibleWrapper (this, GetNativeType());
+  }
+
+  return NS_OK;
+}