diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2012-11-28 07:49:30 -0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-28 12:51:08 +0000 |
commit | ee9a6d9e854db07462a372ed530da1572cb4e349 (patch) | |
tree | 149971e9b64e669915863db3da2262b54fdd37a5 /vcl | |
parent | 5d533bb75efde6dbe6f2d402d20cf5466135f1a4 (diff) |
Remove useless method SetBackgroundBitmap
Thomas Arnhold asked me to take a look at the method SetBackgroundBitmap.
In my XFCE, removing this method didn't chnage anything. So this needs more
tests in Windows and other WM's.
Change-Id: I3e10bea4eac114326ff981fb21ba0d292818b1da
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 5 | ||||
-rw-r--r-- | vcl/headless/svpframe.cxx | 4 | ||||
-rw-r--r-- | vcl/inc/aqua/salframe.h | 1 | ||||
-rw-r--r-- | vcl/inc/headless/svpframe.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/ios/salframe.h | 1 | ||||
-rw-r--r-- | vcl/inc/salframe.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salframe.h | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/window.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/win/salframe.h | 1 | ||||
-rw-r--r-- | vcl/ios/source/window/salframe.cxx | 5 | ||||
-rw-r--r-- | vcl/source/window/window2.cxx | 9 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 38 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 46 | ||||
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 6 |
15 files changed, 0 insertions, 129 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 614660d18566..d2e616c920da 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1595,11 +1595,6 @@ void AquaSalFrame::SetExtendedFrameStyle( SalExtStyle nStyle ) mnExtStyle = nStyle; } -void AquaSalFrame::SetBackgroundBitmap( SalBitmap* ) -{ - //TODO: implement -} - SalFrame* AquaSalFrame::GetParent() const { return mpParent; diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 4e2f698545f1..0d4e4660f197 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -454,10 +454,6 @@ bool SvpSalFrame::SetPluginParent( SystemParentData* ) return true; } -void SvpSalFrame::SetBackgroundBitmap( SalBitmap* ) -{ -} - void SvpSalFrame::ResetClipRegion() { } diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h index 8c6c6f761b77..e6dcde37cf75 100644 --- a/vcl/inc/aqua/salframe.h +++ b/vcl/inc/aqua/salframe.h @@ -145,7 +145,6 @@ public: virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetExtendedFrameStyle( SalExtStyle ); - virtual void SetBackgroundBitmap( SalBitmap* ); virtual void SetScreenNumber(unsigned int); virtual void SetApplicationID( const rtl::OUString &rApplicationID ); diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 3021e8e12112..c48d602176b5 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -112,7 +112,6 @@ public: virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); - virtual void SetBackgroundBitmap( SalBitmap* pBitmap ); virtual void ResetClipRegion(); virtual void BeginSetClipRegion( sal_uLong nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h index 701320b13732..b3d64389ca0b 100644 --- a/vcl/inc/ios/salframe.h +++ b/vcl/inc/ios/salframe.h @@ -141,7 +141,6 @@ public: virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); virtual void SetExtendedFrameStyle( SalExtStyle ); - virtual void SetBackgroundBitmap( SalBitmap* ); virtual void SetScreenNumber(unsigned int); virtual void SetApplicationID( const rtl::OUString &rApplicationID ); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index bf329bf7d7b8..63096e0e2a40 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -208,12 +208,6 @@ public: // returns system data (most prominent: window handle) virtual const SystemEnvData* GetSystemData() const = 0; - // sets a background bitmap on the frame; the implementation - // must not make assumptions about the lifetime of the passed SalBitmap - // but should copy its contents to an own buffer - virtual void SetBackgroundBitmap( SalBitmap* ) = 0; - - // get current modifier, button mask and mouse position struct SalPointerState { diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 6c20e9b7b924..a33a5584eb7a 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -420,8 +420,6 @@ public: // return false to indicate failure virtual bool SetPluginParent( SystemParentData* pNewParent ); - virtual void SetBackgroundBitmap( SalBitmap* ); - virtual void SetScreenNumber( unsigned int ); virtual void SetApplicationID( const rtl::OUString &rWMClass ); diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index b22f3ae5e38a..c6a8cc30d100 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -247,7 +247,6 @@ public: virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); - virtual void SetBackgroundBitmap( SalBitmap* pBitmap ); virtual void SetScreenNumber( unsigned int ); virtual void SetApplicationID( const rtl::OUString &rWMClass ); diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 9a96e7d09ad0..9ef1688893be 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -331,7 +331,6 @@ enum WindowSizeType const char* ImplDbgCheckWindow( const void* pObj ); #endif -class BitmapEx; // FIXME: really the SetBackgroundBitmap belongs in a toplevel 'window' class Dialog; class WindowImpl; class VclBuilder; @@ -926,8 +925,6 @@ public: // this may be a child's background color (e.g. ListBox) virtual const Wallpaper& GetDisplayBackground() const; - void SetBackgroundBitmap( const BitmapEx& rBitmapEx ); - void SetHelpText( const XubString& rHelpText ); const XubString& GetHelpText() const; diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 53e628f0fc44..4c0f63c885d2 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -127,7 +127,6 @@ public: virtual void SimulateKeyPress( sal_uInt16 nKeyCode ); virtual void SetParent( SalFrame* pNewParent ); virtual bool SetPluginParent( SystemParentData* pNewParent ); - virtual void SetBackgroundBitmap( SalBitmap* ); virtual void SetScreenNumber( unsigned int ); virtual void SetApplicationID( const rtl::OUString &rApplicationID ); virtual void ResetClipRegion(); diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx index 91b0909a9196..578c4cb403b4 100644 --- a/vcl/ios/source/window/salframe.cxx +++ b/vcl/ios/source/window/salframe.cxx @@ -928,11 +928,6 @@ void IosSalFrame::SetExtendedFrameStyle( SalExtStyle /*nStyle*/ ) // ??? } -void IosSalFrame::SetBackgroundBitmap( SalBitmap* ) -{ - //TODO: implement -} - SalFrame* IosSalFrame::GetParent() const { return mpParent; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 318534a5a2aa..647463c2e127 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1733,15 +1733,6 @@ void Window::SetOutputSizePixel( const Size& rNewSize ) rNewSize.Height()+mpWindowImpl->mnTopBorder+mpWindowImpl->mnBottomBorder ) ); } -void Window::SetBackgroundBitmap( const BitmapEx& rBitmapEx ) -{ - if( !rBitmapEx.IsEmpty() ) - { - SalBitmap* pBmp = rBitmapEx.ImplGetBitmapImpBitmap()->ImplGetSalBitmap(); - ImplGetFrame()->SetBackgroundBitmap( pBmp ); - } -} - //When a widget wants to renegotiate layout, get toplevel parent dialog and call //resize on it. Mark all intermediate containers (or container-alike) widgets //as dirty for the size remains unchanged, but layout changed circumstances diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index c68d2975c8c1..67ce56e08992 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -807,44 +807,6 @@ void X11SalFrame::SetExtendedFrameStyle( SalExtStyle nStyle ) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalFrame::SetBackgroundBitmap( SalBitmap* pBitmap ) -{ - if( mhBackgroundPixmap ) - { - XSetWindowBackgroundPixmap( GetXDisplay(), GetWindow(), None ); - XFreePixmap( GetXDisplay(), mhBackgroundPixmap ); - mhBackgroundPixmap = None; - } - if( pBitmap ) - { - X11SalBitmap* pBM = static_cast<X11SalBitmap*>(pBitmap); - Size aSize = pBM->GetSize(); - if( aSize.Width() && aSize.Height() ) - { - mhBackgroundPixmap = - limitXCreatePixmap( GetXDisplay(), - GetWindow(), - aSize.Width(), - aSize.Height(), - GetDisplay()->GetVisual( m_nXScreen ).GetDepth() ); - if( mhBackgroundPixmap ) - { - SalTwoRect aTwoRect; - aTwoRect.mnSrcX = aTwoRect.mnSrcY = aTwoRect.mnDestX = aTwoRect.mnDestY = 0; - aTwoRect.mnSrcWidth = aTwoRect.mnDestWidth = aSize.Width(); - aTwoRect.mnSrcHeight = aTwoRect.mnDestHeight = aSize.Height(); - pBM->ImplDraw( mhBackgroundPixmap, - m_nXScreen, - GetDisplay()->GetVisual( m_nXScreen ).GetDepth(), - aTwoRect, GetDisplay()->GetCopyGC( m_nXScreen ) ); - XSetWindowBackgroundPixmap( GetXDisplay(), GetWindow(), mhBackgroundPixmap ); - } - } - } -} - -// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= - const SystemChildData* X11SalFrame::GetSystemData() const { X11SalFrame *pFrame = const_cast<X11SalFrame*>(this); diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 8db1a1d035b4..6bba14123185 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -2932,52 +2932,6 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent ) } #endif -void GtkSalFrame::SetBackgroundBitmap( SalBitmap* pBitmap ) -{ -#if !GTK_CHECK_VERSION(3,0,0) - if( m_hBackgroundPixmap ) - { - XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(), - widget_get_xid(m_pWindow), - None ); - XFreePixmap( getDisplay()->GetDisplay(), m_hBackgroundPixmap ); - m_hBackgroundPixmap = None; - } - if( pBitmap ) - { - X11SalBitmap* pBM = static_cast<X11SalBitmap*>(pBitmap); - Size aSize = pBM->GetSize(); - if( aSize.Width() && aSize.Height() ) - { - m_hBackgroundPixmap = - limitXCreatePixmap( getDisplay()->GetDisplay(), - widget_get_xid(m_pWindow), - aSize.Width(), - aSize.Height(), - getDisplay()->GetVisual(m_nXScreen).GetDepth() ); - if( m_hBackgroundPixmap ) - { - SalTwoRect aTwoRect; - aTwoRect.mnSrcX = aTwoRect.mnSrcY = aTwoRect.mnDestX = aTwoRect.mnDestY = 0; - aTwoRect.mnSrcWidth = aTwoRect.mnDestWidth = aSize.Width(); - aTwoRect.mnSrcHeight = aTwoRect.mnDestHeight = aSize.Height(); - pBM->ImplDraw( m_hBackgroundPixmap, - m_nXScreen, - getDisplay()->GetVisual(m_nXScreen).GetDepth(), - aTwoRect, - getDisplay()->GetCopyGC(m_nXScreen) ); - XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(), - widget_get_xid(m_pWindow), - m_hBackgroundPixmap ); - } - } - } -#else - (void)pBitmap; -#warning FIXME: no SetBackgroundBitmap impl. for gtk3 -#endif -} - gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer frame ) { GtkSalFrame* pThis = (GtkSalFrame*)frame; diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index bffd400b1f7f..88ae0f15eda7 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -3005,12 +3005,6 @@ void WinSalFrame::SimulateKeyPress( sal_uInt16 nKeyCode ) // ----------------------------------------------------------------------- -void WinSalFrame::SetBackgroundBitmap( SalBitmap* ) -{ -} - -// ----------------------------------------------------------------------- - void WinSalFrame::ResetClipRegion() { SetWindowRgn( mhWnd, 0, TRUE ); |