diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx | 36 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 3 |
3 files changed, 0 insertions, 49 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index a3494d17ef15..16397ffd447b 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -918,9 +918,6 @@ void SalDisplay::Init() if (VendorRelease ( GetDisplay() ) < 3600) nProperties_ |= PROPERTY_BUG_FillPolygon_Tile; } - - if( otherwm == eWindowManager_ ) - eWindowManager_ = olwm; } else if( GetServerVendor() == vendor_sco ) @@ -944,13 +941,6 @@ void SalDisplay::Init() nProperties_ |= PROPERTY_BUG_CopyArea_OnlySmallSlices; } - if( otherwm == eWindowManager_ ) - { - if( !XInternAtom( pDisp_, "_MOTIF_WM_INFO", True ) ) - eWindowManager_ = olwm; - // ??? - } - if( winmgr == eWindowManager_ ) { nProperties_ &= ~PROPERTY_SUPPORT_WM_SetPos; diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index dbffbcf991d7..b33349bfc595 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -268,42 +268,6 @@ WMAdaptor::WMAdaptor( SalDisplay* pDisplay ) : if( m_aWMName.Len() == 0 ) { - // check for window maker - needs different gravity - Atom aWMakerRunning = XInternAtom( m_pDisplay, "_WINDOWMAKER_WM_PROTOCOLS", True ); - if( aWMakerRunning != None && - XGetWindowProperty( m_pDisplay, - m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultScreenNumber() ), - aWMakerRunning, - 0, 32, - False, - XA_ATOM, - &aRealType, - &nFormat, - &nItems, - &nBytesLeft, - &pProperty ) == 0 ) - { - if( aRealType == XA_ATOM ) - m_aWMName = String( RTL_CONSTASCII_USTRINGPARAM("Windowmaker" ) ); - XFree( pProperty ); - m_nInitWinGravity = NorthWestGravity; - } - else if( pProperty ) - { - XFree( pProperty ); - pProperty = NULL; - } - } - if( m_aWMName.Len() == 0 ) - { - if( XInternAtom( m_pDisplay, "_OL_WIN_ATTR", True ) ) - { - m_aWMName = String( RTL_CONSTASCII_USTRINGPARAM( "Olwm" ) ); - m_nInitWinGravity = NorthWestGravity; - } - } - if( m_aWMName.Len() == 0 ) - { // check for ReflectionX wm (as it needs a workaround in Windows mode Atom aRwmRunning = XInternAtom( m_pDisplay, "RWM_RUNNING", True ); if( aRwmRunning != None && diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 2f70d0cf5f26..f925a6543259 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1016,9 +1016,6 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon ) // better icon size default value, in case our window manager // is olwm/olvwm. const String& rWM( pDisplay_->getWMAdaptor()->getWindowManagerName() ); - - if ( rWM.EqualsAscii( "Olwm" ) ) - iconSize = 48; } XFree( pIconSize ); |