Renamed GetSize(PRInt32* aSize) to GetSizeFromContent to remove conflict with
nsFrame GetSize(nsSize& aSize). Added check for null mWidget in nsFormControlFrame::HandleEvent git-svn-id: svn://10.0.0.236/trunk@19590 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -246,7 +246,7 @@ nsTextControlFrame::GetDesiredSize(nsIPresContext* aPresContext,
|
||||
GetType(&type);
|
||||
if ((NS_FORM_INPUT_TEXT == type) || (NS_FORM_INPUT_PASSWORD == type)) {
|
||||
PRInt32 width;
|
||||
if (NS_CONTENT_ATTR_HAS_VALUE != GetSize(&width)) {
|
||||
if (NS_CONTENT_ATTR_HAS_VALUE != GetSizeFromContent(&width)) {
|
||||
width = 20;
|
||||
}
|
||||
//if (eCompatibility_NavQuirks == mode) {
|
||||
|
||||
Reference in New Issue
Block a user