diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-04 10:02:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-04 10:02:34 +0000 |
| commit | 2ffb4768d915ff44c0ed97fcd736239730e867f1 (patch) | |
| tree | 9de26e8edcdd74e7b7b36bb40ef03a16b35c4031 /vcl | |
| parent | b5204d0b2fa4d34f08625842aaa6f4d78bd6fed9 (diff) | |
INTEGRATION: CWS aquavcl06 (1.11.64); FILE MERGED
2008/04/01 18:33:26 pl 1.11.64.1: #i87705# work around missing layouting
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window3.cxx | 65 |
1 files changed, 37 insertions, 28 deletions
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx index 4af0643383ae..458382de476d 100644 --- a/vcl/source/window/window3.cxx +++ b/vcl/source/window/window3.cxx @@ -4,9 +4,9 @@ * * $RCSfile: window3.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 13:06:28 $ + * last change: $Author: kz $ $Date: 2008-04-04 11:02:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,32 +38,15 @@ #define _SV_WINDOW_CXX -#ifndef _SV_SVSYS_HXX -#include <svsys.h> -#endif - -#ifndef _SV_WINDOW_H -#include <vcl/window.h> -#endif -#ifndef _SV_WINDOW_HXX -#include <vcl/window.hxx> -#endif -#ifndef _SV_WAITOBJ_HXX -#include <vcl/waitobj.hxx> -#endif - -#ifndef _SV_SALGDI_HXX -#include <vcl/salgdi.hxx> -#endif -#ifndef _SV_NATIVEWIDGETS_HXX -#include <vcl/salnativewidgets.hxx> -#endif -#ifndef _SV_SALCTRLHANDLE_HXX -#include <vcl/salctrlhandle.hxx> -#endif -#ifndef _RTL_USTRING_HXX_ -#include <rtl/ustring.hxx> -#endif +#include "svsys.h" +#include "vcl/window.h" +#include "vcl/window.hxx" +#include "vcl/waitobj.hxx" +#include "vcl/salgdi.hxx" +#include "vcl/salnativewidgets.hxx" +#include "vcl/salctrlhandle.hxx" +#include "rtl/ustring.hxx" +#include "vcl/button.hxx" using namespace rtl; @@ -332,3 +315,29 @@ Size Window::GetOptimalSize(WindowSizeType eType) const return Size( LONG_MAX, LONG_MAX ); } } + +// ----------------------------------------------------------------------- + +void Window::ImplAdjustNWFSizes() +{ + switch( GetType() ) + { + case WINDOW_CHECKBOX: + ((CheckBox*)this)->ImplSetMinimumNWFSize(); + break; + case WINDOW_RADIOBUTTON: + ((RadioButton*)this)->ImplSetMinimumNWFSize(); + break; + default: + { + // iterate over children + Window* pWin = GetWindow( WINDOW_FIRSTCHILD ); + while( pWin ) + { + pWin->ImplAdjustNWFSizes(); + pWin = pWin->GetWindow( WINDOW_NEXT ); + } + } + break; + } +} |