diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-02-02 12:32:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-02-02 12:32:08 +0000 |
| commit | 0e946483c0e6d2d344dde8e3078b83c62ea376bd (patch) | |
| tree | 883d9a6580148d48f316cb809374795c0bb294d7 /toolkit | |
| parent | d328f7bedf4742890f7c482a504429e9c573f43a (diff) | |
INTEGRATION: CWS twobeta (1.50.30); FILE MERGED
2005/01/31 13:31:13 fs 1.50.30.1: #i41705# overload |draw| for dialogs: always do a simple Draw, to prevent the base class from calling PaintToDevice
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index c1a6e21807e8..deabaa19c565 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2,9 +2,9 @@ * * $RCSfile: vclxwindows.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: pjunck $ $Date: 2004-10-22 11:36:18 $ + * last change: $Author: rt $ $Date: 2005-02-02 13:32:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,6 +101,9 @@ #ifndef _TOOLKIT_AWT_VCLXACCESSIBLETOOLBOX_HXX_ #include <toolkit/awt/vclxaccessibletoolbox.hxx> #endif +#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ +#include <toolkit/helper/vclunohelper.hxx> +#endif #ifndef _TOOLKIT_HELPER_MACROS_HXX_ #include <toolkit/helper/macros.hxx> #endif @@ -2184,6 +2187,24 @@ void VCLXDialog::endExecute() throw(::com::sun::star::uno::RuntimeException) pDlg->EndDialog( 0 ); } +void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException) +{ + ::vos::OGuard aGuard( GetMutex() ); + Window* pWindow = GetWindow(); + + if ( pWindow ) + { + OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( GetViewGraphics() ); + if ( !pDev ) + pDev = pWindow->GetParent(); + + Size aSize = pDev->PixelToLogic( pWindow->GetSizePixel() ); + Point aPos = pDev->PixelToLogic( Point( nX, nY ) ); + + pWindow->Draw( pDev, aPos, aSize, WINDOW_DRAW_NOCONTROLS ); + } +} + ::com::sun::star::awt::DeviceInfo VCLXDialog::getInfo() throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo(); |