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

diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h
index 94ff9568f011568b8dab56960e1314397a0176ec..ef5be06f56c6e455ccadebb836c126601b1770d2 100644 (file)
--- 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 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); }
     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 f77a34f71cdc9e897d282d2a322f64837ff22d20..36855b16a164475c384378851ec6357dc7256265 100644 (file)
--- 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.
     /**
         IsBottomDockable() returns @true if the pane can be docked at the bottom of the
         managed frame.

+
+        @see IsDockable()

     */
     bool IsBottomDockable() const;
 
     /**
     */
     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;
 
     */
     bool IsDocked() const;
 


@@ -600,6 +611,8 @@ public:
     /**
         IsLeftDockable() returns @true if the pane can be docked on the left of the
         managed frame.
     /**
         IsLeftDockable() returns @true if the pane can be docked on the left of the
         managed frame.

+
+        @see IsDockable()

     */
     bool IsLeftDockable() const;
 
     */
     bool IsLeftDockable() const;
 


@@ -623,6 +636,8 @@ public:
     /**
         IsRightDockable() returns @true if the pane can be docked on the right of the
         managed frame.
     /**
         IsRightDockable() returns @true if the pane can be docked on the right of the
         managed frame.

+
+        @see IsDockable()

     */
     bool IsRightDockable() const;
 
     */
     bool IsRightDockable() const;
 


@@ -639,6 +654,8 @@ public:
     /**
         IsTopDockable() returns @true if the pane can be docked at the top of the
         managed frame.
     /**
         IsTopDockable() returns @true if the pane can be docked at the top of the
         managed frame.

+
+        @see IsDockable()

     */
     bool IsTopDockable() const;
 
     */
     bool IsTopDockable() const;