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

The AttributeChanged(...) method of all form controls now call their base class AttributeChanged() method. Also implemented the disabled attribute in the base class...

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@18597 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rpotts%netscape.com
1999-01-26 07:57:54 +00:00
parent 92f7c1bbaa
commit 8f0d397a2d
7 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/layout/html/forms/src/nsButtonControlFrame.cpp
View File

@@ -191,8 +191,6 @@ nsButtonControlFrame::AttributeChanged(nsIPresContext* aPresContext,
PRInt32 aHint)
{
nsresult result = NS_OK;
PRInt32 type;
GetType(&type);
if (mWidget) {
if (nsHTMLAtoms::value == aAttribute) {
nsIButton* button = nsnull;
@@ -207,6 +205,11 @@ nsButtonControlFrame::AttributeChanged(nsIPresContext* aPresContext,
} else if (nsHTMLAtoms::size == aAttribute) {
nsFormFrame::StyleChangeReflow(aPresContext, this);
}
// Allow the base class to handle common attributes supported
// by all form elements...
else {
result = nsFormControlFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint);
}
}
return result;
}
@@ -338,9 +341,6 @@ nsButtonControlFrame::GetDesiredSize(nsIPresContext* aPresContext,
void
nsButtonControlFrame::PostCreateWidget(nsIPresContext* aPresContext, nscoord& aWidth, nscoord& aHeight)
{
PRInt32 type;
GetType(&type);
nsIButton* button = nsnull;
if (mWidget && (NS_OK == mWidget->QueryInterface(kIButtonIID,(void**)&button))) {
nsFont font(aPresContext->GetDefaultFixedFont());
@@ -348,20 +348,16 @@ nsButtonControlFrame::PostCreateWidget(nsIPresContext* aPresContext, nscoord& aW
mWidget->SetFont(font);
SetColors(*aPresContext);
nsString value;
nsAutoString value;
nsresult result = GetValue(&value);
if (button != nsnull) {
if (NS_CONTENT_ATTR_HAS_VALUE == result) {
button->SetLabel(value);
} else {
nsAutoString label;
GetDefaultLabel(label);
button->SetLabel(label);
}
}
mWidget->Enable(!nsFormFrame::GetDisabled(this));
if (NS_CONTENT_ATTR_HAS_VALUE != result) {
GetDefaultLabel(value);
}
button->SetLabel(value);
NS_RELEASE(button);
mWidget->Enable(!nsFormFrame::GetDisabled(this));
}
}