Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed some members from wxAuiPaneInfo which should not be on the class interface

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-11-22 20:22:27 +00:00
parent 90b0f5fced
commit 8d0634abcf
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/aui/framemanager.h
View File

@@ -299,9 +299,6 @@ public:
wxAuiPaneInfo& Floatable(bool b = true) { return SetFlag(optionFloatable, b); } wxAuiPaneInfo& Floatable(bool b = true) { return SetFlag(optionFloatable, b); }
wxAuiPaneInfo& Movable(bool b = true) { return SetFlag(optionMovable, b); } wxAuiPaneInfo& Movable(bool b = true) { return SetFlag(optionMovable, b); }
wxAuiPaneInfo& SaveHidden() { return SetFlag(optionSavedHidden, HasFlag(optionHidden)); }
wxAuiPaneInfo& RestoreHidden() { return SetFlag(optionHidden, HasFlag(optionSavedHidden)); }
wxAuiPaneInfo& Dockable(bool b = true) wxAuiPaneInfo& Dockable(bool b = true)
{ {
return TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b); return TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b);
@@ -378,15 +375,16 @@ public:
optionActive = 1 << 14, optionActive = 1 << 14,
optionGripperTop = 1 << 15, optionGripperTop = 1 << 15,
optionMaximized = 1 << 16, optionMaximized = 1 << 16,
optionSavedHidden = 1 << 17,
buttonClose = 1 << 24, buttonClose = 1 << 22,
buttonMaximize = 1 << 25, buttonMaximize = 1 << 23,
buttonMinimize = 1 << 26, buttonMinimize = 1 << 24,
buttonPin = 1 << 27, buttonPin = 1 << 25,
buttonCustom1 = 1 << 28, buttonCustom1 = 1 << 26,
buttonCustom2 = 1 << 29, buttonCustom2 = 1 << 27,
buttonCustom3 = 1 << 30, buttonCustom3 = 1 << 28,
savedHiddenState = 1 << 30, // used internally
actionPane = 1 << 31 // used internally actionPane = 1 << 31 // used internally
}; };

15
src/aui/framemanager.cpp
View File

@@ -1121,7 +1121,12 @@ void wxAuiManager::MaximizePane(wxAuiPaneInfo& pane_info)
if (!p.IsToolbar()) if (!p.IsToolbar())
{ {
p.Restore(); p.Restore();
p.SaveHidden();
// save hidden state
p.SetFlag(wxAuiPaneInfo::savedHiddenState, p.HasFlag(wxAuiPaneInfo::optionHidden));
// hide the pane, because only the newly
// maximized pane should show
p.Hide(); p.Hide();
} }
} }
@@ -1148,7 +1153,7 @@ void wxAuiManager::RestorePane(wxAuiPaneInfo& pane_info)
wxAuiPaneInfo& p = m_panes.Item(i); wxAuiPaneInfo& p = m_panes.Item(i);
if (!p.IsToolbar()) if (!p.IsToolbar())
{ {
p.RestoreHidden(); p.SetFlag(wxAuiPaneInfo::optionHidden, p.HasFlag(wxAuiPaneInfo::savedHiddenState));
} }
} }
@@ -1842,9 +1847,9 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont,
} }
wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
wxAuiDockInfoArray& docks, wxAuiDockInfoArray& docks,
wxAuiDockUIPartArray& uiparts, wxAuiDockUIPartArray& uiparts,
bool spacer_only) bool spacer_only)
{ {
wxBoxSizer* container = new wxBoxSizer(wxVERTICAL); wxBoxSizer* container = new wxBoxSizer(wxVERTICAL);