summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-26 14:46:49 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-26 14:47:34 +0000
commit53e693ccfb19aa653ab2b5762c10ae87c9320954 (patch)
treec0212fc5f375fbeb29d0938cca0c4f05f82bd459 /vcl/source/window
parent6fed035cf1eb62db8029e615e1b5f2d3ab825f78 (diff)
Resolves: tdf#97331 use VclPtr instead of pointers to avoid crash
Change-Id: Ia653a67046cb2cfb7c96367a7483ddc0cb29819e (cherry picked from commit 5d29ed1801a07d4649e095c25935b50f5ad32eb4)
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/winproc.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ef4cb769e18e..66e89448b798 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1343,7 +1343,7 @@ static bool ImplCallWheelCommand( vcl::Window* pWindow, const Point& rPos,
static bool acceptableWheelScrollTarget(const vcl::Window *pMouseWindow)
{
- return (pMouseWindow && pMouseWindow->IsInputEnabled() && !pMouseWindow->IsInModalMode());
+ return (pMouseWindow && !pMouseWindow->isDisposed() && pMouseWindow->IsInputEnabled() && !pMouseWindow->IsInModalMode());
}
//If the last event at the same absolute screen position was handled by a
@@ -1509,26 +1509,26 @@ public:
bool HandleWheelEvent::HandleEvent(const SalWheelMouseEvent& rEvt)
{
static SalWheelMouseEvent aPreviousEvent;
- static vcl::Window *pPreviousWindow;
+ static VclPtr<vcl::Window> xPreviousWindow;
if (!Setup())
return false;
- vcl::Window *pMouseWindow = FindTarget();
+ VclPtr<vcl::Window> xMouseWindow = FindTarget();
// avoid the problem that scrolling via wheel to this point brings a widget
// under the mouse that also accepts wheel commands, so stick with the old
// widget if the time gap is very small
- if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) && acceptableWheelScrollTarget(pPreviousWindow))
+ if (shouldReusePreviousMouseWindow(aPreviousEvent, rEvt) && acceptableWheelScrollTarget(xPreviousWindow))
{
- pMouseWindow = pPreviousWindow;
+ xMouseWindow = xPreviousWindow.get();
}
aPreviousEvent = rEvt;
- pPreviousWindow = Dispatch(pMouseWindow);
+ xPreviousWindow = Dispatch(xMouseWindow);
- return pPreviousWindow != nullptr;
+ return xPreviousWindow;
}
class HandleGestureEvent : public HandleGestureEventBase