diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 13:11:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-01-06 13:11:39 +0000 |
| commit | f99479bcfc2cf06bc0e3c9ec338717ef72dc868f (patch) | |
| tree | 81130290c42315c182f0732c9cb8ddd745450a86 /vcl/source/window/floatwin.cxx | |
| parent | 764cff5957426181a2be845c742ef0abe4594af4 (diff) | |
INTEGRATION: CWS vclcleanup02 (1.26.4); FILE MERGED
2003/12/17 16:53:10 mt 1.26.4.3: #i23061# Include svsys.h early to avoid compiler warnings
2003/12/17 16:05:37 mt 1.26.4.2: #i23061# header cleanup, remove #ifdef ???_CXX and #define ???_CXX, also removed .impl files and fixed soke windows compiler warnings
2003/12/10 15:59:38 mt 1.26.4.1: #i23061# VCL cleanup, removed headers, methods and types...
Diffstat (limited to 'vcl/source/window/floatwin.cxx')
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 1e7b05031607..d779ecd61e49 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: floatwin.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: rt $ $Date: 2003-12-01 13:38:22 $ + * last change: $Author: vg $ $Date: 2004-01-06 14:11:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,12 +59,9 @@ * ************************************************************************/ -#define _SV_FLOATWIN_CXX - -#ifndef _DEBUG_HXX -#include <tools/debug.hxx> +#ifndef _SV_SVSYS_HXX +#include <svsys.h> #endif - #ifndef _SV_SVDATA_HXX #include <svdata.hxx> #endif @@ -90,14 +87,14 @@ #include <window.h> #endif #ifndef _SV_RC_H -#include <rc.h> -#endif -#ifndef _SV_SVSYS_HXX -#include <svsys.h> +#include <tools/rc.h> #endif #ifndef _SV_SALFRAME_HXX #include <salframe.hxx> #endif +#ifndef _DEBUG_HXX +#include <tools/debug.hxx> +#endif // ======================================================================= @@ -108,9 +105,10 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) mbInCleanUp = FALSE; mbGrabFocus = FALSE; + DBG_ASSERT( pParent, "FloatWindow::FloatingWindow(): - pParent == NULL!" ); if ( !pParent ) - pParent = Application::GetAppWindow(); + pParent = ImplGetSVData()->maWinData.mpAppWin; DBG_ASSERT( pParent, "FloatWindow::FloatingWindow(): - pParent == NULL and no AppWindow exists" ); |