diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-05-19 09:24:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-05-19 09:24:50 +0000 |
| commit | fcedd8955b7166b3868ed965b0bf8ec33b3e6b2e (patch) | |
| tree | b749f59972d15fd3cd68e6a577f55ce54c004488 | |
| parent | 57d4aca57cfb343276af5b689af77b42acb2bd58 (diff) | |
INTEGRATION: CWS sdk10 (1.163.38); FILE MERGED
2004/04/23 15:07:44 pl 1.163.38.5: corrected incomplete call of X11SalFrame::Init
2004/03/29 06:54:37 mi 1.163.38.4: RESYNC: (1.168-1.172); FILE MERGED
2004/02/03 11:51:27 mi 1.163.38.3: RESYNC: (1.163.76.1-1.168); FILE MERGED
2003/12/11 07:47:11 mi 1.163.38.2: RESYNC: (1.163-1.163.76.1); FILE MERGED
2003/12/10 14:09:21 mi 1.163.38.1: #i19974# OOoBean / SetPluginParent() can set null parent now
| -rw-r--r-- | vcl/unx/source/window/salframe.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 3e77c68540a8..239b528352d2 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.175 $ + * $Revision: 1.176 $ * - * last change: $Author: kz $ $Date: 2004-05-18 10:58:47 $ + * last change: $Author: kz $ $Date: 2004-05-19 10:24:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -671,7 +671,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, ULONG nSalFrameStyle, SystemParentD if( mpParent ) mpParent->maChildren.push_back( this ); - Init( nSalFrameStyle ); + Init( nSalFrameStyle, pSystemParent ); } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -2187,7 +2187,12 @@ bool X11SalFrame::SetPluginParent( SystemParentData* pNewParent ) passOnSaveYourSelf(); // now init with new parent again - Init( nStyle_ | SAL_FRAME_STYLE_CHILD, pNewParent ); + if ( pNewParent && pNewParent->aWindow == 0 ) + pNewParent = 0; + if ( pNewParent ) + Init( nStyle_ | SAL_FRAME_STYLE_CHILD, pNewParent ); + else + Init( nStyle_ & ~SAL_FRAME_STYLE_CHILD, pNewParent ); // update graphics if necessary if( pGraphics_ ) |