diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-23 18:06:39 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-23 18:06:39 +0100 |
| commit | d67e92069b9fb109e33a5133326eef51bf99aeb8 (patch) | |
| tree | 8e403c695b28b8ba6adf2dc305a5c62388f7ae01 /vcl/inc/xconnection.hxx | |
| parent | 4617694b3fd830c8560f8d75d5f6afca618a8d65 (diff) | |
| parent | 78f80b020fe009bc48e9e5f8b7862de51f1f8381 (diff) | |
vcl2gnumake: rebase to DEV300m103
Diffstat (limited to 'vcl/inc/xconnection.hxx')
| -rw-r--r-- | vcl/inc/xconnection.hxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/vcl/inc/xconnection.hxx b/vcl/inc/xconnection.hxx index aa9d37430ea6..d43e02941cb3 100644 --- a/vcl/inc/xconnection.hxx +++ b/vcl/inc/xconnection.hxx @@ -28,11 +28,12 @@ #ifndef _VCL_XCONNECTION_HXX #define _VCL_XCONNECTION_HXX -#include <com/sun/star/awt/XDisplayConnection.hpp> -#include <cppuhelper/implbase1.hxx> #include <osl/mutex.hxx> +#include <rtl/ref.hxx> #include <com/sun/star/uno/Reference.hxx> +#include "vcl/displayconnectiondispatch.hxx" + #ifndef _STLP_LIST #include <list> #endif @@ -40,7 +41,7 @@ namespace vcl { class DisplayConnection : - public ::cppu::WeakImplHelper1< ::com::sun::star::awt::XDisplayConnection > + public DisplayConnectionDispatch { ::osl::Mutex m_aMutex; ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > > @@ -52,9 +53,11 @@ namespace vcl { DisplayConnection(); virtual ~DisplayConnection(); - static bool dispatchEvent( void* pThis, void* pData, int nBytes ); - static bool dispatchErrorEvent( void* pThis, void* pData, int nBytes ); - void dispatchDowningEvent(); + void start(); + void terminate(); + + virtual bool dispatchEvent( void* pData, int nBytes ); + virtual bool dispatchErrorEvent( void* pData, int nBytes ); // XDisplayConnection virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(); |