vcl/headless/svpframe.cxx | 4 ---- vcl/inc/headless/svpframe.hxx | 1 - vcl/inc/osx/salframe.h | 1 - vcl/inc/salframe.hxx | 2 +- vcl/inc/unx/gtk/gtkframe.hxx | 1 - vcl/inc/unx/salframe.h | 1 - vcl/inc/win/salframe.h | 1 - vcl/osx/salframe.cxx | 4 ---- vcl/unx/generic/window/salframe.cxx | 5 ----- vcl/unx/gtk/window/gtksalframe.cxx | 5 ----- vcl/win/source/window/salframe.cxx | 5 ----- 11 files changed, 1 insertion(+), 29 deletions(-)
New commits: commit 2c3844a17574590150dbfdeb8750397a85182e75 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Sat Sep 13 13:15:23 2014 +1000 vcl: SalFrame::Enable() is not used anywhere so removing Change-Id: I851c414aa9e95c4d2c3ddb44deb5835656d16f87 diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index d803f72..dad80d1 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -249,10 +249,6 @@ void SvpSalFrame::Show( bool bVisible, bool bNoActivate ) } } -void SvpSalFrame::Enable( bool ) -{ -} - void SvpSalFrame::SetMinClientSize( long nWidth, long nHeight ) { m_nMinWidth = nWidth; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 56f8c5f..8e0bbd4 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -90,7 +90,6 @@ public: virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE; virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE; - virtual void Enable( bool bEnable ) SAL_OVERRIDE; virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; virtual void SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE; diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index be06137..905b089 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -119,7 +119,6 @@ public: virtual void SetMenu( SalMenu* pSalMenu ) SAL_OVERRIDE; virtual void DrawMenuBar() SAL_OVERRIDE; virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE; - virtual void Enable( bool bEnable ) SAL_OVERRIDE; virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; virtual void SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE; diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index c527c12..1d9eed7 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -128,7 +128,7 @@ public: // Before the window is visible, a resize event // must be sent with the correct size virtual void Show( bool bVisible, bool bNoActivate = false ) = 0; - virtual void Enable( bool bEnable ) = 0; + // Set ClientSize and Center the Window to the desktop // and send/post a resize message virtual void SetMinClientSize( long nWidth, long nHeight ) = 0; diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index fe99834..d1bd4fb 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -367,7 +367,6 @@ public: // Before the window is visible, a resize event // must be sent with the correct size virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE; - virtual void Enable( bool bEnable ) SAL_OVERRIDE; // Set ClientSize and Center the Window to the desktop // and send/post a resize message virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 000ffba..bd37f91 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -225,7 +225,6 @@ public: virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) SAL_OVERRIDE; virtual void Show( bool bVisible, bool bNoActivate = false ) SAL_OVERRIDE; - virtual void Enable( bool bEnable ) SAL_OVERRIDE; virtual void SetMinClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; virtual void SetMaxClientSize( long nWidth, long nHeight ) SAL_OVERRIDE; virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) SAL_OVERRIDE; diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 7389f67..a94cca5 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -96,7 +96,6 @@ public: virtual void DrawMenuBar(); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); virtual void Show( bool bVisible, bool bNoActivate = FALSE ); - virtual void Enable( bool bEnable ); virtual void SetMinClientSize( long nWidth, long nHeight ); virtual void SetMaxClientSize( long nWidth, long nHeight ); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 96d20a9..662445c 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -457,10 +457,6 @@ void AquaSalFrame::Show(bool bVisible, bool bNoActivate) } } -void AquaSalFrame::Enable( bool ) -{ -} - void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight ) { // #i113170# may not be the main thread if called from UNO API diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index dcfae9d..ebce145 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -974,11 +974,6 @@ void X11SalFrame::updateGraphics( bool bClear ) pFreeGraphics_->SetDrawable( aDrawable, m_nXScreen ); } -void X11SalFrame::Enable( bool /*bEnable*/ ) -{ - // NYI: enable/disable frame -} - void X11SalFrame::SetIcon( sal_uInt16 nIcon ) { if ( ! IsChildWindow() ) diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index f8322e3..86dd03c 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1879,11 +1879,6 @@ void GtkSalFrame::Show( bool bVisible, bool bNoActivate ) } } -void GtkSalFrame::Enable( bool /*bEnable*/ ) -{ - // Not implemented by X11SalFrame either -} - void GtkSalFrame::setMinMaxSize() { /* #i34504# metacity (and possibly others) do not treat diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 3be752b..8c129eb 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -1217,11 +1217,6 @@ void WinSalFrame::Show( bool bVisible, bool bNoActivate ) ImplSalShow( mhWnd, bVisible, bNoActivate ); } -void WinSalFrame::Enable( bool bEnable ) -{ - EnableWindow( mhWnd, bEnable ); -} - void WinSalFrame::SetMinClientSize( long nWidth, long nHeight ) { mnMinWidth = nWidth; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits