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

ifdef'ing out some new functionality for radio buttons in standard mode

Browse Source 
a=leaf r=self


git-svn-id: svn://10.0.0.236/trunk@60250 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com
2000-02-09 20:19:19 +00:00
parent 2da230d083
commit 7487b46e5f
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/layout/html/forms/src/nsFormFrame.cpp
View File

@@ -389,6 +389,7 @@ void nsFormFrame::DoDefaultSelection(nsIPresContext* aPresContext,
nsRadioControlGroup * aGroup,
nsGfxRadioControlFrame * aRadioToIgnore)
{
#if 0
// If in standard mode, then a radio group MUST default
// to the first item in the group (it must be selected)
nsCompatibility mode;
@@ -397,15 +398,20 @@ void nsFormFrame::DoDefaultSelection(nsIPresContext* aPresContext,
// first find out if any have a default selection
PRInt32 i;
PRInt32 numItems = aGroup->GetNumRadios();
PRBool oneIsSelected = PR_FALSE;
for (i=0;i<numItems && !oneIsSelected;i++) {
PRBool changed = PR_FALSE;
PRBool oneIsDefSelected = PR_FALSE;
for (i=0;i<numItems && !oneIsDefSelected;i++) {
nsGfxRadioControlFrame * radioBtn = (nsGfxRadioControlFrame*) aGroup->GetRadioAt(i);
nsCOMPtr<nsIContent> content;
radioBtn->GetContent(getter_AddRefs(content));
if (content) {
nsCOMPtr<nsIDOMHTMLInputElement> input(do_QueryInterface(content));
if (input) {
input->GetDefaultChecked(&oneIsSelected);
input->GetDefaultChecked(&oneIsDefSelected);
PRBool currentValue = radioBtn->GetChecked(PR_FALSE);
if (currentValue != oneIsDefSelected) {
changed = PR_TRUE;
}
}
}
}
@@ -414,7 +420,7 @@ void nsFormFrame::DoDefaultSelection(nsIPresContext* aPresContext,
// select the firdst one in the group.
// if aRadioToIgnore is not null then it is being deleted
// so don't select that item, select the next one if there is one.
if (!oneIsSelected && numItems > 0) {
if (!changed && !oneIsDefSelected && numItems > 0) {
nsGfxRadioControlFrame * radioBtn = (nsGfxRadioControlFrame*) aGroup->GetRadioAt(0);
if (aRadioToIgnore != nsnull && aRadioToIgnore == radioBtn) {
if (numItems == 1) {
@@ -433,6 +439,7 @@ void nsFormFrame::DoDefaultSelection(nsIPresContext* aPresContext,
}
}
}
#endif
}