Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warning cleanups and Bug 12350

Browse Source
This commit is contained in:
pollmann%netscape.com 1999-08-27 03:59:49 +00:00
parent 355a920fb3
commit c0317528d3
2 changed files with 68 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
content/html/content/src/nsHTMLOptionElement.cpp
View File

@ -37,6 +37,7 @@
#include "nsIDOMHTMLCollection.h"
#include "nsIJSNativeInitializer.h"
#include "nsISelectElement.h"
#include "nsISelectControlFrame.h"
// Notify/query select frame for selected state
#include "nsIFormControlFrame.h"
@ -92,6 +93,7 @@ public:
NS_IMETHOD GetLabel(nsString& aLabel);
NS_IMETHOD SetLabel(const nsString& aLabel);
NS_IMETHOD GetSelected(PRBool* aSelected);
NS_IMETHOD SetSelected(PRBool aValue);
NS_IMETHOD GetValue(nsString& aValue);
NS_IMETHOD SetValue(const nsString& aValue);
@ -190,11 +192,11 @@ nsHTMLOptionElement::SetParent(nsIContent* aParent)
nsIDOMHTMLSelectElement* oldSelectElement = nsnull;
GetSelect(oldSelectElement);
if (nsnull != oldSelectElement) {
nsISelectElement* select;
nsISelectElement* sel;
if (NS_SUCCEEDED(oldSelectElement->QueryInterface(kISelectElementIID, (void**)&select))) {
select->RemoveOption(this);
NS_RELEASE(select);
if (NS_SUCCEEDED(oldSelectElement->QueryInterface(kISelectElementIID, (void**)&sel))) {
sel->RemoveOption(this);
NS_RELEASE(sel);
}
NS_RELEASE(oldSelectElement);
@ -207,11 +209,11 @@ nsHTMLOptionElement::SetParent(nsIContent* aParent)
nsIDOMHTMLSelectElement* newSelectElement = nsnull;
GetSelect(newSelectElement);
if (nsnull != newSelectElement) {
nsISelectElement* select;
nsISelectElement* sel;
if (NS_SUCCEEDED(newSelectElement->QueryInterface(kISelectElementIID, (void**)&select))) {
select->AddOption(this);
NS_RELEASE(select);
if (NS_SUCCEEDED(newSelectElement->QueryInterface(kISelectElementIID, (void**)&sel))) {
sel->AddOption(this);
NS_RELEASE(sel);
}
NS_RELEASE(newSelectElement);
@ -256,10 +258,10 @@ nsHTMLOptionElement::GetSelected(PRBool* aValue)
nsIFormControlFrame* formControlFrame = nsnull;
nsresult rv = GetPrimaryFrame(formControlFrame);
if (NS_SUCCEEDED(rv)) {
PRInt32 index;
if (NS_OK == GetIndex(&index)) {
PRInt32 indx;
if (NS_OK == GetIndex(&indx)) {
nsString value;
value.Append(index, 10); // Save the index in base 10
value.Append(indx, 10); // Save the index in base 10
formControlFrame->GetProperty(nsHTMLAtoms::selected, value);
if (value == "1")
*aValue = PR_TRUE;
@ -270,6 +272,25 @@ nsHTMLOptionElement::GetSelected(PRBool* aValue)
return rv;
}
NS_IMETHODIMP
nsHTMLOptionElement::SetSelected(PRBool aValue)
{
nsIFormControlFrame* fcFrame = nsnull;
nsresult result = GetPrimaryFrame(fcFrame);
if (NS_SUCCEEDED(result) && (nsnull != fcFrame)) {
nsISelectControlFrame* selectFrame = nsnull;
result = fcFrame->QueryInterface(nsISelectControlFrame::GetIID(),(void **) &selectFrame);
if (NS_SUCCEEDED(result) && (nsnull != selectFrame)) {
PRInt32 indx;
result == GetIndex(&indx);
if (NS_SUCCEEDED(result)) {
selectFrame->SetOptionSelected(indx, aValue);
}
}
}
return result;
}
//NS_IMPL_BOOL_ATTR(nsHTMLOptionElement, DefaultSelected, defaultselected)
//NS_IMPL_INT_ATTR(nsHTMLOptionElement, Index, index)
NS_IMPL_BOOL_ATTR(nsHTMLOptionElement, Disabled, disabled)
@ -289,6 +310,8 @@ NS_IMETHODIMP
nsHTMLOptionElement::SetDefaultSelected(PRBool aDefaultSelected)
{
nsHTMLValue empty(eHTMLUnit_Empty);
// When setting DefaultSelected, we must also reset Selected
SetSelected(aDefaultSelected);
if (aDefaultSelected) {
return mInner.SetHTMLAttribute(nsHTMLAtoms::selected, empty, PR_TRUE);
} else {

45
layout/html/content/src/nsHTMLOptionElement.cpp
View File

@ -37,6 +37,7 @@
#include "nsIDOMHTMLCollection.h"
#include "nsIJSNativeInitializer.h"
#include "nsISelectElement.h"
#include "nsISelectControlFrame.h"
// Notify/query select frame for selected state
#include "nsIFormControlFrame.h"
@ -92,6 +93,7 @@ public:
NS_IMETHOD GetLabel(nsString& aLabel);
NS_IMETHOD SetLabel(const nsString& aLabel);
NS_IMETHOD GetSelected(PRBool* aSelected);
NS_IMETHOD SetSelected(PRBool aValue);
NS_IMETHOD GetValue(nsString& aValue);
NS_IMETHOD SetValue(const nsString& aValue);
@ -190,11 +192,11 @@ nsHTMLOptionElement::SetParent(nsIContent* aParent)
nsIDOMHTMLSelectElement* oldSelectElement = nsnull;
GetSelect(oldSelectElement);
if (nsnull != oldSelectElement) {
nsISelectElement* select;
nsISelectElement* sel;
if (NS_SUCCEEDED(oldSelectElement->QueryInterface(kISelectElementIID, (void**)&select))) {
select->RemoveOption(this);
NS_RELEASE(select);
if (NS_SUCCEEDED(oldSelectElement->QueryInterface(kISelectElementIID, (void**)&sel))) {
sel->RemoveOption(this);
NS_RELEASE(sel);
}
NS_RELEASE(oldSelectElement);
@ -207,11 +209,11 @@ nsHTMLOptionElement::SetParent(nsIContent* aParent)
nsIDOMHTMLSelectElement* newSelectElement = nsnull;
GetSelect(newSelectElement);
if (nsnull != newSelectElement) {
nsISelectElement* select;
nsISelectElement* sel;
if (NS_SUCCEEDED(newSelectElement->QueryInterface(kISelectElementIID, (void**)&select))) {
select->AddOption(this);
NS_RELEASE(select);
if (NS_SUCCEEDED(newSelectElement->QueryInterface(kISelectElementIID, (void**)&sel))) {
sel->AddOption(this);
NS_RELEASE(sel);
}
NS_RELEASE(newSelectElement);
@ -256,10 +258,10 @@ nsHTMLOptionElement::GetSelected(PRBool* aValue)
nsIFormControlFrame* formControlFrame = nsnull;
nsresult rv = GetPrimaryFrame(formControlFrame);
if (NS_SUCCEEDED(rv)) {
PRInt32 index;
if (NS_OK == GetIndex(&index)) {
PRInt32 indx;
if (NS_OK == GetIndex(&indx)) {
nsString value;
value.Append(index, 10); // Save the index in base 10
value.Append(indx, 10); // Save the index in base 10
formControlFrame->GetProperty(nsHTMLAtoms::selected, value);
if (value == "1")
*aValue = PR_TRUE;
@ -270,6 +272,25 @@ nsHTMLOptionElement::GetSelected(PRBool* aValue)
return rv;
}
NS_IMETHODIMP
nsHTMLOptionElement::SetSelected(PRBool aValue)
{
nsIFormControlFrame* fcFrame = nsnull;
nsresult result = GetPrimaryFrame(fcFrame);
if (NS_SUCCEEDED(result) && (nsnull != fcFrame)) {
nsISelectControlFrame* selectFrame = nsnull;
result = fcFrame->QueryInterface(nsISelectControlFrame::GetIID(),(void **) &selectFrame);
if (NS_SUCCEEDED(result) && (nsnull != selectFrame)) {
PRInt32 indx;
result == GetIndex(&indx);
if (NS_SUCCEEDED(result)) {
selectFrame->SetOptionSelected(indx, aValue);
}
}
}
return result;
}
//NS_IMPL_BOOL_ATTR(nsHTMLOptionElement, DefaultSelected, defaultselected)
//NS_IMPL_INT_ATTR(nsHTMLOptionElement, Index, index)
NS_IMPL_BOOL_ATTR(nsHTMLOptionElement, Disabled, disabled)
@ -289,6 +310,8 @@ NS_IMETHODIMP
nsHTMLOptionElement::SetDefaultSelected(PRBool aDefaultSelected)
{
nsHTMLValue empty(eHTMLUnit_Empty);
// When setting DefaultSelected, we must also reset Selected
SetSelected(aDefaultSelected);
if (aDefaultSelected) {
return mInner.SetHTMLAttribute(nsHTMLAtoms::selected, empty, PR_TRUE);
} else {