summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-28 20:43:31 +0100
committerJan Holesovsky <kendy@collabora.com>2016-05-16 14:57:01 +0200
commit449434d82dbdfa0922a1914fedbab72e7ba8a973 (patch)
treea5348da5cfde422f8fafcb94305245b41ea89320 /vcl
parent37d0fce16d44553ad0a2d82c701c10c5cabfd1d2 (diff)
retain type for another level
Change-Id: I4017e5404c99d37b36988f1d7a8ce17e42010070 Reviewed-on: https://gerrit.libreoffice.org/18913 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/headless/svpframe.cxx2
-rw-r--r--vcl/inc/headless/svpframe.hxx2
-rw-r--r--vcl/inc/osx/salframe.h2
-rw-r--r--vcl/inc/salframe.hxx3
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx2
-rw-r--r--vcl/inc/unx/salframe.h2
-rw-r--r--vcl/osx/salframe.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx2
-rw-r--r--vcl/win/source/window/salframe.cxx2
10 files changed, 11 insertions, 10 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index f982716c8a89..9730639e67f3 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -157,7 +157,7 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
delete pSvpGraphics;
}
-bool SvpSalFrame::PostEvent(void* pData)
+bool SvpSalFrame::PostEvent(ImplSVEvent* pData)
{
m_pInstance->PostEvent( this, pData, SALEVENT_USEREVENT );
return true;
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 9867860ebf20..9ad617a5d1ec 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -70,7 +70,7 @@ public:
virtual SalGraphics* AcquireGraphics() override;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) override;
- virtual bool PostEvent(void* pData) override;
+ virtual bool PostEvent(ImplSVEvent* pData) override;
virtual void SetTitle( const OUString& rTitle ) override;
virtual void SetIcon( sal_uInt16 nIcon ) override;
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 4ed18fa483c6..dcef842d157c 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -108,7 +108,7 @@ public:
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
- virtual bool PostEvent( void* pData ) SAL_OVERRIDE;
+ virtual bool PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
virtual void SetRepresentedURL( const OUString& ) SAL_OVERRIDE;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 7491e045035f..7491e100a723 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -96,6 +96,7 @@ typedef sal_uInt64 SalExtStyle;
#define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008)
struct SystemParentData;
+struct ImplSVEvent;
class VCL_PLUGIN_PUBLIC SalFrame
: public vcl::DeletionNotifier
@@ -126,7 +127,7 @@ public:
// Event must be destroyed, when Frame is destroyed
// When Event is called, SalInstance::Yield() must be returned
- virtual bool PostEvent( void* pData ) = 0;
+ virtual bool PostEvent(ImplSVEvent* pData) = 0;
virtual void SetTitle( const OUString& rTitle ) = 0;
virtual void SetIcon( sal_uInt16 nIcon ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 210808537528..81b5d277a314 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -372,7 +372,7 @@ public:
// Event must be destroyed, when Frame is destroyed
// When Event is called, SalInstance::Yield() must be returned
- virtual bool PostEvent( void* pData ) SAL_OVERRIDE;
+ virtual bool PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 706b198fc27c..f6abc4700979 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -215,7 +215,7 @@ public:
// call with false to setup graphics with window (GetWindow())
virtual void updateGraphics( bool bClear );
- virtual bool PostEvent( void* pData ) SAL_OVERRIDE;
+ virtual bool PostEvent(ImplSVEvent* pData) SAL_OVERRIDE;
virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE;
virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index bfe88f3b2f92..4acbed7c6d60 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -272,7 +272,7 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
mbGraphics = FALSE;
}
-bool AquaSalFrame::PostEvent( void *pData )
+bool AquaSalFrame::PostEvent(ImplSVEvent* pData)
{
GetSalData()->mpFirstInstance->PostUserEvent( this, SALEVENT_USEREVENT, pData );
return TRUE;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 0dfcd619d3bf..cbc9c639d55c 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2432,7 +2432,7 @@ X11SalFrame::HandleExtTextEvent (XClientMessageEvent *pEvent)
// PostEvent
-bool X11SalFrame::PostEvent( void *pData )
+bool X11SalFrame::PostEvent(ImplSVEvent* pData)
{
GetDisplay()->SendInternalEvent( this, pData );
return true;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 0034de61b3e6..b69eabc938b7 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1613,7 +1613,7 @@ void GtkSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
}
}
-bool GtkSalFrame::PostEvent( void* pData )
+bool GtkSalFrame::PostEvent(ImplSVEvent* pData)
{
getDisplay()->SendInternalEvent( this, pData );
return true;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 6f6793f9e574..2c7cf5562bb8 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1061,7 +1061,7 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
mbGraphics = FALSE;
}
-bool WinSalFrame::PostEvent( void* pData )
+bool WinSalFrame::PostEvent(ImplSVEvent* pData)
{
return (bool)PostMessageW( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData );
}