backing out evaughan's changes. tree closed.
git-svn-id: svn://10.0.0.236/trunk@25230 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -70,9 +70,10 @@ NS_NewProgressMeterFrame ( nsIFrame*& aNewFrame );
|
||||
nsresult
|
||||
NS_NewTitledButtonFrame ( nsIFrame*& aNewFrame );
|
||||
|
||||
nsresult
|
||||
NS_NewBoxFrame ( nsIFrame*& aNewFrame );
|
||||
|
||||
/*
|
||||
#include "nsProgressMeterFrame.h"
|
||||
#include "nsTitledButtonFrame.h"
|
||||
*/
|
||||
#endif
|
||||
|
||||
//static NS_DEFINE_IID(kIStyleRuleIID, NS_ISTYLE_RULE_IID);
|
||||
@@ -1297,7 +1298,6 @@ nsCSSFrameConstructor::TableIsValidCellContent(nsIPresContext* aPresContext,
|
||||
(nsXULAtoms::treeindentation == tag.get()) ||
|
||||
(nsXULAtoms::toolbox == tag.get()) ||
|
||||
(nsXULAtoms::toolbar == tag.get()) ||
|
||||
(nsXULAtoms::box == tag.get()) ||
|
||||
(nsXULAtoms::progressmeter == tag.get() )) {
|
||||
return PR_TRUE;
|
||||
}
|
||||
@@ -2246,14 +2246,6 @@ nsCSSFrameConstructor::ConstructXULFrame(nsIPresContext* aPresContext,
|
||||
}
|
||||
// End of PROGRESS METER CONSTRUCTION logic
|
||||
|
||||
// BOX CONSTRUCTION
|
||||
else if (aTag == nsXULAtoms::box) {
|
||||
processChildren = PR_TRUE;
|
||||
isReplaced = PR_TRUE;
|
||||
rv = NS_NewBoxFrame(newFrame);
|
||||
}
|
||||
// End of BOX CONSTRUCTION logic
|
||||
|
||||
// TITLED BUTTON CONSTRUCTION
|
||||
else if (aTag == nsXULAtoms::titledbutton) {
|
||||
processChildren = PR_TRUE;
|
||||
|
||||
Reference in New Issue
Block a user