From ab84bafe492dd510a838682f301720c56722ece6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 3 Nov 2010 16:36:34 +0000 Subject: [PATCH] Add wxAuiPaneInfo::IsDockable(). This function checks if the pane can be docked at any side. It is useful in its own right but most importantly is needed to fix compilation broken in r66005 which used it before it was added. See #12648. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/framemanager.h | 5 +++++ interface/wx/aui/framemanager.h | 19 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index 94ff9568f0..ef5be06f56 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -239,6 +239,11 @@ public: bool IsBottomDockable() const { return HasFlag(optionBottomDockable); } bool IsLeftDockable() const { return HasFlag(optionLeftDockable); } bool IsRightDockable() const { return HasFlag(optionRightDockable); } + bool IsDockable() const + { + return HasFlag(optionTopDockable | optionBottomDockable | + optionLeftDockable | optionRightDockable); + } bool IsFloatable() const { return HasFlag(optionFloatable); } bool IsMovable() const { return HasFlag(optionMovable); } bool IsDestroyOnClose() const { return HasFlag(optionDestroyOnClose); } diff --git a/interface/wx/aui/framemanager.h b/interface/wx/aui/framemanager.h index f77a34f71c..36855b16a1 100644 --- a/interface/wx/aui/framemanager.h +++ b/interface/wx/aui/framemanager.h @@ -573,11 +573,22 @@ public: /** IsBottomDockable() returns @true if the pane can be docked at the bottom of the managed frame. + + @see IsDockable() */ bool IsBottomDockable() const; /** - IsDocked() returns @true if the pane is docked. + Returns @true if the pane can be docked at any side. + + @see IsTopDockable(), IsBottomDockable(), IsLeftDockable(), IsRightDockable() + + @since 2.9.2 + */ + bool IsDockable() const; + + /** + IsDocked() returns @true if the pane is currently docked. */ bool IsDocked() const; @@ -600,6 +611,8 @@ public: /** IsLeftDockable() returns @true if the pane can be docked on the left of the managed frame. + + @see IsDockable() */ bool IsLeftDockable() const; @@ -623,6 +636,8 @@ public: /** IsRightDockable() returns @true if the pane can be docked on the right of the managed frame. + + @see IsDockable() */ bool IsRightDockable() const; @@ -639,6 +654,8 @@ public: /** IsTopDockable() returns @true if the pane can be docked at the top of the managed frame. + + @see IsDockable() */ bool IsTopDockable() const; -- 2.45.2