mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 703889 - Remove |ifndef DISABLE_XFORMS_HOOKS| since it's never defined; r=ted
This commit is contained in:
parent
aee7a3d6be
commit
13c27f3c4f
@ -61,15 +61,12 @@ SHARED_LIBRARY_LIBS = \
|
||||
../src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
|
||||
../src/xpcom/$(LIB_PREFIX)accessibility_xpcom_s.$(LIB_SUFFIX) \
|
||||
../src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \
|
||||
../src/xforms/$(LIB_PREFIX)accessibility_xforms_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_XUL
|
||||
SHARED_LIBRARY_LIBS += ../src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifndef DISABLE_XFORMS_HOOKS
|
||||
SHARED_LIBRARY_LIBS += ../src/xforms/$(LIB_PREFIX)accessibility_xforms_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -63,14 +63,11 @@ DIRS += \
|
||||
base \
|
||||
html \
|
||||
xpcom \
|
||||
xforms \
|
||||
$(null)
|
||||
|
||||
ifdef MOZ_XUL
|
||||
DIRS += xul
|
||||
endif
|
||||
|
||||
ifndef DISABLE_XFORMS_HOOKS
|
||||
DIRS += xforms
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -106,12 +106,9 @@ LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/../xul \
|
||||
-I$(srcdir)/../../../layout/generic \
|
||||
-I$(srcdir)/../../../layout/xul/base/src \
|
||||
-I$(srcdir)/../xforms \
|
||||
$(NULL)
|
||||
|
||||
ifndef DISABLE_XFORMS_HOOKS
|
||||
LOCAL_INCLUDES += -I$(srcdir)/../xforms
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(srcdir)/../atk \
|
||||
|
@ -106,10 +106,8 @@
|
||||
#include "AtkSocketAccessible.h"
|
||||
#endif
|
||||
|
||||
#ifndef DISABLE_XFORMS_HOOKS
|
||||
#include "nsXFormsFormControlsAccessible.h"
|
||||
#include "nsXFormsWidgetsAccessible.h"
|
||||
#endif
|
||||
|
||||
#include "mozilla/FunctionTimer.h"
|
||||
#include "mozilla/dom/Element.h"
|
||||
@ -1516,7 +1514,6 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
|
||||
|
||||
#endif // MOZ_XUL
|
||||
|
||||
#ifndef DISABLE_XFORMS_HOOKS
|
||||
// XForms elements
|
||||
case nsIAccessibleProvider::XFormsContainer:
|
||||
accessible = new nsXFormsContainerAccessible(aContent, aWeakShell);
|
||||
@ -1594,8 +1591,6 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
|
||||
accessible = new nsXFormsComboboxPopupWidgetAccessible(aContent, aWeakShell);
|
||||
break;
|
||||
|
||||
#endif
|
||||
|
||||
default:
|
||||
return nsnull;
|
||||
}
|
||||
|
@ -80,6 +80,7 @@ nsReferencedElement.h \
|
||||
nsTreeSanitizer.h \
|
||||
nsXMLNameSpaceMap.h \
|
||||
nsDOMEventTargetWrapperCache.h \
|
||||
nsIXFormsUtilityService.h \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS_NAMESPACES = mozilla/dom
|
||||
@ -89,10 +90,6 @@ EXPORTS_mozilla/dom = \
|
||||
FromParser.h \
|
||||
$(NULL)
|
||||
|
||||
ifndef DISABLE_XFORMS_HOOKS
|
||||
EXPORTS += nsIXFormsUtilityService.h
|
||||
endif
|
||||
|
||||
SDK_XPIDLSRCS = \
|
||||
nsISelection.idl \
|
||||
$(NULL)
|
||||
|
@ -1672,8 +1672,6 @@ GK_ATOM(veryverythinmathspace_, "veryverythinmathspace")
|
||||
GK_ATOM(voffset_, "voffset")
|
||||
GK_ATOM(xref_, "xref")
|
||||
GK_ATOM(math, "math") // the only one without an underscore
|
||||
|
||||
#ifndef DISABLE_XFORMS_HOOKS
|
||||
GK_ATOM(avg, "avg")
|
||||
GK_ATOM(booleanFromString, "boolean-from-string")
|
||||
GK_ATOM(countNonEmpty, "count-non-empty")
|
||||
@ -1684,7 +1682,6 @@ GK_ATOM(months, "months")
|
||||
GK_ATOM(now, "now")
|
||||
GK_ATOM(seconds, "seconds")
|
||||
GK_ATOM(secondsFromDateTime, "seconds-from-dateTime")
|
||||
#endif
|
||||
|
||||
// Simple gestures support
|
||||
GK_ATOM(onMozSwipeGesture, "onMozSwipeGesture")
|
||||
|
Loading…
Reference in New Issue
Block a user