diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 14:12:19 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 14:13:19 +0100 |
| commit | 567dbbc5e952170f20673ca795a609220aee792f (patch) | |
| tree | bd1552c78782c433a1c692b308a41d9c713c0fd6 | |
| parent | ed48a8af3f84ff327a310124a348f6bbe5fa3519 (diff) | |
Fix NotifyEvent and IntroWindow bits.
Change-Id: Id12dbb9219a9581dd52d1f820c47f3da47b62187
| -rw-r--r-- | include/vcl/event.hxx | 17 | ||||
| -rw-r--r-- | vcl/inc/svdata.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/event.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/introwin.cxx | 1 |
4 files changed, 2 insertions, 21 deletions
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index da38cfa98373..d6829d5a76f1 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -436,23 +436,6 @@ public: const CommandEvent* GetCommandEvent() const; }; -inline NotifyEvent::NotifyEvent() -{ - mpWindow = NULL; - mpData = NULL; - mnEventType = MouseNotifyEvent::NONE; - mnRetValue = 0; -} - -inline NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow, - const void* pEvent, long nRet ) -{ - mpWindow = pWindow; - mpData = const_cast<void*>(pEvent); - mnEventType = nEventType; - mnRetValue = nRet; -} - inline const KeyEvent* NotifyEvent::GetKeyEvent() const { if ( (mnEventType == MouseNotifyEvent::KEYINPUT) || (mnEventType == MouseNotifyEvent::KEYUP) ) diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index d881a8e126a5..67906dd05361 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -327,7 +327,7 @@ struct ImplSVData ImplSVHelpData maHelpData; // indepen data for Help classes ImplSVNWFData maNWFData; UnoWrapperBase* mpUnoWrapper; - vcl::Window* mpIntroWindow; // the splash screen + VclPtr<vcl::Window> mpIntroWindow; // the splash screen DockingManager* mpDockingManager; BlendFrameCache* mpBlendFrameCache; bool mbIsTestTool; diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 9a4f1c069b9d..9c954125779d 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -586,10 +586,9 @@ NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow, const void* pEvent, long nRet ) { mpWindow = pWindow; - mpData = (void*)pEvent; + mpData = const_cast<void*>(pEvent); mnEventType = nEventType; mnRetValue = nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 3dae19c4ac93..d8b400135477 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -45,7 +45,6 @@ IntroWindow::~IntroWindow() void IntroWindow::dispose() { - // FIXME: really we should have a dispose & a ref-ptr there [!] ... ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->mpIntroWindow.get() == this ) pSVData->mpIntroWindow = nullptr; |