[Libreoffice-commits] core.git: include/vcl vcl/inc

[Tor Lillqvist]

 include/vcl/layout.hxx |    6 ------
 vcl/inc/window.h       |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit cd4dd4f7c47694e9d7b8ae9cdfefeb3bee4145c9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Nov 14 12:24:07 2017 +0200

    Two more functions that are private to vcl and not even VCL_DLLPUBLIC
    
    ... and thus don't need to be declared in a public include file.
    
    Change-Id: Ia59040d3ef3ebf73b2372531bef086b0847911ce

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 7c89f568442b..d973704f8802 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -703,12 +703,6 @@ Size getLegacyBestSizeForChildren(const vcl::Window &rWindow);
 //Get first parent which is not a layout widget
 VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent);
 
-//return true if this window and its stack of containers are all shown
-bool isVisibleInLayout(const vcl::Window *pWindow);
-
-//return true if this window and its stack of containers are all enabled
-bool isEnabledInLayout(const vcl::Window *pWindow);
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 4ecc2940dc17..d9108e71cf1f 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -80,6 +80,12 @@ namespace dnd {
 
 VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize);
 
+//return true if this window and its stack of containers are all shown
+bool isVisibleInLayout(const vcl::Window *pWindow);
+
+//return true if this window and its stack of containers are all enabled
+bool isEnabledInLayout(const vcl::Window *pWindow);
+
 bool ImplWindowFrameProc( vcl::Window* pInst, SalEvent nEvent, const void* pEvent );
 
 struct ImplWinData