diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:20:49 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:20:49 +0000 |
commit | edb3149f1f1170f3f3017e363846308ad753a22a (patch) | |
tree | 8bbe9007ab716eca0a5e53c0a34fb53c21739f95 /vcl/source | |
parent | 935c2b9f8030671ba8711b700517e3c98a70f31b (diff) |
INTEGRATION: CWS aquavcl04 (1.90.32); FILE MERGED
2007/12/07 16:14:24 hdu 1.90.32.2: #i80460# get rid of delay between invalidate and repaint for NWF on Aqua
2007/10/19 14:42:28 pl 1.90.32.1: #i79131# no more KEY_CONTROLMOD
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/control/edit.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index ec93a8844c62..6406f6972bc0 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -4,9 +4,9 @@ * * $RCSfile: edit.cxx,v $ * - * $Revision: 1.91 $ + * $Revision: 1.92 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 13:05:13 $ + * last change: $Author: ihi $ $Date: 2008-01-14 16:20:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -429,8 +429,7 @@ BOOL Edit::IsCharInput( const KeyEvent& rKeyEvent ) { // In the future we must use new Unicode functions for this xub_Unicode cCharCode = rKeyEvent.GetCharCode(); - return ((cCharCode >= 32) && (cCharCode != 127) && - !rKeyEvent.GetKeyCode().IsControlMod()); + return ((cCharCode >= 32) && (cCharCode != 127)); } // ----------------------------------------------------------------------- @@ -524,7 +523,12 @@ XubString Edit::ImplGetText() const void Edit::ImplInvalidateOrRepaint( xub_StrLen nStart, xub_StrLen nEnd ) { if( IsPaintTransparent() ) + { Invalidate(); + // FIXME: this is currently only on aqua + if( ImplGetSVData()->maNWFData.mbNoFocusRects ) + Update(); + } else ImplRepaint( nStart, nEnd ); } |