commit 567dbbc5e952170f20673ca795a609220aee792f
author Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 14:12:19 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 14:13:19 2015 +0100
tree bd1552c78782c433a1c692b308a41d9c713c0fd6
parent ed48a8af3f84ff327a310124a348f6bbe5fa3519

Fix NotifyEvent and IntroWindow bits.

Change-Id: Id12dbb9219a9581dd52d1f820c47f3da47b62187

include/vcl/event.hxx

diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index da38cfa..d6829d5 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) )

vcl/inc/svdata.hxx

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index d881a8e..67906dd 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;

vcl/source/window/event.cxx

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 9a4f1c0..9c95412 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: */

vcl/source/window/introwin.cxx

diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index 3dae19c..d8b4001 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;