зеркало из https://github.com/mozilla/gecko-dev.git
Back out bug 343150, it couldn't compile with atk < 1.12.1
This commit is contained in:
Родитель
983c7a72d8
Коммит
99aaae7727
|
@ -76,7 +76,6 @@ CPPSRCS = \
|
|||
nsMaiInterfaceValue.cpp \
|
||||
nsMaiHyperlink.cpp \
|
||||
nsMaiInterfaceHypertext.cpp \
|
||||
nsMaiInterfaceHyperlinkImpl.cpp \
|
||||
nsMaiInterfaceTable.cpp \
|
||||
nsMaiInterfaceDocument.cpp \
|
||||
$(NULL)
|
||||
|
|
|
@ -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<nsIAccessibleHyperLink> accessInterfaceHyperlink;
|
||||
QueryInterface(NS_GET_IID(nsIAccessibleHyperLink),
|
||||
getter_AddRefs(accessInterfaceHyperlink));
|
||||
if (accessInterfaceHyperlink) {
|
||||
interfacesBits |= 1 << MAI_INTERFACE_HYPERLINK_IMPL;
|
||||
}
|
||||
|
||||
//nsIAccessibleTable
|
||||
nsCOMPtr<nsIAccessibleTable> accessInterfaceTable;
|
||||
QueryInterface(NS_GET_IID(nsIAccessibleTable),
|
||||
|
|
Загрузка…
Ссылка в новой задаче