diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 14:15:39 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 14:15:39 +0000 |
| commit | 4d62334c4148e69e4f038f543509e32be31c1a25 (patch) | |
| tree | 4d2e113901a6e542edd1e89f55090f219e231f68 /vcl/source/window/window2.cxx | |
| parent | e5d4bf01ddc3e971d2a2bfe2bd140f087c7439e1 (diff) | |
INTEGRATION: CWS vcl83 (1.25.60); FILE MERGED
2007/10/09 14:36:00 pl 1.25.60.1: #i81504# do not misuse EnableInput for modality
Diffstat (limited to 'vcl/source/window/window2.cxx')
| -rw-r--r-- | vcl/source/window/window2.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index e40298be0787..9cd6d9c7c9cd 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: window2.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2007-07-24 10:23:17 $ + * last change: $Author: ihi $ $Date: 2007-11-26 15:15:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1248,13 +1248,13 @@ BOOL Window::HandleScrollCommand( const CommandEvent& rCmd, if ( pHScrl ) { if ( (pHScrl->GetVisibleSize() < pHScrl->GetRangeMax()) && - pHScrl->IsEnabled() && pHScrl->IsInputEnabled() ) + pHScrl->IsEnabled() && pHScrl->IsInputEnabled() && ! pHScrl->IsInModalMode() ) nFlags |= AUTOSCROLL_HORZ; } if ( pVScrl ) { if ( (pVScrl->GetVisibleSize() < pVScrl->GetRangeMax()) && - pVScrl->IsEnabled() && pVScrl->IsInputEnabled() ) + pVScrl->IsEnabled() && pVScrl->IsInputEnabled() && ! pVScrl->IsInModalMode() ) nFlags |= AUTOSCROLL_VERT; } @@ -1320,7 +1320,7 @@ BOOL Window::HandleScrollCommand( const CommandEvent& rCmd, void Window::ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ) { - if ( pHScrl && nX && pHScrl->IsEnabled() && pHScrl->IsInputEnabled() ) + if ( pHScrl && nX && pHScrl->IsEnabled() && pHScrl->IsInputEnabled() && ! pHScrl->IsInModalMode() ) { long nNewPos = pHScrl->GetThumbPos(); @@ -1343,7 +1343,7 @@ void Window::ImplHandleScroll( ScrollBar* pHScrl, long nX, pHScrl->DoScroll( nNewPos ); } - if ( pVScrl && nY && pVScrl->IsEnabled() && pVScrl->IsInputEnabled() ) + if ( pVScrl && nY && pVScrl->IsEnabled() && pVScrl->IsInputEnabled() && ! pVScrl->IsInModalMode() ) { long nNewPos = pVScrl->GetThumbPos(); |