diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 5ce63bbd48c..205d45c3a3c 100644 --- a/mozilla/Makefile.in +++ b/mozilla/Makefile.in @@ -115,9 +115,12 @@ DIRS += \ sun-java \ profile \ themes \ - accessible \ $(NULL) +ifdef ACCESSIBILITY +DIRS += accessible +endif + # This must preceed xpfe ifdef MOZ_JPROF DIRS += tools/jprof diff --git a/mozilla/build/mac/build_scripts/MozillaBuildFlags.txt b/mozilla/build/mac/build_scripts/MozillaBuildFlags.txt index fec2c34ac49..e12e4636ca2 100644 --- a/mozilla/build/mac/build_scripts/MozillaBuildFlags.txt +++ b/mozilla/build/mac/build_scripts/MozillaBuildFlags.txt @@ -56,7 +56,7 @@ embedding_test 1 carbon 0 TARGET_CARBON useimg2 1 USE_IMG2 lowmem 0 MOZ_MAC_LOWMEM -accessible 1 +accessible 1 ACCESSIBILITY bidi 1 IBMBIDI p3p 0 jsdebugger 0 diff --git a/mozilla/build/mac/build_scripts/MozillaBuildList.pm b/mozilla/build/mac/build_scripts/MozillaBuildList.pm index ebf323fc2b3..15b796c59e3 100644 --- a/mozilla/build/mac/build_scripts/MozillaBuildList.pm +++ b/mozilla/build/mac/build_scripts/MozillaBuildList.pm @@ -728,8 +728,11 @@ sub BuildClientDist() InstallFromManifest(":mozilla:dom:src:base:MANIFEST", "$distdirectory:dom:"); #ACCESSIBLE - InstallFromManifest(":mozilla:accessible:public:MANIFEST", "$distdirectory:accessible:"); - + if ($main::options{accessible}) + { + InstallFromManifest(":mozilla:accessible:public:MANIFEST", "$distdirectory:accessible:"); + } + #JSURL InstallFromManifest(":mozilla:dom:src:jsurl:MANIFEST_IDL", "$distdirectory:idl:"); @@ -1084,7 +1087,10 @@ sub BuildIDLProjects() BuildIDLProject(":mozilla:layout:macbuild:layoutIDL.mcp", "layout"); - BuildIDLProject(":mozilla:accessible:macbuild:accessibleIDL.mcp", "accessible"); + if ($main::options{accessible}) + { + BuildIDLProject(":mozilla:accessible:macbuild:accessibleIDL.mcp", "accessible"); + } BuildIDLProject(":mozilla:rdf:macbuild:RDFIDL.mcp", "rdf"); @@ -1580,7 +1586,7 @@ sub BuildAccessiblityProjects() } EndBuildModule("accessiblity"); -} # imglib2 +} #//-------------------------------------------------------------------------------------------------- #// Build Editor Projects diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index 2d7b3fae046..1f613810b06 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -76,6 +76,7 @@ MOZ_META_COMPONENTS = @MOZ_META_COMPONENTS@ MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@ ENABLE_TESTS = @ENABLE_TESTS@ IBMBIDI = @IBMBIDI@ +ACCESSIBILITY = @ACCESSIBILITY@ BUILD_IDLC = @BUILD_IDLC@ MOZ_ENDER_LITE = @MOZ_ENDER_LITE@ MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@ diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak index 8d311d10eca..dc52ba0e432 100644 --- a/mozilla/config/config.mak +++ b/mozilla/config/config.mak @@ -137,6 +137,13 @@ CFLAGS=$(MOZ_JAVA_FLAG) $(OS_CFLAGS) $(MOZ_CFLAGS) IBMBIDI=1 CFLAGS=$(CFLAGS) -DIBMBIDI +!if "$(DISABLE_ACCESSIBILITY)" == "1" +!undef ACCESSIBILITY +!else +ACCESSIBILITY=1 +CFLAGS=$(CFLAGS) -DACCESSIBILITY +!endif + LFLAGS=$(OS_LFLAGS) $(LLFLAGS) $(MOZ_LFLAGS) # This compiles in heap dumping utilities and other good stuff diff --git a/mozilla/configure.in b/mozilla/configure.in index 1aedfe84b3d..3216c6fb795 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -2967,6 +2967,15 @@ if test "$IBMBIDI"; then AC_DEFINE(IBMBIDI) fi +dnl accessibility support on by default +ACCESSIBILITY=1 +MOZ_ARG_DISABLE_BOOL(accessibility, +[ --disable-accessibility Disable accessibility support], + ACCESSIBILITY= ) +if test "$ACCESSIBILITY"; then + AC_DEFINE(ACCESSIBILITY) +fi + dnl ======================================================== dnl = dnl = --enable-monolithic-toolkit @@ -4069,6 +4078,7 @@ AC_SUBST(MOZ_STATIC_COMPONENTS) AC_SUBST(MOZ_META_COMPONENTS) AC_SUBST(ENABLE_TESTS) AC_SUBST(IBMBIDI) +AC_SUBST(ACCESSIBILITY) AC_SUBST(MOZ_USER_DIR) AC_SUBST(BUILD_IDLC) diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index 5e23f7aa1e2..5c586186c54 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -211,8 +211,10 @@ protected: nsresult GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd); nsresult MouseClickForAltText(nsIPresContext* aPresContext); //Helper method +#ifdef ACCESSIBILITY nsresult FireEventForAccessibility(nsIPresContext* aPresContext, const nsAReadableString& aEventType); +#endif void SelectAll(nsIPresContext* aPresContext); PRBool IsImage() const @@ -1034,7 +1036,9 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext* aPresContext, GetChecked(&checked); SetChecked(!checked); // Fire an event to notify accessibility +#ifdef ACCESSIBILITY FireEventForAccessibility( aPresContext, NS_LITERAL_STRING("CheckboxStateChange")); +#endif } break; @@ -1052,9 +1056,11 @@ nsHTMLInputElement::HandleDOMEvent(nsIPresContext* aPresContext, } SetChecked(PR_TRUE); // Fire an event to notify accessibility +#ifdef ACCESSIBILITY if ( selectedRadiobtn != this ) { FireEventForAccessibility( aPresContext, NS_LITERAL_STRING("RadiobuttonStateChange"));; } +#endif } break; @@ -1603,6 +1609,7 @@ nsHTMLInputElement::GetSelectionRange(PRInt32* aSelectionStart, return NS_OK; } +#ifdef ACCESSIBILITY nsresult nsHTMLInputElement::FireEventForAccessibility(nsIPresContext* aPresContext, const nsAReadableString& aEventType) @@ -1646,3 +1653,4 @@ nsHTMLInputElement::FireEventForAccessibility(nsIPresContext* aPresContext, return NS_OK; } +#endif diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 9ca911c41b0..416700335e6 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -5473,8 +5473,10 @@ PresShell::HandleEvent(nsIView *aView, return NS_OK; } +#ifdef ACCESSIBILITY if (aEvent->eventStructType == NS_ACCESSIBLE_EVENT) return HandleEventInternal(aEvent, aView, NS_EVENT_FLAG_INIT, aEventStatus); +#endif aView->GetClientData(clientData); @@ -5624,6 +5626,7 @@ PresShell::HandleEventWithTarget(nsEvent* aEvent, nsIFrame* aFrame, nsIContent* nsresult PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView, PRUint32 aFlags, nsEventStatus* aStatus) { +#ifdef ACCESSIBILITY if (aEvent->eventStructType == NS_ACCESSIBLE_EVENT) { void* clientData; @@ -5631,6 +5634,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView, PRUint32 aFlags, nsIFrame* frame = (nsIFrame *)clientData; return frame->HandleEvent(mPresContext, (nsGUIEvent*)aEvent, aStatus); } +#endif nsresult rv = NS_OK; diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index 73591c4f048..8e1fb9364a9 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -60,7 +60,9 @@ class nsIView; class nsIWidget; class nsIDOMRange; class nsISelectionController; +#ifdef ACCESSIBILITY class nsIAccessible; +#endif struct nsPeekOffsetStruct; struct nsPoint; @@ -982,7 +984,9 @@ public: * Note: nsAccessible must be refcountable. Do not implement directly on your frame * Use a mediatior of some kind. */ +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible) = 0; +#endif /** * Called during appending or cancelling a reflow command to give frames notice diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 3a2e60954fb..11a03b6e62b 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -63,7 +63,9 @@ #include "nsListControlFrame.h" #include "nsIElementFactory.h" #include "nsContentCID.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" #include "nsGUIEvent.h" @@ -348,6 +350,7 @@ nsComboboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsAreaFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsComboboxControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -359,6 +362,7 @@ NS_IMETHODIMP nsComboboxControlFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif diff --git a/mozilla/layout/forms/nsComboboxControlFrame.h b/mozilla/layout/forms/nsComboboxControlFrame.h index c22ab9e11d3..2af2a8d30c9 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.h +++ b/mozilla/layout/forms/nsComboboxControlFrame.h @@ -87,7 +87,9 @@ public: nsIContent * aContent, nsIFrame** aFrame); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif // nsIFrame NS_IMETHOD Init(nsIPresContext* aPresContext, diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp index a8b811a5939..a3159d21263 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp @@ -28,7 +28,9 @@ #include "nsISupportsArray.h" #include "nsINameSpaceManager.h" #include "nsContentCID.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" #include "nsLayoutAtoms.h" @@ -471,6 +473,7 @@ nsGfxButtonControlFrame::CreateFrameFor(nsIPresContext* aPresContext, return rv; } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsGfxButtonControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -482,6 +485,7 @@ NS_IMETHODIMP nsGfxButtonControlFrame::GetAccessible(nsIAccessible** aAccessible return NS_ERROR_FAILURE; } +#endif // Frames are not refcounted, no need to AddRef NS_IMETHODIMP diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.h b/mozilla/layout/forms/nsGfxButtonControlFrame.h index 2c3965bf6bd..ad660f6fab6 100644 --- a/mozilla/layout/forms/nsGfxButtonControlFrame.h +++ b/mozilla/layout/forms/nsGfxButtonControlFrame.h @@ -30,7 +30,9 @@ #include "nsITextContent.h" #include "nsIStatefulFrame.h" +#ifdef ACCESSIBILITY class nsIAccessible; +#endif // Class which implements the input[type=button, reset, submit] and // browse button for input[type=file]. @@ -59,7 +61,9 @@ public: nsEventStatus* aEventStatus); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD GetFrameType(nsIAtom** aType) const; diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp index 48441f9ec44..331c9c9c129 100644 --- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp @@ -32,7 +32,9 @@ #include "nsINameSpaceManager.h" #include "nsIPresState.h" #include "nsCSSRendering.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" @@ -90,6 +92,7 @@ nsGfxCheckboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr return nsFormControlFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -101,6 +104,7 @@ NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessib return NS_ERROR_FAILURE; } +#endif //-------------------------------------------------------------- NS_IMETHODIMP diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.h b/mozilla/layout/forms/nsGfxCheckboxControlFrame.h index 0d9218e68ed..67d3e7ec400 100644 --- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.h +++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.h @@ -26,7 +26,9 @@ #include "nsIStatefulFrame.h" #include "nsICheckboxControlFrame.h" +#ifdef ACCESSIBILITY class nsIAccessible; +#endif #define NS_GFX_CHECKBOX_CONTROL_FRAME_FACE_CONTEXT_INDEX 0 // for additional style contexts @@ -69,7 +71,9 @@ public: const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif //nsICheckboxControlFrame methods diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp index a66b72657c6..c0dea745876 100644 --- a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp @@ -32,7 +32,9 @@ #include "nsCSSRendering.h" #include "nsIPresState.h" #include "nsINameSpaceManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" @@ -84,6 +86,7 @@ nsGfxRadioControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsFormControlFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsGfxRadioControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -95,6 +98,7 @@ NS_IMETHODIMP nsGfxRadioControlFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif //-------------------------------------------------------------- NS_IMETHODIMP diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.h b/mozilla/layout/forms/nsGfxRadioControlFrame.h index 907cd9a3d65..42f1e19b837 100644 --- a/mozilla/layout/forms/nsGfxRadioControlFrame.h +++ b/mozilla/layout/forms/nsGfxRadioControlFrame.h @@ -27,7 +27,9 @@ #include "nsIStatefulFrame.h" #include "nsIRadioControlFrame.h" +#ifdef ACCESSIBILITY class nsIAccessible; +#endif // nsGfxRadioControlFrame @@ -49,7 +51,9 @@ public: NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); NS_IMETHOD SetRadioButtonFaceStyleContext(nsIStyleContext *aRadioButtonFaceStyleContext); NS_IMETHOD GetRadioGroupSelectedContent(nsIContent ** aRadioBtn); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif virtual PRBool GetChecked(); virtual PRBool GetDefaultChecked(); diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp index 702d558ff68..68fb617b164 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp @@ -54,7 +54,9 @@ #include "nsFormControlFrame.h" #include "nsIFrameManager.h" #include "nsINameSpaceManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); @@ -167,6 +169,7 @@ nsHTMLButtonControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -178,6 +181,7 @@ NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessibl return NS_ERROR_FAILURE; } +#endif void diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.h b/mozilla/layout/forms/nsHTMLButtonControlFrame.h index 7e1074fd496..7ce5100c85b 100644 --- a/mozilla/layout/forms/nsHTMLButtonControlFrame.h +++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.h @@ -100,7 +100,9 @@ public: nsIAtom* aListName, nsIFrame* aFrameList); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif #ifdef DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const { diff --git a/mozilla/layout/forms/nsImageControlFrame.cpp b/mozilla/layout/forms/nsImageControlFrame.cpp index bcde79dc3a7..195505ebcd5 100644 --- a/mozilla/layout/forms/nsImageControlFrame.cpp +++ b/mozilla/layout/forms/nsImageControlFrame.cpp @@ -45,7 +45,9 @@ #include "nsFormFrame.h" #include "nsFormControlFrame.h" #include "nsGUIEvent.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif //Enumeration of possible mouse states used to detect mouse clicks /*enum nsMouseState { @@ -84,7 +86,9 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif #ifdef DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const { @@ -207,6 +211,7 @@ nsImageControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsImageControlFrameSuper::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsImageControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -218,6 +223,7 @@ NS_IMETHODIMP nsImageControlFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif nsrefcnt nsImageControlFrame::AddRef(void) { diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index b3f692f6f6b..c180cc95b2e 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -60,7 +60,9 @@ #include "nsIScrollableFrame.h" #include "nsIDOMEventTarget.h" #include "nsGUIEvent.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsISelectElement.h" #include "nsIPrivateDOMEvent.h" @@ -555,6 +557,7 @@ nsListControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsScrollFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsListControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -566,6 +569,7 @@ NS_IMETHODIMP nsListControlFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif //--------------------------------------------------------- // Reflow is overriden to constrain the listbox height to the number of rows and columns diff --git a/mozilla/layout/forms/nsListControlFrame.h b/mozilla/layout/forms/nsListControlFrame.h index d3c858aaa06..dffdfa25fb7 100644 --- a/mozilla/layout/forms/nsListControlFrame.h +++ b/mozilla/layout/forms/nsListControlFrame.h @@ -235,7 +235,9 @@ public: virtual nsresult RequiresWidget(PRBool &aRequiresWidget); // for accessibility purposes +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif // nsHTMLContainerFrame virtual PRIntn GetSkipSides() const; diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 36124416b7c..3a7cf1e69c0 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -43,8 +43,10 @@ #include "nsIPtr.h" #include "nsISizeOfHandler.h" #include "nsIFrameManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" #include "nsIAccessible.h" +#endif #include "nsIDOMText.h" #include "nsIDeviceContext.h" @@ -821,6 +823,7 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext, if (NS_SUCCEEDED(rv)) HandleRelease(aPresContext, aEvent, aEventStatus); } break; +#ifdef ACCESSIBILITY case NS_GETACCESSIBLE: { // get the accessible @@ -837,8 +840,8 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext, NS_STATIC_CAST(nsAccessibleEvent*, aEvent)->accessible = acc; } //} - } - break; + } break; +#endif default: break; }//end switch @@ -3928,11 +3931,13 @@ nsFrame::ReflowDirtyChild(nsIPresShell* aPresShell, nsIFrame* aChild) } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsFrame::GetAccessible(nsIAccessible** aAccessible) { return NS_ERROR_NOT_IMPLEMENTED; } +#endif NS_IMETHODIMP nsFrame::ReflowCommandNotify(nsIPresShell* aShell, diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index c36eb190c01..c9f61422205 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -281,7 +281,9 @@ public: nsIReflowCommand* aRC, PRBool aCommandAdded); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD GetParentStyleContextProvider(nsIPresContext* aPresContext, nsIFrame** aProviderFrame, diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index 80f2d7f73f0..fa13e494dd2 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -74,7 +74,9 @@ #include "nsIRenderingContext.h" // For Accessibility +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #ifdef INCLUDE_XUL @@ -161,7 +163,9 @@ public: nsIAtom* aAttribute, PRInt32 aHint); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD VerifyTree() const; PRBool IsInline(); @@ -257,6 +261,7 @@ nsHTMLFrameOuterFrame::~nsHTMLFrameOuterFrame() //printf("nsHTMLFrameOuterFrame destructor %X \n", this); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsHTMLFrameOuterFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -268,6 +273,7 @@ NS_IMETHODIMP nsHTMLFrameOuterFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif //-------------------------------------------------------------- // Frames are not refcounted, no need to AddRef diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 73591c4f048..8e1fb9364a9 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -60,7 +60,9 @@ class nsIView; class nsIWidget; class nsIDOMRange; class nsISelectionController; +#ifdef ACCESSIBILITY class nsIAccessible; +#endif struct nsPeekOffsetStruct; struct nsPoint; @@ -982,7 +984,9 @@ public: * Note: nsAccessible must be refcountable. Do not implement directly on your frame * Use a mediatior of some kind. */ +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible) = 0; +#endif /** * Called during appending or cancelling a reflow command to give frames notice diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index 286167846d0..f2498c927f1 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -61,7 +61,9 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsImageMapUtils.h" #include "nsIFrameManager.h" #include "nsIScriptSecurityManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" #include "nsGUIEvent.h" @@ -155,6 +157,7 @@ nsImageFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_NOINTERFACE; } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsImageFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -166,6 +169,7 @@ NS_IMETHODIMP nsImageFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif NS_IMETHODIMP_(nsrefcnt) nsImageFrame::AddRef(void) { diff --git a/mozilla/layout/generic/nsImageFrame.h b/mozilla/layout/generic/nsImageFrame.h index be625cd51c2..97eb3699e62 100644 --- a/mozilla/layout/generic/nsImageFrame.h +++ b/mozilla/layout/generic/nsImageFrame.h @@ -97,7 +97,9 @@ public: nsIAtom* aAttribute, PRInt32 aHint); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD GetFrameType(nsIAtom** aResult) const; NS_IMETHOD GetIntrinsicImageSize(nsSize& aSize); diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 679c42e4e62..35d066a410c 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -66,9 +66,11 @@ #include "nsIPref.h" #include "nsIServiceManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessible.h" -#include "nsINameSpaceManager.h" #include "nsIAccessibilityService.h" +#endif +#include "nsINameSpaceManager.h" #include "nsGUIEvent.h" #ifdef IBMBIDI @@ -455,7 +457,9 @@ public: PRBool aCheckVis, PRBool* aIsVisible); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif // nsIHTMLReflow NS_IMETHOD Reflow(nsIPresContext* aPresContext, @@ -765,6 +769,7 @@ private: #endif }; +#ifdef ACCESSIBILITY NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible) { if (mRect.width > 0 || mRect.height > 0) { @@ -778,6 +783,7 @@ NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible) } return NS_ERROR_FAILURE; } +#endif //----------------------------------------------------------------------------- NS_IMETHODIMP nsTextFrame::QueryInterface(const nsIID& aIID, diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 36124416b7c..3a7cf1e69c0 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -43,8 +43,10 @@ #include "nsIPtr.h" #include "nsISizeOfHandler.h" #include "nsIFrameManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" #include "nsIAccessible.h" +#endif #include "nsIDOMText.h" #include "nsIDeviceContext.h" @@ -821,6 +823,7 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext, if (NS_SUCCEEDED(rv)) HandleRelease(aPresContext, aEvent, aEventStatus); } break; +#ifdef ACCESSIBILITY case NS_GETACCESSIBLE: { // get the accessible @@ -837,8 +840,8 @@ nsFrame::HandleEvent(nsIPresContext* aPresContext, NS_STATIC_CAST(nsAccessibleEvent*, aEvent)->accessible = acc; } //} - } - break; + } break; +#endif default: break; }//end switch @@ -3928,11 +3931,13 @@ nsFrame::ReflowDirtyChild(nsIPresShell* aPresShell, nsIFrame* aChild) } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsFrame::GetAccessible(nsIAccessible** aAccessible) { return NS_ERROR_NOT_IMPLEMENTED; } +#endif NS_IMETHODIMP nsFrame::ReflowCommandNotify(nsIPresShell* aShell, diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index c36eb190c01..c9f61422205 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -281,7 +281,9 @@ public: nsIReflowCommand* aRC, PRBool aCommandAdded); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD GetParentStyleContextProvider(nsIPresContext* aPresContext, nsIFrame** aProviderFrame, diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index 286167846d0..f2498c927f1 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -61,7 +61,9 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsImageMapUtils.h" #include "nsIFrameManager.h" #include "nsIScriptSecurityManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" #include "nsGUIEvent.h" @@ -155,6 +157,7 @@ nsImageFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_NOINTERFACE; } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsImageFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -166,6 +169,7 @@ NS_IMETHODIMP nsImageFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif NS_IMETHODIMP_(nsrefcnt) nsImageFrame::AddRef(void) { diff --git a/mozilla/layout/html/base/src/nsImageFrame.h b/mozilla/layout/html/base/src/nsImageFrame.h index be625cd51c2..97eb3699e62 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.h +++ b/mozilla/layout/html/base/src/nsImageFrame.h @@ -97,7 +97,9 @@ public: nsIAtom* aAttribute, PRInt32 aHint); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD GetFrameType(nsIAtom** aResult) const; NS_IMETHOD GetIntrinsicImageSize(nsSize& aSize); diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 9ca911c41b0..416700335e6 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -5473,8 +5473,10 @@ PresShell::HandleEvent(nsIView *aView, return NS_OK; } +#ifdef ACCESSIBILITY if (aEvent->eventStructType == NS_ACCESSIBLE_EVENT) return HandleEventInternal(aEvent, aView, NS_EVENT_FLAG_INIT, aEventStatus); +#endif aView->GetClientData(clientData); @@ -5624,6 +5626,7 @@ PresShell::HandleEventWithTarget(nsEvent* aEvent, nsIFrame* aFrame, nsIContent* nsresult PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView, PRUint32 aFlags, nsEventStatus* aStatus) { +#ifdef ACCESSIBILITY if (aEvent->eventStructType == NS_ACCESSIBLE_EVENT) { void* clientData; @@ -5631,6 +5634,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView, PRUint32 aFlags, nsIFrame* frame = (nsIFrame *)clientData; return frame->HandleEvent(mPresContext, (nsGUIEvent*)aEvent, aStatus); } +#endif nsresult rv = NS_OK; diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 679c42e4e62..35d066a410c 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -66,9 +66,11 @@ #include "nsIPref.h" #include "nsIServiceManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessible.h" -#include "nsINameSpaceManager.h" #include "nsIAccessibilityService.h" +#endif +#include "nsINameSpaceManager.h" #include "nsGUIEvent.h" #ifdef IBMBIDI @@ -455,7 +457,9 @@ public: PRBool aCheckVis, PRBool* aIsVisible); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif // nsIHTMLReflow NS_IMETHOD Reflow(nsIPresContext* aPresContext, @@ -765,6 +769,7 @@ private: #endif }; +#ifdef ACCESSIBILITY NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible) { if (mRect.width > 0 || mRect.height > 0) { @@ -778,6 +783,7 @@ NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible) } return NS_ERROR_FAILURE; } +#endif //----------------------------------------------------------------------------- NS_IMETHODIMP nsTextFrame::QueryInterface(const nsIID& aIID, diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index 80f2d7f73f0..fa13e494dd2 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -74,7 +74,9 @@ #include "nsIRenderingContext.h" // For Accessibility +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #ifdef INCLUDE_XUL @@ -161,7 +163,9 @@ public: nsIAtom* aAttribute, PRInt32 aHint); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD VerifyTree() const; PRBool IsInline(); @@ -257,6 +261,7 @@ nsHTMLFrameOuterFrame::~nsHTMLFrameOuterFrame() //printf("nsHTMLFrameOuterFrame destructor %X \n", this); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsHTMLFrameOuterFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -268,6 +273,7 @@ NS_IMETHODIMP nsHTMLFrameOuterFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif //-------------------------------------------------------------- // Frames are not refcounted, no need to AddRef diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 3a2e60954fb..11a03b6e62b 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -63,7 +63,9 @@ #include "nsListControlFrame.h" #include "nsIElementFactory.h" #include "nsContentCID.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" #include "nsGUIEvent.h" @@ -348,6 +350,7 @@ nsComboboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsAreaFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsComboboxControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -359,6 +362,7 @@ NS_IMETHODIMP nsComboboxControlFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.h b/mozilla/layout/html/forms/src/nsComboboxControlFrame.h index c22ab9e11d3..2af2a8d30c9 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.h +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.h @@ -87,7 +87,9 @@ public: nsIContent * aContent, nsIFrame** aFrame); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif // nsIFrame NS_IMETHOD Init(nsIPresContext* aPresContext, diff --git a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp index a8b811a5939..a3159d21263 100644 --- a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp @@ -28,7 +28,9 @@ #include "nsISupportsArray.h" #include "nsINameSpaceManager.h" #include "nsContentCID.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" #include "nsLayoutAtoms.h" @@ -471,6 +473,7 @@ nsGfxButtonControlFrame::CreateFrameFor(nsIPresContext* aPresContext, return rv; } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsGfxButtonControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -482,6 +485,7 @@ NS_IMETHODIMP nsGfxButtonControlFrame::GetAccessible(nsIAccessible** aAccessible return NS_ERROR_FAILURE; } +#endif // Frames are not refcounted, no need to AddRef NS_IMETHODIMP diff --git a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.h b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.h index 2c3965bf6bd..ad660f6fab6 100644 --- a/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.h +++ b/mozilla/layout/html/forms/src/nsGfxButtonControlFrame.h @@ -30,7 +30,9 @@ #include "nsITextContent.h" #include "nsIStatefulFrame.h" +#ifdef ACCESSIBILITY class nsIAccessible; +#endif // Class which implements the input[type=button, reset, submit] and // browse button for input[type=file]. @@ -59,7 +61,9 @@ public: nsEventStatus* aEventStatus); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD GetFrameType(nsIAtom** aType) const; diff --git a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp index 48441f9ec44..331c9c9c129 100644 --- a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.cpp @@ -32,7 +32,9 @@ #include "nsINameSpaceManager.h" #include "nsIPresState.h" #include "nsCSSRendering.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" @@ -90,6 +92,7 @@ nsGfxCheckboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr return nsFormControlFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -101,6 +104,7 @@ NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessib return NS_ERROR_FAILURE; } +#endif //-------------------------------------------------------------- NS_IMETHODIMP diff --git a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h index 0d9218e68ed..67d3e7ec400 100644 --- a/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h +++ b/mozilla/layout/html/forms/src/nsGfxCheckboxControlFrame.h @@ -26,7 +26,9 @@ #include "nsIStatefulFrame.h" #include "nsICheckboxControlFrame.h" +#ifdef ACCESSIBILITY class nsIAccessible; +#endif #define NS_GFX_CHECKBOX_CONTROL_FRAME_FACE_CONTEXT_INDEX 0 // for additional style contexts @@ -69,7 +71,9 @@ public: const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif //nsICheckboxControlFrame methods diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp index a66b72657c6..c0dea745876 100644 --- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp @@ -32,7 +32,9 @@ #include "nsCSSRendering.h" #include "nsIPresState.h" #include "nsINameSpaceManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" @@ -84,6 +86,7 @@ nsGfxRadioControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsFormControlFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsGfxRadioControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -95,6 +98,7 @@ NS_IMETHODIMP nsGfxRadioControlFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif //-------------------------------------------------------------- NS_IMETHODIMP diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h index 907cd9a3d65..42f1e19b837 100644 --- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h +++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.h @@ -27,7 +27,9 @@ #include "nsIStatefulFrame.h" #include "nsIRadioControlFrame.h" +#ifdef ACCESSIBILITY class nsIAccessible; +#endif // nsGfxRadioControlFrame @@ -49,7 +51,9 @@ public: NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); NS_IMETHOD SetRadioButtonFaceStyleContext(nsIStyleContext *aRadioButtonFaceStyleContext); NS_IMETHOD GetRadioGroupSelectedContent(nsIContent ** aRadioBtn); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif virtual PRBool GetChecked(); virtual PRBool GetDefaultChecked(); diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp index e8ddd4fa054..8df11a44aa2 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp @@ -92,7 +92,9 @@ #include "nsIScriptGlobalObject.h" //needed for notify selection changed to update the menus ect. #include "nsIDOMWindowInternal.h" //needed for notify selection changed to update the menus ect. #include "nsITextContent.h" //needed to create initial text control content +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" @@ -1279,6 +1281,7 @@ nsGfxTextControlFrame2::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsBoxFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsGfxTextControlFrame2::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -1290,6 +1293,7 @@ NS_IMETHODIMP nsGfxTextControlFrame2::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif nsGfxTextControlFrame2::nsGfxTextControlFrame2(nsIPresShell* aShell):nsStackFrame(aShell) { diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h index abc3fc54a0a..331e8638b84 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.h @@ -47,7 +47,9 @@ class nsTextInputSelectionImpl; class nsTextInputListener; class nsIDOMCharacterData; class nsIScrollableView; +#ifdef ACCESSIBILITY class nsIAccessible; +#endif class nsGfxTextControlFrame2 : public nsStackFrame, @@ -78,7 +80,9 @@ public: NS_IMETHOD GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); NS_IMETHOD GetMaxSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize); NS_IMETHOD GetAscent(nsBoxLayoutState& aBoxLayoutState, nscoord& aAscent); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif #ifdef NS_DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp index 702d558ff68..68fb617b164 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp @@ -54,7 +54,9 @@ #include "nsFormControlFrame.h" #include "nsIFrameManager.h" #include "nsINameSpaceManager.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif static NS_DEFINE_IID(kViewCID, NS_VIEW_CID); @@ -167,6 +169,7 @@ nsHTMLButtonControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -178,6 +181,7 @@ NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessibl return NS_ERROR_FAILURE; } +#endif void diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h index 7e1074fd496..7ce5100c85b 100644 --- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h +++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.h @@ -100,7 +100,9 @@ public: nsIAtom* aListName, nsIFrame* aFrameList); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif #ifdef DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const { diff --git a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp index bcde79dc3a7..195505ebcd5 100644 --- a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp @@ -45,7 +45,9 @@ #include "nsFormFrame.h" #include "nsFormControlFrame.h" #include "nsGUIEvent.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif //Enumeration of possible mouse states used to detect mouse clicks /*enum nsMouseState { @@ -84,7 +86,9 @@ public: nsGUIEvent* aEvent, nsEventStatus* aEventStatus); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif #ifdef DEBUG NS_IMETHOD GetFrameName(nsString& aResult) const { @@ -207,6 +211,7 @@ nsImageControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsImageControlFrameSuper::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsImageControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -218,6 +223,7 @@ NS_IMETHODIMP nsImageControlFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif nsrefcnt nsImageControlFrame::AddRef(void) { diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp index b3f692f6f6b..c180cc95b2e 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp @@ -60,7 +60,9 @@ #include "nsIScrollableFrame.h" #include "nsIDOMEventTarget.h" #include "nsGUIEvent.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsISelectElement.h" #include "nsIPrivateDOMEvent.h" @@ -555,6 +557,7 @@ nsListControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) return nsScrollFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsListControlFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -566,6 +569,7 @@ NS_IMETHODIMP nsListControlFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif //--------------------------------------------------------- // Reflow is overriden to constrain the listbox height to the number of rows and columns diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.h b/mozilla/layout/html/forms/src/nsListControlFrame.h index d3c858aaa06..dffdfa25fb7 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.h +++ b/mozilla/layout/html/forms/src/nsListControlFrame.h @@ -235,7 +235,9 @@ public: virtual nsresult RequiresWidget(PRBool &aRequiresWidget); // for accessibility purposes +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif // nsHTMLContainerFrame virtual PRIntn GetSkipSides() const; diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp index 8204ae1f149..d6dc1ab2743 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp @@ -46,7 +46,9 @@ #include "nsCOMPtr.h" #include "nsIHTMLTableCellElement.h" #include "nsIDOMHTMLTableCellElement.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" @@ -1087,6 +1089,7 @@ nsresult nsTableCellFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsTableCellFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -1098,6 +1101,7 @@ NS_IMETHODIMP nsTableCellFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif /* This is primarily for editor access via nsITableLayout */ NS_IMETHODIMP diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.h b/mozilla/layout/html/table/src/nsTableCellFrame.h index 860861ce270..c92a2778d48 100644 --- a/mozilla/layout/html/table/src/nsTableCellFrame.h +++ b/mozilla/layout/html/table/src/nsTableCellFrame.h @@ -65,7 +65,9 @@ public: nsIStyleContext* aContext, nsIFrame* aPrevInFlow); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp index ebc35dc4ef7..747448d2cef 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp @@ -36,7 +36,9 @@ #include "nsLayoutAtoms.h" #include "nsHTMLParts.h" #include "nsIPresShell.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" #include "nsIPrintContext.h" @@ -127,6 +129,7 @@ nsresult nsTableOuterFrame::QueryInterface(const nsIID& aIID, void** aInstancePt return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsTableOuterFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -138,6 +141,7 @@ NS_IMETHODIMP nsTableOuterFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif NS_IMETHODIMP nsTableOuterFrame::IsPercentageBase(PRBool& aBase) const diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.h b/mozilla/layout/html/table/src/nsTableOuterFrame.h index f9eff5b7ebe..4a649b249a0 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.h +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.h @@ -107,7 +107,9 @@ public: nsIAtom* aListName, nsIFrame* aOldFrame); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif /** @see nsIFrame::Paint */ NS_IMETHOD Paint(nsIPresContext* aPresContext, diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp index 8204ae1f149..d6dc1ab2743 100644 --- a/mozilla/layout/tables/nsTableCellFrame.cpp +++ b/mozilla/layout/tables/nsTableCellFrame.cpp @@ -46,7 +46,9 @@ #include "nsCOMPtr.h" #include "nsIHTMLTableCellElement.h" #include "nsIDOMHTMLTableCellElement.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" @@ -1087,6 +1089,7 @@ nsresult nsTableCellFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsTableCellFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -1098,6 +1101,7 @@ NS_IMETHODIMP nsTableCellFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif /* This is primarily for editor access via nsITableLayout */ NS_IMETHODIMP diff --git a/mozilla/layout/tables/nsTableCellFrame.h b/mozilla/layout/tables/nsTableCellFrame.h index 860861ce270..c92a2778d48 100644 --- a/mozilla/layout/tables/nsTableCellFrame.h +++ b/mozilla/layout/tables/nsTableCellFrame.h @@ -65,7 +65,9 @@ public: nsIStyleContext* aContext, nsIFrame* aPrevInFlow); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext, diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index ebc35dc4ef7..747448d2cef 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/nsTableOuterFrame.cpp @@ -36,7 +36,9 @@ #include "nsLayoutAtoms.h" #include "nsHTMLParts.h" #include "nsIPresShell.h" +#ifdef ACCESSIBILITY #include "nsIAccessibilityService.h" +#endif #include "nsIServiceManager.h" #include "nsIDOMNode.h" #include "nsIPrintContext.h" @@ -127,6 +129,7 @@ nsresult nsTableOuterFrame::QueryInterface(const nsIID& aIID, void** aInstancePt return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); } +#ifdef ACCESSIBILITY NS_IMETHODIMP nsTableOuterFrame::GetAccessible(nsIAccessible** aAccessible) { nsCOMPtr accService = do_GetService("@mozilla.org/accessibilityService;1"); @@ -138,6 +141,7 @@ NS_IMETHODIMP nsTableOuterFrame::GetAccessible(nsIAccessible** aAccessible) return NS_ERROR_FAILURE; } +#endif NS_IMETHODIMP nsTableOuterFrame::IsPercentageBase(PRBool& aBase) const diff --git a/mozilla/layout/tables/nsTableOuterFrame.h b/mozilla/layout/tables/nsTableOuterFrame.h index f9eff5b7ebe..4a649b249a0 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.h +++ b/mozilla/layout/tables/nsTableOuterFrame.h @@ -107,7 +107,9 @@ public: nsIAtom* aListName, nsIFrame* aOldFrame); +#ifdef ACCESSIBILITY NS_IMETHOD GetAccessible(nsIAccessible** aAccessible); +#endif /** @see nsIFrame::Paint */ NS_IMETHOD Paint(nsIPresContext* aPresContext, diff --git a/mozilla/makefile.win b/mozilla/makefile.win index b23ba310c5b..25b09fd4859 100644 --- a/mozilla/makefile.win +++ b/mozilla/makefile.win @@ -89,7 +89,9 @@ DIRS = \ embedding \ profile \ editor \ +!if defined(ACCESSIBILITY) accessible \ +!endif !if defined(GC_LEAK_DETECTOR) gc\boehm \ !endif diff --git a/mozilla/widget/src/makefile.win b/mozilla/widget/src/makefile.win index dfe01c5a923..226e31968f1 100644 --- a/mozilla/widget/src/makefile.win +++ b/mozilla/widget/src/makefile.win @@ -20,6 +20,15 @@ # Contributor(s): DEPTH=..\.. -DIRS=xpwidgets windows\expose windows support build +include <$(DEPTH)\config\config.mak> + +DIRS=\ + xpwidgets \ +!ifdef ACCESSIBILITY + windows\expose \ +!endif + windows \ + support \ + build include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/widget/src/windows/makefile.win b/mozilla/widget/src/windows/makefile.win index 4225f076900..296400deca1 100644 --- a/mozilla/widget/src/windows/makefile.win +++ b/mozilla/widget/src/windows/makefile.win @@ -20,15 +20,17 @@ # Contributor(s): DEPTH=..\..\.. -# +include <$(DEPTH)\config\config.mak> LIBRARY_NAME = raptorwidget_s DEFINES =-D_IMPL_NS_WIDGET -DMOZ_AIMM CPPSRCS = \ +!ifdef ACCESSIBILITY Accessible.cpp \ SimpleDOMNode.cpp \ +!endif nsFontRetrieverService.cpp \ nsFontSizeIterator.cpp \ nsNativeDragTarget.cpp \ @@ -53,8 +55,10 @@ CPPSRCS = \ MODULE=raptor OBJS = \ +!ifdef ACCESSIBILITY .\$(OBJDIR)\Accessible.obj \ .\$(OBJDIR)\SimpleDOMNode.obj \ +!endif .\$(OBJDIR)\nsFontRetrieverService.obj \ .\$(OBJDIR)\nsFontSizeIterator.obj \ .\$(OBJDIR)\nsNativeDragTarget.obj \ diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp index c9539658209..2b218a078a5 100644 --- a/mozilla/widget/src/windows/nsWindow.cpp +++ b/mozilla/widget/src/windows/nsWindow.cpp @@ -57,8 +57,10 @@ #include "nsIRenderingContextWin.h" #include "nsIImage.h" +#ifdef ACCESSIBILITY #include "nsIAccessible.h" #include "Accessible.h" +#endif #include #ifdef MOZ_AIMM @@ -444,7 +446,11 @@ NS_IMETHODIMP nsWindow::QueryInterface(const nsIID& aIID, void** aInstancePtr) // nsWindow constructor // //------------------------------------------------------------------------- +#ifdef ACCESSIBILITY nsWindow::nsWindow() : nsBaseWidget(), mRootAccessible(NULL) +#else +nsWindow::nsWindow() : nsBaseWidget() +#endif { NS_INIT_REFCNT(); mWnd = 0; @@ -523,8 +529,10 @@ UINT nsWindow::gCurrentKeyboardCP = 0; //------------------------------------------------------------------------- nsWindow::~nsWindow() { +#ifdef ACCESSIBILITY if (mRootAccessible) mRootAccessible->Release(); +#endif mIsDestroying = PR_TRUE; if (gCurrentWindow == this) { @@ -3575,6 +3583,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT nsServiceManager::ReleaseService(kCClipboardCID, clipboard); } break; +#ifdef ACCESSIBILITY case WM_GETOBJECT: { if (lParam == OBJID_CLIENT) { @@ -3602,9 +3611,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT } *aRetValue = NULL; return PR_FALSE; - } - break; - + } break; +#endif default: { // Handle both flavors of mouse wheel events. if ((msg == WM_MOUSEWHEEL) || (msg == uMSH_MOUSEWHEEL)) { @@ -4371,6 +4379,7 @@ PRBool nsWindow::DispatchMouseEvent(PRUint32 aEventType, nsPoint* aPoint) // Deal with accessibile event // //------------------------------------------------------------------------- +#ifdef ACCESSIBILITY PRBool nsWindow::DispatchAccessibleEvent(PRUint32 aEventType, nsIAccessible** aAcc, nsPoint* aPoint) { PRBool result = PR_FALSE; @@ -4401,6 +4410,8 @@ PRBool nsWindow::DispatchAccessibleEvent(PRUint32 aEventType, nsIAccessible** aA return result; } +#endif + //------------------------------------------------------------------------- // // Deal with focus messages diff --git a/mozilla/widget/src/windows/nsWindow.h b/mozilla/widget/src/windows/nsWindow.h index a9cb657a770..b2ee98a3e3f 100644 --- a/mozilla/widget/src/windows/nsWindow.h +++ b/mozilla/widget/src/windows/nsWindow.h @@ -44,10 +44,12 @@ class nsNativeDragTarget; class nsIRollupListener; class nsIMenuBar; -struct IAccessible; +#ifdef ACCESSIBILITY +struct IAccessible; #include "nsIAccessible.h" #include "nsIAccessibleEventListener.h" +#endif #define NSRGB_2_COLOREF(color) \ RGB(NS_GET_R(color),NS_GET_G(color),NS_GET_B(color)) @@ -294,7 +296,9 @@ public: WNDPROC GetPrevWindowProc() { return mPrevWndProc; } virtual PRBool DispatchMouseEvent(PRUint32 aEventType, nsPoint* aPoint = nsnull); +#ifdef ACCESSIBILITY virtual PRBool DispatchAccessibleEvent(PRUint32 aEventType, nsIAccessible** aAccessible, nsPoint* aPoint = nsnull); +#endif virtual PRBool AutoErase(); nsPoint* GetLastPoint() { return &mLastPoint; } @@ -467,7 +471,9 @@ protected: static UINT uWM_MSIME_MOUSE; // mouse messge for MSIME static UINT uWM_ATOK_RECONVERT; // reconvert messge for ATOK +#ifdef ACCESSIBILITY IAccessible* mRootAccessible; +#endif }; //