Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed GetStyleData to use an enum instead of an nsID

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2090 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterl
1998-05-21 02:34:13 +00:00
parent 835d063055
commit 25861753fc
57 changed files with 392 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/layout/html/forms/src/nsInputFrame.cpp
View File

@@ -47,9 +47,6 @@
#include "nsStyleConsts.h"
#include "nsUnitConversion.h"
#include "nsCSSLayout.h"
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID);
static NS_DEFINE_IID(kStyleSpacingSID, NS_STYLESPACING_SID);
struct nsInputCallbackData
{
@@ -439,7 +436,7 @@ nsInputFrame::GetTextSize(nsIPresContext& aPresContext, nsIFrame* aFrame,
//printf("\n GetTextSize %s", aString.ToNewCString());
nsIStyleContext* styleContext;
aFrame->GetStyleContext(&aPresContext, styleContext);
nsStyleFont* styleFont = (nsStyleFont*)styleContext->GetData(kStyleFontSID);
nsStyleFont* styleFont = (nsStyleFont*)styleContext->GetData(eStyleStruct_Font);
NS_RELEASE(styleContext);
nsIDeviceContext* deviceContext = aPresContext.GetDeviceContext();
nsIFontCache* fontCache = deviceContext->GetFontCache();
@@ -591,7 +588,7 @@ nsInputFrame::CalculateSize (nsIPresContext* aPresContext, nsInputFrame* aFrame,
nsFont&
nsInputFrame::GetFont(nsIPresContext* aPresContext)
{
nsStyleFont* styleFont = (nsStyleFont*)mStyleContext->GetData(kStyleFontSID);
nsStyleFont* styleFont = (nsStyleFont*)mStyleContext->GetData(eStyleStruct_Font);
return styleFont->mFont;
}