diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-06-20 09:38:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-06-20 09:38:21 +0000 |
| commit | cf0ef96e075b2ad6a654bd6e52f992e9423a2efd (patch) | |
| tree | a0ca4743d0b6a0064758bc949e9b39109556cadb /vcl/source/window/dialog.cxx | |
| parent | 683813c8d3fa2d1208d5eed889e82c4119561eeb (diff) | |
INTEGRATION: CWS jl61 (1.36.144); FILE MERGED
2007/05/11 07:21:37 ab 1.36.144.1: #i77021# Dialog::Draw(): Check WB_NOBORDER style
Diffstat (limited to 'vcl/source/window/dialog.cxx')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index b8203d734f72..bbb1ef4d9751 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dialog.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: vg $ $Date: 2006-11-22 10:40:03 $ + * last change: $Author: kz $ $Date: 2007-06-20 10:38:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -997,13 +997,16 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULO pDev->DrawRect( Rectangle( aPos, aSize ) ); - ImplBorderWindow aImplWin( this, WB_BORDER|WB_STDWORK, BORDERWINDOW_STYLE_OVERLAP ); - aImplWin.SetText( GetText() ); - aImplWin.SetPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height() ); - aImplWin.SetDisplayActive( TRUE ); - aImplWin.InitView(); + if (!( GetStyle() & WB_NOBORDER )) + { + ImplBorderWindow aImplWin( this, WB_BORDER|WB_STDWORK, BORDERWINDOW_STYLE_OVERLAP ); + aImplWin.SetText( GetText() ); + aImplWin.SetPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height() ); + aImplWin.SetDisplayActive( TRUE ); + aImplWin.InitView(); - aImplWin.Draw( Rectangle( aPos, aSize ), pDev, aPos ); + aImplWin.Draw( Rectangle( aPos, aSize ), pDev, aPos ); + } pDev->Pop(); } |