From c89e16e423b150b99376691543e727e0f2d7bdbe Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Wed, 10 Oct 2007 10:27:03 +0000 Subject: [PATCH] added DockFixed() pane option; doc updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/auipaneinfo.tex | 9 ++++++++- include/wx/aui/framemanager.h | 2 ++ src/aui/framemanager.cpp | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/latex/wx/auipaneinfo.tex b/docs/latex/wx/auipaneinfo.tex index f1f80e2448..c7e68b7b5e 100644 --- a/docs/latex/wx/auipaneinfo.tex +++ b/docs/latex/wx/auipaneinfo.tex @@ -127,6 +127,13 @@ Direction() determines the direction of the docked pane. It is functionally the \func{wxAuiPaneInfo\&}{Dock}{\void} +Dock() indicates that a pane should be docked. It is the opposite of Float(). + +\membersection{wxAuiPaneInfo::DockFixed}\label{wxauipaneinfodockfixed} + +\func{wxAuiPaneInfo\&}{DockFixed}{\param{bool }{b = true}} + +DockFixed() causes the containing dock to have no resize sash. This is useful for creating panes that span the entire width or height of a dock, but should not be resizable in the other direction. \membersection{wxAuiPaneInfo::Dockable}\label{wxauipaneinfodockable} @@ -144,7 +151,7 @@ Fixed() forces a pane to be fixed size so that it cannot be resized. After calli \func{wxAuiPaneInfo\&}{Float}{\void} -Float() indicates that a pane should be floated. +Float() indicates that a pane should be floated. It is the opposite of Dock(). \membersection{wxAuiPaneInfo::Floatable}\label{wxauipaneinfofloatable} diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index 801c64f44f..56109d443f 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -298,6 +298,7 @@ public: wxAuiPaneInfo& RightDockable(bool b = true) { return SetFlag(optionRightDockable, b); } wxAuiPaneInfo& Floatable(bool b = true) { return SetFlag(optionFloatable, b); } wxAuiPaneInfo& Movable(bool b = true) { return SetFlag(optionMovable, b); } + wxAuiPaneInfo& DockFixed(bool b = true) { return SetFlag(optionDockFixed, b); } wxAuiPaneInfo& Dockable(bool b = true) { @@ -375,6 +376,7 @@ public: optionActive = 1 << 14, optionGripperTop = 1 << 15, optionMaximized = 1 << 16, + optionDockFixed = 1 << 17, buttonClose = 1 << 21, buttonMaximize = 1 << 22, diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index c40be51d17..518eab1b33 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -2089,6 +2089,8 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, dock.fixed = false; if (!pane.IsToolbar()) dock.toolbar = false; + if (pane.HasFlag(wxAuiPaneInfo::optionDockFixed)) + dock.fixed = true; if (pane.state & wxAuiPaneInfo::actionPane) action_pane_marked = true; } -- 2.45.2