зеркало из https://github.com/mozilla/gecko-dev.git
Remove no longer needed event hack. Bug 146399, patch by Vidar Haarr
<vhaarr+bmo@gmail.com>, r=dbaron, sr=rbs
This commit is contained in:
Родитель
b5e539acee
Коммит
5c508f5e01
|
@ -1941,10 +1941,6 @@ nsComboboxControlFrame::HandleEvent(nsPresContext* aPresContext,
|
|||
nsEventStatus* aEventStatus)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aEventStatus);
|
||||
// temp fix until Bug 124990 gets fixed
|
||||
if (aPresContext->IsPaginated() && NS_IS_MOUSE_EVENT(aEvent)) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
if (nsEventStatus_eConsumeNoDefault == *aEventStatus) {
|
||||
return NS_OK;
|
||||
|
|
|
@ -370,10 +370,6 @@ nsGfxButtonControlFrame::HandleEvent(nsPresContext* aPresContext,
|
|||
nsGUIEvent* aEvent,
|
||||
nsEventStatus* aEventStatus)
|
||||
{
|
||||
// temp fix until Bug 124990 gets fixed
|
||||
if (aPresContext->IsPaginated() && NS_IS_MOUSE_EVENT(aEvent)) {
|
||||
return NS_OK;
|
||||
}
|
||||
// Override the HandleEvent to prevent the nsFrame::HandleEvent
|
||||
// from being called. The nsFrame::HandleEvent causes the button label
|
||||
// to be selected (Drawn with an XOR rectangle over the label)
|
||||
|
|
|
@ -1405,10 +1405,6 @@ nsListControlFrame::HandleEvent(nsPresContext* aPresContext,
|
|||
nsEventStatus* aEventStatus)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aEventStatus);
|
||||
// temp fix until Bug 124990 gets fixed
|
||||
if (aPresContext->IsPaginated() && NS_IS_MOUSE_EVENT(aEvent)) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/*const char * desc[] = {"NS_MOUSE_MOVE",
|
||||
"NS_MOUSE_LEFT_BUTTON_UP",
|
||||
|
|
|
@ -3312,9 +3312,8 @@ nsTextControlFrame::GetWidthInCharacters() const
|
|||
}
|
||||
}
|
||||
|
||||
// otherwise, see if CSS has a width specified. If so, work backwards to get the
|
||||
// number of characters this width represents.
|
||||
|
||||
// XXX: otherwise, see if CSS has a width specified. If so, work backwards
|
||||
// to get the number of characters this width represents.
|
||||
|
||||
// otherwise, the default is just returned.
|
||||
return DEFAULT_COLUMN_WIDTH;
|
||||
|
@ -3346,22 +3345,6 @@ nsTextControlFrame::SetValueChanged(PRBool aValueChanged)
|
|||
}
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsTextControlFrame::HandleEvent(nsPresContext* aPresContext,
|
||||
nsGUIEvent* aEvent,
|
||||
nsEventStatus* aEventStatus)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aEventStatus);
|
||||
|
||||
// temp fix until Bug 124990 gets fixed
|
||||
if (aPresContext->IsPaginated() && NS_IS_MOUSE_EVENT(aEvent)) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return nsStackFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
|
||||
|
||||
}
|
||||
|
||||
/* static */ void
|
||||
nsTextControlFrame::ShutDown()
|
||||
{
|
||||
|
|
|
@ -92,10 +92,6 @@ public:
|
|||
virtual nsIFrame* GetFrameForPoint(const nsPoint& aPoint,
|
||||
nsFramePaintLayer aWhichLayer);
|
||||
|
||||
NS_IMETHOD HandleEvent(nsPresContext* aPresContext,
|
||||
nsGUIEvent* aEvent,
|
||||
nsEventStatus* aEventStatus);
|
||||
|
||||
NS_IMETHOD GetPrefSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize);
|
||||
NS_IMETHOD GetMinSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize);
|
||||
NS_IMETHOD GetMaxSize(nsBoxLayoutState& aBoxLayoutState, nsSize& aSize);
|
||||
|
|
Загрузка…
Ссылка в новой задаче