diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-22 11:14:05 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-22 11:14:05 +0000 |
| commit | 2c5ca4892a93453c628576b0e2d4f992e5d58e9a (patch) | |
| tree | ae835f2fbd25b429596674e7edd6b9ffd1606c30 /vcl | |
| parent | 9ae30e638647de0da83dc25cba7d16e173d4a8b0 (diff) | |
INTEGRATION: CWS dba17 (1.14.104); FILE MERGED
2004/09/22 13:41:01 fs 1.14.104.3: #i28669# proper calculation of the size of the sub edit in Resize
2004/09/20 14:50:23 fs 1.14.104.2: RESYNC: (1.14-1.15); FILE MERGED
2004/09/08 13:19:14 fs 1.14.104.1: #i33728# (approved by ssa) ImplCallEventListeners
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/spinfld.cxx | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 8e58f0ba6b2e..14c3da7fcf66 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: spinfld.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2004-09-08 15:35:53 $ + * last change: $Author: pjunck $ $Date: 2004-10-22 12:14:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -431,32 +431,28 @@ SpinField::~SpinField() void SpinField::Up() { - ImplCallEventListeners( VCLEVENT_SPINFIELD_UP ); - maUpHdlLink.Call( this ); + ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_UP, maUpHdlLink, this ); } // -------------------------------------------------------------------- void SpinField::Down() { - ImplCallEventListeners( VCLEVENT_SPINFIELD_DOWN ); - maDownHdlLink.Call( this ); + ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_DOWN, maDownHdlLink, this ); } // -------------------------------------------------------------------- void SpinField::First() { - ImplCallEventListeners( VCLEVENT_SPINFIELD_FIRST ); - maFirstHdlLink.Call( this ); + ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_FIRST, maFirstHdlLink, this ); } // -------------------------------------------------------------------- void SpinField::Last() { - ImplCallEventListeners( VCLEVENT_SPINFIELD_LAST ); - maLastHdlLink.Call( this ); + ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_LAST, maLastHdlLink, this ); } // -------------------------------------------------------------------- @@ -802,7 +798,13 @@ void SpinField::Resize() if ( GetStyle() & (WB_SPIN|WB_DROPDOWN) ) { ImplCalcButtonAreas( this, aSize, maDropDownRect, maUpperRect, maLowerRect ); - aSize.Width() = maUpperRect.Left(); + if ( maUpperRect.IsEmpty() ) + { + DBG_ASSERT( !maDropDownRect.IsEmpty(), "SpinField::Resize: SPIN && DROPDOWN, but all empty rects?" ); + aSize.Width() = maDropDownRect.Left(); + } + else + aSize.Width() = maUpperRect.Left(); } mpEdit->SetSizePixel( aSize ); |