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:
@@ -556,8 +556,8 @@ nsFormControlFrame::GetMaxLength(PRInt32* aSize)
|
||||
return result;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsFormControlFrame::GetSize(PRInt32* aSize) const
|
||||
nsresult
|
||||
nsFormControlFrame::GetSizeFromContent(PRInt32* aSize) const
|
||||
{
|
||||
*aSize = -1;
|
||||
nsresult result = NS_CONTENT_ATTR_NOT_THERE;
|
||||
@@ -649,15 +649,17 @@ NS_METHOD nsFormControlFrame::HandleEvent(nsIPresContext& aPresContext,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// make sure that the widget in the event is this input
|
||||
// XXX if there is no view, it could be an image button. Unfortunately,
|
||||
// every image button will get every event.
|
||||
nsIView* view;
|
||||
GetView(view);
|
||||
if (view) {
|
||||
if (mWidget != aEvent->widget) {
|
||||
aEventStatus = nsEventStatus_eIgnore;
|
||||
return NS_OK;
|
||||
if (nsnull != mWidget) {
|
||||
// make sure that the widget in the event is this input
|
||||
// XXX if there is no view, it could be an image button. Unfortunately,
|
||||
// every image button will get every event.
|
||||
nsIView* view;
|
||||
GetView(view);
|
||||
if (view) {
|
||||
if (mWidget != aEvent->widget) {
|
||||
aEventStatus = nsEventStatus_eIgnore;
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user