diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 12:04:45 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 12:04:45 +0000 |
| commit | 9da73c7554506a6c5c0a7d11d270c4a850deb146 (patch) | |
| tree | 8da03906d8b71fc17398937af3607d2ce4a7723e /vcl/source | |
| parent | 4ba173a28086e6dd4c603e50e014ffcb055c20a0 (diff) | |
INTEGRATION: CWS awtfixes1 (1.42.10); FILE MERGED
2007/11/29 19:03:15 fridrich_strba 1.42.10.3: RESYNC: (1.44-1.46); FILE MERGED
2007/08/17 14:46:14 mmeeks 1.42.10.2: RESYNC: (1.42-1.44); FILE MERGED
2007/08/17 13:52:57 mmeeks 1.42.10.1: Issue number: i#80754#
Submitted by: mmeeks
Start of virtual method for sizing ...
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 43ce0011b417..e8488a6f6a82 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: combobox.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: hr $ $Date: 2007-11-02 12:51:43 $ + * last change: $Author: ihi $ $Date: 2008-01-14 13:04:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1095,6 +1095,18 @@ long ComboBox::CalcWindowSizePixel( USHORT nLines ) const // ----------------------------------------------------------------------- +Size ComboBox::GetOptimalSize(WindowSizeType eType) const +{ + switch (eType) { + case WINDOWSIZE_MINIMUM: + return CalcMinimumSize(); + default: + return Edit::GetOptimalSize( eType ); + } +} + +// ----------------------------------------------------------------------- + Size ComboBox::CalcMinimumSize() const { Size aSz; |