Kaydet (Commit) 567dbbc5 authored tarafından Michael Meeks's avatar Michael Meeks

Fix NotifyEvent and IntroWindow bits.

Change-Id: Id12dbb9219a9581dd52d1f820c47f3da47b62187
üst ed48a8af
...@@ -436,23 +436,6 @@ public: ...@@ -436,23 +436,6 @@ public:
const CommandEvent* GetCommandEvent() const; 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 inline const KeyEvent* NotifyEvent::GetKeyEvent() const
{ {
if ( (mnEventType == MouseNotifyEvent::KEYINPUT) || (mnEventType == MouseNotifyEvent::KEYUP) ) if ( (mnEventType == MouseNotifyEvent::KEYINPUT) || (mnEventType == MouseNotifyEvent::KEYUP) )
......
...@@ -327,7 +327,7 @@ struct ImplSVData ...@@ -327,7 +327,7 @@ struct ImplSVData
ImplSVHelpData maHelpData; // indepen data for Help classes ImplSVHelpData maHelpData; // indepen data for Help classes
ImplSVNWFData maNWFData; ImplSVNWFData maNWFData;
UnoWrapperBase* mpUnoWrapper; UnoWrapperBase* mpUnoWrapper;
vcl::Window* mpIntroWindow; // the splash screen VclPtr<vcl::Window> mpIntroWindow; // the splash screen
DockingManager* mpDockingManager; DockingManager* mpDockingManager;
BlendFrameCache* mpBlendFrameCache; BlendFrameCache* mpBlendFrameCache;
bool mbIsTestTool; bool mbIsTestTool;
......
...@@ -586,10 +586,9 @@ NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow, ...@@ -586,10 +586,9 @@ NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow,
const void* pEvent, long nRet ) const void* pEvent, long nRet )
{ {
mpWindow = pWindow; mpWindow = pWindow;
mpData = (void*)pEvent; mpData = const_cast<void*>(pEvent);
mnEventType = nEventType; mnEventType = nEventType;
mnRetValue = nRet; mnRetValue = nRet;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -45,7 +45,6 @@ IntroWindow::~IntroWindow() ...@@ -45,7 +45,6 @@ IntroWindow::~IntroWindow()
void IntroWindow::dispose() void IntroWindow::dispose()
{ {
// FIXME: really we should have a dispose & a ref-ptr there [!] ...
ImplSVData* pSVData = ImplGetSVData(); ImplSVData* pSVData = ImplGetSVData();
if ( pSVData->mpIntroWindow.get() == this ) if ( pSVData->mpIntroWindow.get() == this )
pSVData->mpIntroWindow = nullptr; pSVData->mpIntroWindow = nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment