summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-01-14 12:03:18 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-01-14 12:03:18 +0000
commitde22ad09db21fe1354070cea8f1cd015efa768e9 (patch)
tree923eac2cf58bfaebcbf9b507abcd31bc3c8e4ecf
parentd33e6518b51251ed0e200bca2156d68d6fa06a0f (diff)
INTEGRATION: CWS awtfixes1 (1.2.142); FILE MERGED
2007/10/31 18:02:00 mmeeks 1.2.142.2: Submitted by: jcn Reviewed by: mmeeks More sizing fixes for vcl. 2007/08/17 13:52:57 mmeeks 1.2.142.1: Issue number: i#80754# Submitted by: mmeeks Start of virtual method for sizing ...
-rw-r--r--vcl/inc/vcl/fixed.hxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index c6780147d47f..4a62d17ca769 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: fixed.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: vg $ $Date: 2007-04-11 17:53:32 $
+ * last change: $Author: ihi $ $Date: 2008-01-14 13:03:18 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -85,7 +85,9 @@ public:
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ static Size CalcMinimumTextSize( Control const* pControl, long nMaxWidth = 0 );
Size CalcMinimumSize( long nMaxWidth = 0 ) const;
+ virtual Size GetOptimalSize(WindowSizeType eType) const;
};
// -------------
@@ -113,6 +115,8 @@ public:
virtual void Resize();
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
+
+ virtual Size GetOptimalSize(WindowSizeType eType) const;
};
// ---------------