From 5c4c83bf45bc767ecf43fff3d58df467ff492744 Mon Sep 17 00:00:00 2001 From: "ginn.chen%sun.com" Date: Mon, 28 Aug 2006 06:47:17 +0000 Subject: [PATCH] Back out bug 343150, it couldn't compile with atk < 1.12.1 git-svn-id: svn://10.0.0.236/trunk@208603 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/accessible/src/atk/Makefile.in | 1 - mozilla/accessible/src/atk/nsAccessibleWrap.cpp | 16 +--------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/mozilla/accessible/src/atk/Makefile.in b/mozilla/accessible/src/atk/Makefile.in index 154156fd810..8999349aef1 100644 --- a/mozilla/accessible/src/atk/Makefile.in +++ b/mozilla/accessible/src/atk/Makefile.in @@ -76,7 +76,6 @@ CPPSRCS = \ nsMaiInterfaceValue.cpp \ nsMaiHyperlink.cpp \ nsMaiInterfaceHypertext.cpp \ - nsMaiInterfaceHyperlinkImpl.cpp \ nsMaiInterfaceTable.cpp \ nsMaiInterfaceDocument.cpp \ $(NULL) diff --git a/mozilla/accessible/src/atk/nsAccessibleWrap.cpp b/mozilla/accessible/src/atk/nsAccessibleWrap.cpp index 32e4b5b94f2..a99dd7cb939 100644 --- a/mozilla/accessible/src/atk/nsAccessibleWrap.cpp +++ b/mozilla/accessible/src/atk/nsAccessibleWrap.cpp @@ -53,7 +53,6 @@ #include "nsMaiInterfaceSelection.h" #include "nsMaiInterfaceValue.h" #include "nsMaiInterfaceHypertext.h" -#include "nsMaiInterfaceHyperlinkImpl.h" #include "nsMaiInterfaceTable.h" #include "nsMaiInterfaceDocument.h" @@ -77,11 +76,10 @@ enum MaiInterfaceType { MAI_INTERFACE_VALUE, MAI_INTERFACE_EDITABLE_TEXT, MAI_INTERFACE_HYPERTEXT, - MAI_INTERFACE_HYPERLINK_IMPL, MAI_INTERFACE_SELECTION, MAI_INTERFACE_TABLE, MAI_INTERFACE_TEXT, - MAI_INTERFACE_DOCUMENT /* 9 */ + MAI_INTERFACE_DOCUMENT /* 8 */ }; static GType GetAtkTypeForMai(MaiInterfaceType type) @@ -97,8 +95,6 @@ static GType GetAtkTypeForMai(MaiInterfaceType type) return ATK_TYPE_EDITABLE_TEXT; case MAI_INTERFACE_HYPERTEXT: return ATK_TYPE_HYPERTEXT; - case MAI_INTERFACE_HYPERLINK_IMPL: - return ATK_TYPE_HYPERLINK_IMPL; case MAI_INTERFACE_SELECTION: return ATK_TYPE_SELECTION; case MAI_INTERFACE_TABLE: @@ -122,8 +118,6 @@ static const GInterfaceInfo atk_if_infos[] = { (GInterfaceFinalizeFunc) NULL, NULL}, {(GInterfaceInitFunc)hypertextInterfaceInitCB, (GInterfaceFinalizeFunc) NULL, NULL}, - {(GInterfaceInitFunc)hyperlinkImplInterfaceInitCB, - (GInterfaceFinalizeFunc) NULL, NULL}, {(GInterfaceInitFunc)selectionInterfaceInitCB, (GInterfaceFinalizeFunc) NULL, NULL}, {(GInterfaceInitFunc)tableInterfaceInitCB, @@ -372,14 +366,6 @@ nsAccessibleWrap::CreateMaiInterfaces(void) } } - //nsIAccessibleHyperLink - nsCOMPtr accessInterfaceHyperlink; - QueryInterface(NS_GET_IID(nsIAccessibleHyperLink), - getter_AddRefs(accessInterfaceHyperlink)); - if (accessInterfaceHyperlink) { - interfacesBits |= 1 << MAI_INTERFACE_HYPERLINK_IMPL; - } - //nsIAccessibleTable nsCOMPtr accessInterfaceTable; QueryInterface(NS_GET_IID(nsIAccessibleTable),