From 8e2398bf72507324718e99fb2066c068c7898bf8 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Thu, 21 Jul 2011 16:00:30 +0200
Subject: Remove supportsICCCMPos. Resize working with Sawfish anyway.

---
 vcl/inc/unx/wmadaptor.hxx           |  6 ------
 vcl/unx/generic/app/wmadaptor.cxx   | 21 ---------------------
 vcl/unx/generic/window/salframe.cxx | 12 +-----------
 3 files changed, 1 insertion(+), 38 deletions(-)

(limited to 'vcl')

diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index dc0fe65f290b..5848c6549c46 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -323,12 +323,6 @@ public:
     Atom getAtom( WMAtom eAtom ) const
     { return m_aWMAtoms[ eAtom ]; }
 
-    /*
-     * supports correct positioning
-     */
-
-    virtual bool supportsICCCMPos () const;
-
     int getPositionWinGravity () const
     { return m_nWinGravity; }
     int getInitWinGravity() const
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index e5da1fb9fbdb..dbffbcf991d7 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -73,7 +73,6 @@ public:
     virtual void maximizeFrame( X11SalFrame* pFrame, bool bHorizontal = true, bool bVertical = true ) const;
     virtual void shade( X11SalFrame* pFrame, bool bToShaded ) const;
     virtual void setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pTransientFrame = NULL ) const;
-    virtual bool supportsICCCMPos() const;
     virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const;
     virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent* pEvent ) const;
     virtual void showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const;
@@ -1772,26 +1771,6 @@ void GnomeWMAdaptor::maximizeFrame( X11SalFrame* pFrame, bool bHorizontal, bool
         WMAdaptor::maximizeFrame( pFrame, bHorizontal, bVertical );
 }
 
-/*
- *  WMAdaptor::supportsICCCMPos
- */
-
-bool WMAdaptor::supportsICCCMPos() const
-{
-    return
-        m_aWMName.EqualsAscii( "Sawfish" );
-}
-
-/*
- *  NetWMAdaptor::supportsICCCMPos
- */
-
-bool NetWMAdaptor::supportsICCCMPos() const
-{
-    return true;
-}
-
-
 /*
  *  WMAdaptor::enableAlwaysOnTop
  */
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 6b75da1df438..2f70d0cf5f26 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1752,17 +1752,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState )
                     aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() );
             }
 
-            // resize with new args
-            if (pWM->supportsICCCMPos())
-            {
-                if( mpParent )
-                    aPosSize.Move( -mpParent->maGeometry.nX,
-                -mpParent->maGeometry.nY );
-                SetPosSize( aPosSize );
-                bDefaultPosition_ = False;
-            }
-            else
-                SetPosSize( 0, 0, aPosSize.GetWidth(), aPosSize.GetHeight(), SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT );
+            SetPosSize( 0, 0, aPosSize.GetWidth(), aPosSize.GetHeight(), SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT );
         }
     }
 
-- 
cgit