diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2002-05-08 12:46:44 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2002-05-08 12:46:44 +0000 |
| commit | 4d6e3e95deef34c2e67da252f12a42918f45a380 (patch) | |
| tree | 9cdf189493570d6bcca48e918975be75ab12868e | |
| parent | 3c2fc69ac57aa10adc526064a5b08d149a186b2f (diff) | |
#99157# workaround CDE (again)
| -rw-r--r-- | vcl/unx/source/app/wmadaptor.cxx | 13 | ||||
| -rw-r--r-- | vcl/unx/source/window/salframe.cxx | 5 |
2 files changed, 13 insertions, 5 deletions
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx index 805e2efc795c..1c6a22db15df 100644 --- a/vcl/unx/source/app/wmadaptor.cxx +++ b/vcl/unx/source/app/wmadaptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wmadaptor.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: hr $ $Date: 2002-02-21 14:56:14 $ + * last change: $Author: pl $ $Date: 2002-05-08 13:46:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -306,13 +306,19 @@ WMAdaptor::WMAdaptor( SalDisplay* pDisplay ) : #endif { m_aWMName = String(RTL_CONSTASCII_USTRINGPARAM("Dtwm")); + m_bTransientBehaviour = false; +#if 0 /* * Note: m_bTransientBehaviour was originally false in * in case of Dtwm. The transient behaviour can be restored * by settting the following X-resource in $HOME/.Xdefaults: * Dtwm*VCLSalFrame*secondariesOnTop: True */ - m_bTransientBehaviour = false; + /* + * Sad but true: there are Dtwm versions, where the resource + * database is set correctly but the transient behaviour is still + * rotten. So back to always false. + */ char* pDisplayResource = XResourceManagerString( m_pDisplay ); if( pDisplayResource ) { @@ -333,6 +339,7 @@ WMAdaptor::WMAdaptor( SalDisplay* pDisplay ) : #endif XrmDestroyDatabase( aDB ); } +#endif } XFree (pProperty); } diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index 01cff8cb4481..a51792dda998 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.130 $ + * $Revision: 1.131 $ * - * last change: $Author: pl $ $Date: 2002-05-08 12:41:38 $ + * last change: $Author: pl $ $Date: 2002-05-08 13:46:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3281,6 +3281,7 @@ long SalFrameData::Dispatch( XEvent *pEvent ) if( hPresentationWindow != None ) XSetInputFocus( GetXDisplay(), GetShellWindow(), RevertToParent, CurrentTime ); + RestackChildren(); } break; |