From 4cb288e084b9b1562cfb78ab430a8964e97f64d0 Mon Sep 17 00:00:00 2001 From: "jgaunt%netscape.com" Date: Tue, 10 Jul 2001 23:57:28 +0000 Subject: [PATCH] bug 88509 - moving of a GetFrameType and layoutAtom from ifdef bidi land. r=dbaron sr=sfraser --- content/shared/public/nsLayoutAtomList.h | 2 +- layout/base/nsLayoutAtomList.h | 2 +- layout/forms/nsListControlFrame.cpp | 2 -- layout/forms/nsListControlFrame.h | 2 -- layout/html/forms/src/nsListControlFrame.cpp | 2 -- layout/html/forms/src/nsListControlFrame.h | 2 -- 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/content/shared/public/nsLayoutAtomList.h b/content/shared/public/nsLayoutAtomList.h index 6a378ccce06a..0a00505d3b7c 100644 --- a/content/shared/public/nsLayoutAtomList.h +++ b/content/shared/public/nsLayoutAtomList.h @@ -94,6 +94,7 @@ LAYOUT_ATOM(imageFrame, "ImageFrame") LAYOUT_ATOM(inlineFrame, "InlineFrame") LAYOUT_ATOM(letterFrame, "LetterFrame") LAYOUT_ATOM(lineFrame, "LineFrame") +LAYOUT_ATOM(listControlFrame,"ListControlFrame") LAYOUT_ATOM(objectFrame, "ObjectFrame") LAYOUT_ATOM(pageFrame, "PageFrame") LAYOUT_ATOM(placeholderFrame, "PlaceholderFrame") @@ -185,7 +186,6 @@ LAYOUT_ATOM(mozdirty, "_moz_dirty") #ifdef IBMBIDI LAYOUT_ATOM(directionalFrame, "DirectionalFrame") -LAYOUT_ATOM(listControlFrame,"ListControlFrame") LAYOUT_ATOM(baseLevel, "BaseLevel") // PRUint8 LAYOUT_ATOM(embeddingLevel, "EmbeddingLevel") // PRUint8 LAYOUT_ATOM(endsInDiacritic, "EndsInDiacritic") // PRUint32 diff --git a/layout/base/nsLayoutAtomList.h b/layout/base/nsLayoutAtomList.h index 6a378ccce06a..0a00505d3b7c 100644 --- a/layout/base/nsLayoutAtomList.h +++ b/layout/base/nsLayoutAtomList.h @@ -94,6 +94,7 @@ LAYOUT_ATOM(imageFrame, "ImageFrame") LAYOUT_ATOM(inlineFrame, "InlineFrame") LAYOUT_ATOM(letterFrame, "LetterFrame") LAYOUT_ATOM(lineFrame, "LineFrame") +LAYOUT_ATOM(listControlFrame,"ListControlFrame") LAYOUT_ATOM(objectFrame, "ObjectFrame") LAYOUT_ATOM(pageFrame, "PageFrame") LAYOUT_ATOM(placeholderFrame, "PlaceholderFrame") @@ -185,7 +186,6 @@ LAYOUT_ATOM(mozdirty, "_moz_dirty") #ifdef IBMBIDI LAYOUT_ATOM(directionalFrame, "DirectionalFrame") -LAYOUT_ATOM(listControlFrame,"ListControlFrame") LAYOUT_ATOM(baseLevel, "BaseLevel") // PRUint8 LAYOUT_ATOM(embeddingLevel, "EmbeddingLevel") // PRUint8 LAYOUT_ATOM(endsInDiacritic, "EndsInDiacritic") // PRUint32 diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 43352e87cd6a..0ad62a03fb63 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -3202,7 +3202,6 @@ NS_IMETHODIMP nsListControlFrame::MoveTo(nsIPresContext* aPresContext, nscoord a } } -#ifdef IBMBIDI NS_IMETHODIMP nsListControlFrame::GetFrameType(nsIAtom** aType) const { @@ -3211,7 +3210,6 @@ nsListControlFrame::GetFrameType(nsIAtom** aType) const NS_ADDREF(*aType); return NS_OK; } -#endif // IBMBIDI //--------------------------------------------------------- NS_IMETHODIMP diff --git a/layout/forms/nsListControlFrame.h b/layout/forms/nsListControlFrame.h index ebe182a0733a..d3c858aaa069 100644 --- a/layout/forms/nsListControlFrame.h +++ b/layout/forms/nsListControlFrame.h @@ -199,14 +199,12 @@ public: const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); -#ifdef IBMBIDI /** * Get the "type" of the frame * * @see nsLayoutAtoms::scrollFrame */ NS_IMETHOD GetFrameType(nsIAtom** aType) const; -#endif // IBMBIDI // nsIFormControlFrame NS_IMETHOD GetType(PRInt32* aType) const; diff --git a/layout/html/forms/src/nsListControlFrame.cpp b/layout/html/forms/src/nsListControlFrame.cpp index 43352e87cd6a..0ad62a03fb63 100644 --- a/layout/html/forms/src/nsListControlFrame.cpp +++ b/layout/html/forms/src/nsListControlFrame.cpp @@ -3202,7 +3202,6 @@ NS_IMETHODIMP nsListControlFrame::MoveTo(nsIPresContext* aPresContext, nscoord a } } -#ifdef IBMBIDI NS_IMETHODIMP nsListControlFrame::GetFrameType(nsIAtom** aType) const { @@ -3211,7 +3210,6 @@ nsListControlFrame::GetFrameType(nsIAtom** aType) const NS_ADDREF(*aType); return NS_OK; } -#endif // IBMBIDI //--------------------------------------------------------- NS_IMETHODIMP diff --git a/layout/html/forms/src/nsListControlFrame.h b/layout/html/forms/src/nsListControlFrame.h index ebe182a0733a..d3c858aaa069 100644 --- a/layout/html/forms/src/nsListControlFrame.h +++ b/layout/html/forms/src/nsListControlFrame.h @@ -199,14 +199,12 @@ public: const nsRect& aDirtyRect, nsFramePaintLayer aWhichLayer); -#ifdef IBMBIDI /** * Get the "type" of the frame * * @see nsLayoutAtoms::scrollFrame */ NS_IMETHOD GetFrameType(nsIAtom** aType) const; -#endif // IBMBIDI // nsIFormControlFrame NS_IMETHOD GetType(PRInt32* aType) const;