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

Remove nsIStyleContext (bug 114713), r/sr=dbaron. Changed lots of methods to use nsStyleContext* or already_AddRefed<nsStyleContext> as return values, depending on whether a reference is returned. Turn on nsRefPtr (bug 104346), and change nsDerivedSafe to not declare AddRef and Release explicitly virtual, r=jag, sr=dbaron.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@138129 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%netscape.com
2003-02-22 00:32:13 +00:00
parent a1fd6aa5e3
commit c44337949a
311 changed files with 3728 additions and 4482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp
View File

@@ -82,7 +82,8 @@ nsGfxCheckboxControlFrame::nsGfxCheckboxControlFrame()
nsGfxCheckboxControlFrame::~nsGfxCheckboxControlFrame()
{
NS_IF_RELEASE(mCheckButtonFaceStyle);
if (mCheckButtonFaceStyle)
mCheckButtonFaceStyle->Release();
}
@@ -120,53 +121,43 @@ NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessib
//--------------------------------------------------------------
NS_IMETHODIMP
nsGfxCheckboxControlFrame::SetCheckboxFaceStyleContext(nsIStyleContext *aCheckboxFaceStyleContext)
nsGfxCheckboxControlFrame::SetCheckboxFaceStyleContext(nsStyleContext *aCheckboxFaceStyleContext)
{
mCheckButtonFaceStyle = aCheckboxFaceStyleContext;
NS_ADDREF(mCheckButtonFaceStyle);
mCheckButtonFaceStyle->AddRef();
return NS_OK;
}
//--------------------------------------------------------------
NS_IMETHODIMP
nsGfxCheckboxControlFrame::GetAdditionalStyleContext(PRInt32 aIndex,
nsIStyleContext** aStyleContext) const
nsStyleContext*
nsGfxCheckboxControlFrame::GetAdditionalStyleContext(PRInt32 aIndex) const
{
NS_PRECONDITION(nsnull != aStyleContext, "null OUT parameter pointer");
if (aIndex < 0) {
return NS_ERROR_INVALID_ARG;
}
*aStyleContext = nsnull;
switch (aIndex) {
case NS_GFX_CHECKBOX_CONTROL_FRAME_FACE_CONTEXT_INDEX:
*aStyleContext = mCheckButtonFaceStyle;
NS_IF_ADDREF(*aStyleContext);
return mCheckButtonFaceStyle;
break;
default:
return NS_ERROR_INVALID_ARG;
return nsnull;
}
return NS_OK;
}
//--------------------------------------------------------------
NS_IMETHODIMP
void
nsGfxCheckboxControlFrame::SetAdditionalStyleContext(PRInt32 aIndex,
nsIStyleContext* aStyleContext)
nsStyleContext* aStyleContext)
{
if (aIndex < 0) {
return NS_ERROR_INVALID_ARG;
}
switch (aIndex) {
case NS_GFX_CHECKBOX_CONTROL_FRAME_FACE_CONTEXT_INDEX:
NS_IF_RELEASE(mCheckButtonFaceStyle);
if (mCheckButtonFaceStyle)
mCheckButtonFaceStyle->Release();
mCheckButtonFaceStyle = aStyleContext;
NS_IF_ADDREF(aStyleContext);
if (aStyleContext)
aStyleContext->AddRef();
break;
}
return NS_OK;
}