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

Modified GetText to take extra paramater to indicate whether it should return

Browse Source 
the current text value or the initial text value


git-svn-id: svn://10.0.0.236/trunk@18948 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kmcclusk%netscape.com 1999-01-28 21:58:01 +00:00
parent 66724a85ba
commit 733b961ac8
4 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/layout/forms/nsTextControlFrame.cpp
View File

@ -329,7 +329,7 @@ nsTextControlFrame::GetWidgetInitData(nsIPresContext& aPresContext)
}
NS_IMETHODIMP
nsTextControlFrame::GetText(nsString* aText)
nsTextControlFrame::GetText(nsString* aText, PRBool aInitialValue)
{
nsresult result = NS_CONTENT_ATTR_NOT_THERE;
PRInt32 type;
@ -338,14 +338,25 @@ nsTextControlFrame::GetText(nsString* aText)
nsIDOMHTMLInputElement* textElem = nsnull;
result = mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&textElem);
if ((NS_OK == result) && textElem) {
result = textElem->GetDefaultValue(*aText);
if (PR_TRUE == aInitialValue) {
result = textElem->GetDefaultValue(*aText);
}
else {
result = textElem->GetValue(*aText);
}
NS_RELEASE(textElem);
}
} else {
nsIDOMHTMLTextAreaElement* textArea = nsnull;
result = mContent->QueryInterface(kIDOMHTMLTextAreaElementIID, (void**)&textArea);
if ((NS_OK == result) && textArea) {
result = textArea->GetDefaultValue(*aText);
if (PR_TRUE == aInitialValue) {
result = textArea->GetDefaultValue(*aText);
}
else {
result = textArea->GetValue(*aText);
}
NS_RELEASE(textArea);
}
}
@ -364,7 +375,7 @@ nsTextControlFrame::AttributeChanged(nsIPresContext* aPresContext,
result = mWidget->QueryInterface(kITextWidgetIID, (void**)&text);
if ((nsHTMLAtoms::value == aAttribute) && (nsnull != text)) {
nsString value;
nsresult rv = GetText(&value);
nsresult rv = GetText(&value, PR_TRUE);
PRUint32 ignore;
text->SetText(value, ignore);
nsFormFrame::StyleChangeReflow(aPresContext, this);
@ -444,12 +455,12 @@ nsTextControlFrame::PostCreateWidget(nsIPresContext* aPresContext,
if (valueString && *valueString) {
value = nsAutoString(valueString);
} else {
GetText(&value);
GetText(&value, PR_TRUE);
}
}
#else
GetText(&value);
GetText(&value, PR_TRUE);
#endif
text->SetText(value, ignore);
@ -519,7 +530,7 @@ nsTextControlFrame::Reset()
nsITextAreaWidget* textArea = nsnull;
nsAutoString value;
nsresult valStatus = GetText(&value);
nsresult valStatus = GetText(&value, PR_TRUE);
PRUint32 size;
if (NS_OK == mWidget->QueryInterface(kITextWidgetIID,(void**)&text)) {
@ -614,7 +625,7 @@ nsTextControlFrame::PaintTextControl(nsIPresContext& aPresContext,
nscoord textHeight;
nsString text;
GetText(&text);
GetText(&text, PR_FALSE);
aRenderingContext.GetWidth(text, textWidth);
nsIFontMetrics* metrics;

2
mozilla/layout/forms/nsTextControlFrame.h
View File

@ -47,7 +47,7 @@ public:
virtual const nsIID& GetIID();
NS_IMETHOD GetText(nsString* aValue);
NS_IMETHOD GetText(nsString* aValue, PRBool aInitialValue);
virtual void EnterPressed(nsIPresContext& aPresContext) ;

27
mozilla/layout/html/forms/src/nsTextControlFrame.cpp
View File

@ -329,7 +329,7 @@ nsTextControlFrame::GetWidgetInitData(nsIPresContext& aPresContext)
}
NS_IMETHODIMP
nsTextControlFrame::GetText(nsString* aText)
nsTextControlFrame::GetText(nsString* aText, PRBool aInitialValue)
{
nsresult result = NS_CONTENT_ATTR_NOT_THERE;
PRInt32 type;
@ -338,14 +338,25 @@ nsTextControlFrame::GetText(nsString* aText)
nsIDOMHTMLInputElement* textElem = nsnull;
result = mContent->QueryInterface(kIDOMHTMLInputElementIID, (void**)&textElem);
if ((NS_OK == result) && textElem) {
result = textElem->GetDefaultValue(*aText);
if (PR_TRUE == aInitialValue) {
result = textElem->GetDefaultValue(*aText);
}
else {
result = textElem->GetValue(*aText);
}
NS_RELEASE(textElem);
}
} else {
nsIDOMHTMLTextAreaElement* textArea = nsnull;
result = mContent->QueryInterface(kIDOMHTMLTextAreaElementIID, (void**)&textArea);
if ((NS_OK == result) && textArea) {
result = textArea->GetDefaultValue(*aText);
if (PR_TRUE == aInitialValue) {
result = textArea->GetDefaultValue(*aText);
}
else {
result = textArea->GetValue(*aText);
}
NS_RELEASE(textArea);
}
}
@ -364,7 +375,7 @@ nsTextControlFrame::AttributeChanged(nsIPresContext* aPresContext,
result = mWidget->QueryInterface(kITextWidgetIID, (void**)&text);
if ((nsHTMLAtoms::value == aAttribute) && (nsnull != text)) {
nsString value;
nsresult rv = GetText(&value);
nsresult rv = GetText(&value, PR_TRUE);
PRUint32 ignore;
text->SetText(value, ignore);
nsFormFrame::StyleChangeReflow(aPresContext, this);
@ -444,12 +455,12 @@ nsTextControlFrame::PostCreateWidget(nsIPresContext* aPresContext,
if (valueString && *valueString) {
value = nsAutoString(valueString);
} else {
GetText(&value);
GetText(&value, PR_TRUE);
}
}
#else
GetText(&value);
GetText(&value, PR_TRUE);
#endif
text->SetText(value, ignore);
@ -519,7 +530,7 @@ nsTextControlFrame::Reset()
nsITextAreaWidget* textArea = nsnull;
nsAutoString value;
nsresult valStatus = GetText(&value);
nsresult valStatus = GetText(&value, PR_TRUE);
PRUint32 size;
if (NS_OK == mWidget->QueryInterface(kITextWidgetIID,(void**)&text)) {
@ -614,7 +625,7 @@ nsTextControlFrame::PaintTextControl(nsIPresContext& aPresContext,
nscoord textHeight;
nsString text;
GetText(&text);
GetText(&text, PR_FALSE);
aRenderingContext.GetWidth(text, textWidth);
nsIFontMetrics* metrics;

2
mozilla/layout/html/forms/src/nsTextControlFrame.h
View File

@ -47,7 +47,7 @@ public:
virtual const nsIID& GetIID();
NS_IMETHOD GetText(nsString* aValue);
NS_IMETHOD GetText(nsString* aValue, PRBool aInitialValue);
virtual void EnterPressed(nsIPresContext& aPresContext) ;