diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index 05edaecfb151..57b8fd39242e 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -251,7 +251,7 @@ nsresult NS_NewDeckFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager = nsnull); nsresult -NS_NewSpringFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); +NS_NewLeafBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); nsresult NS_NewStackFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager = nsnull); @@ -5256,7 +5256,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell, else if (aTag == nsXULAtoms::spring || aTag == nsHTMLAtoms::spacer) { isReplaced = PR_TRUE; - rv = NS_NewSpringFrame(aPresShell, &newFrame); + rv = NS_NewLeafBoxFrame(aPresShell, &newFrame); } else if (aTag == nsXULAtoms::treechildren) { isReplaced = PR_TRUE; diff --git a/layout/html/style/src/nsCSSFrameConstructor.cpp b/layout/html/style/src/nsCSSFrameConstructor.cpp index 05edaecfb151..57b8fd39242e 100644 --- a/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -251,7 +251,7 @@ nsresult NS_NewDeckFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager = nsnull); nsresult -NS_NewSpringFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); +NS_NewLeafBoxFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ); nsresult NS_NewStackFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame, nsIBoxLayout* aLayoutManager = nsnull); @@ -5256,7 +5256,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresShell* aPresShell, else if (aTag == nsXULAtoms::spring || aTag == nsHTMLAtoms::spacer) { isReplaced = PR_TRUE; - rv = NS_NewSpringFrame(aPresShell, &newFrame); + rv = NS_NewLeafBoxFrame(aPresShell, &newFrame); } else if (aTag == nsXULAtoms::treechildren) { isReplaced = PR_TRUE; diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 7fd780c15e59..02c120ed2ec8 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -104,7 +104,6 @@ CPPSRCS += \ nsDocElementBoxFrame.cpp \ nsLeafBoxFrame.cpp \ nsTextBoxFrame.cpp \ - nsSpringFrame.cpp \ nsGroupBoxFrame.cpp \ nsFrameNavigator.cpp \ nsSplitterFrame.cpp \ diff --git a/layout/xul/base/src/nsSpringFrame.cpp b/layout/xul/base/src/nsSpringFrame.cpp deleted file mode 100644 index 3b3422a3b77b..000000000000 --- a/layout/xul/base/src/nsSpringFrame.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -// -// Eric Vaughan -// Netscape Communications -// -// See documentation in associated header file -// - -#include "nsSpringFrame.h" - -nsresult -NS_NewSpringFrame ( nsIPresShell* aPresShell, nsIFrame** aNewFrame ) -{ - NS_PRECONDITION(aNewFrame, "null OUT ptr"); - if (nsnull == aNewFrame) { - return NS_ERROR_NULL_POINTER; - } - nsSpringFrame* it = new (aPresShell) nsSpringFrame (aPresShell); - if (nsnull == it) - return NS_ERROR_OUT_OF_MEMORY; - - *aNewFrame = it; - return NS_OK; - -} // NS_NewSpringFrame - -NS_IMETHODIMP nsSpringFrame::GetFrameForPoint(nsIPresContext* aPresContext, - const nsPoint& aPoint, - nsFramePaintLayer aWhichLayer, - nsIFrame** aFrame) -{ - - if ((aWhichLayer != NS_FRAME_PAINT_LAYER_FOREGROUND)) - return NS_ERROR_FAILURE; - - if (!mRect.Contains(aPoint)) - return NS_ERROR_FAILURE; - - /* - // see if it is in our border, padding, or inset - nsRect r(mRect); - nsMargin m; - GetInset(m); - r.Deflate(m); - GetBorderAndPadding(m); - r.Deflate(m); - if (!r.Contains(aPoint)) { - */ - *aFrame = this; - /* - return NS_OK; - } - */ - - return NS_OK; -} diff --git a/layout/xul/base/src/nsSpringFrame.h b/layout/xul/base/src/nsSpringFrame.h deleted file mode 100644 index 4884def61464..000000000000 --- a/layout/xul/base/src/nsSpringFrame.h +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either of the GNU General Public License Version 2 or later (the "GPL"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/** - - Eric D Vaughan - A frame that can have multiple children. Only one child may be displayed at one time. So the - can be flipped though like a deck of cards. - -**/ - -#ifndef nsSpringFrame_h___ -#define nsSpringFrame_h___ - -#include "nsLeafBoxFrame.h" -struct nsPoint; - -class nsSpringFrame : public nsLeafBoxFrame -{ -public: - - friend nsresult NS_NewSpringFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame); - - - NS_IMETHOD GetFrameForPoint(nsIPresContext* aPresContext, - const nsPoint& aPoint, - nsFramePaintLayer aWhichLayer, - nsIFrame** aFrame); - -#ifdef DEBUG - NS_IMETHOD GetFrameName(nsAString& aResult) const - { - return MakeFrameName(NS_LITERAL_STRING("Spring"), aResult); - } -#endif - - nsSpringFrame(nsIPresShell* aShell):nsLeafBoxFrame(aShell) {} -}; // class nsSpringFrame - - - -#endif -