vcl/headless/svpframe.cxx | 2 +- vcl/headless/svpinst.cxx | 2 +- vcl/inc/headless/svpframe.hxx | 2 +- vcl/inc/osx/salframe.h | 2 +- vcl/inc/salframe.hxx | 3 ++- vcl/inc/unx/gtk/gtkframe.hxx | 2 +- vcl/inc/unx/salframe.h | 2 +- vcl/osx/salframe.cxx | 2 +- vcl/unx/generic/window/salframe.cxx | 2 +- vcl/unx/gtk/window/gtksalframe.cxx | 2 +- vcl/win/source/window/salframe.cxx | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-)
New commits: commit 1b4994065ec50b2ef7a38f26b95b8543b4ff640d Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 28 20:43:31 2015 +0100 retain type for another level Change-Id: I4017e5404c99d37b36988f1d7a8ce17e42010070 Reviewed-on: https://gerrit.libreoffice.org/18913 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 459a710..f019ea5 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -191,7 +191,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/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 17d98b0..0b649ba 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -115,7 +115,7 @@ SvpSalInstance::~SvpSalInstance() osl_destroyMutex( m_aEventGuard ); } -void SvpSalInstance::PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent ) +void SvpSalInstance::PostEvent(const SalFrame* pFrame, void* pData, sal_uInt16 nEvent) { if( osl_acquireMutex( m_aEventGuard ) ) { diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 0598bf0..23edc62 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -81,7 +81,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; diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 69ff3a1..f426200 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 e75ed2d..26d275b 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -95,6 +95,7 @@ typedef sal_uInt64 SalExtStyle; #define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008) struct SystemParentData; +struct ImplSVEvent; /// A SalFrame is a system window (e.g. an X11 window). class VCL_PLUGIN_PUBLIC SalFrame @@ -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 411207b..dcf7f2f 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -374,7 +374,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 08be500..d062791 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 3882c40..560a584 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -273,7 +273,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 965d3b8..11ec3e4 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2423,7 +2423,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 21a1876..49eebbd 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1642,7 +1642,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 5cb863f..3a61bc2 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -1059,7 +1059,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 ); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits