diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-07-21 15:59:25 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-07-22 01:30:18 +0200 |
| commit | 1752ee0568510e86050494e2a3dbe504523cd705 (patch) | |
| tree | 7f873a5472ddfb38fe61476c31265d0230f10e2c /vcl/unx/generic/window | |
| parent | 576b3716a4c7a8ca8b46e2bfe5240c6fe9ad670b (diff) | |
Kill Dtwm/CDE
Diffstat (limited to 'vcl/unx/generic/window')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 2c1c94ae46c3..6b75da1df438 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -4123,10 +4123,6 @@ long X11SalFrame::HandleClientMessage( XClientMessageEvent *pEvent ) } else if( (Atom)pEvent->data.l[0] == rWMAdaptor.getAtom( WMAdaptor::WM_SAVE_YOURSELF ) ) { - bool bSession = rWMAdaptor.getWindowManagerName().EqualsAscii( "Dtwm" ); - - if( ! bSession ) - { if( this == s_pSaveYourselfFrame ) { rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding())); @@ -4141,14 +4137,6 @@ long X11SalFrame::HandleClientMessage( XClientMessageEvent *pEvent ) else // can only happen in race between WM and window closing XChangeProperty( GetXDisplay(), GetShellWindow(), rWMAdaptor.getAtom( WMAdaptor::WM_COMMAND ), XA_STRING, 8, PropModeReplace, (unsigned char*)"", 0 ); - } - else - { - // save open documents; would be good for non Dtwm, too, - // but there is no real Shutdown message in the ancient - // SM protocol; on Dtwm SaveYourself really means Shutdown, too. - IceSalSession::handleOldX11SaveYourself( this ); - } } } } @@ -4372,22 +4360,6 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) if( hPresentationWindow != None && GetShellWindow() == hPresentationWindow ) XSetInputFocus( GetXDisplay(), GetShellWindow(), RevertToParent, CurrentTime ); - /* For unknown reasons Dtwm does respect the input_hint - * set to False, but not when mapping the window. So - * emulate the correct behaviour and set the focus back - * to where it most probably should have been. - */ - if( (nStyle_ & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && - mpParent && - GetDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii( "Dtwm" ) - ) - { - XSetInputFocus( GetXDisplay(), - mpParent->GetShellWindow(), - RevertToParent, - CurrentTime ); - bSetFocus = false; - } if( bSetFocus ) { |