From 1dc6ec2c656f91417b63e86579543afab723cb37 Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Thu, 23 Nov 2006 18:24:15 +0000 Subject: [PATCH] prep flags, code indentation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/framemanager.h | 15 +++++++++++---- src/aui/floatpane.cpp | 6 ++++-- src/aui/framemanager.cpp | 33 +++++++++++++++++++-------------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index c78416aa38..2e56f30851 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -376,10 +376,11 @@ public: optionGripperTop = 1 << 15, optionMaximized = 1 << 16, - buttonClose = 1 << 22, - buttonMaximize = 1 << 23, - buttonMinimize = 1 << 24, - buttonPin = 1 << 25, + buttonClose = 1 << 21, + buttonMaximize = 1 << 22, + buttonMinimize = 1 << 23, + buttonPin = 1 << 24, + buttonCustom1 = 1 << 26, buttonCustom2 = 1 << 27, buttonCustom3 = 1 << 28, @@ -621,6 +622,8 @@ protected: wxTimer m_hint_fadetimer; // transparent fade timer wxByte m_hint_fadeamt; // transparent fade amount wxByte m_hint_fademax; // maximum value of hint fade + + void* m_reserved; #ifndef SWIG DECLARE_EVENT_TABLE() @@ -700,6 +703,7 @@ public: resizable = true; fixed = false; toolbar = false; + reserved1 = false; } #ifndef SWIG @@ -715,6 +719,7 @@ public: toolbar = c.toolbar; panes = c.panes; rect = c.rect; + reserved1 = c.reserved1; } wxAuiDockInfo& operator=(const wxAuiDockInfo& c) @@ -729,6 +734,7 @@ public: toolbar = c.toolbar; panes = c.panes; rect = c.rect; + reserved1 = c.reserved1; return *this; } #endif // SWIG @@ -751,6 +757,7 @@ public: bool toolbar; // flag indicating dock contains only toolbars bool fixed; // flag indicating that the dock operates on // absolute coordinates as opposed to proportional + bool reserved1; }; diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp index 1ee980a298..952cbfd345 100644 --- a/src/aui/floatpane.cpp +++ b/src/aui/floatpane.cpp @@ -97,8 +97,10 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) // if the frame window's max size is greater than the min size // then set the max size to the min size as well wxSize cur_max_size = GetMaxSize(); - if (cur_max_size.x < pane.min_size.x || - cur_max_size.y < pane.min_size.y) + if (cur_max_size.IsFullySpecified() && + (cur_max_size.x < pane.min_size.x || + cur_max_size.y < pane.min_size.y) + ) { SetMaxSize(pane_min_size); } diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 69b108743d..2b6871ccb8 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -501,6 +501,7 @@ wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags) m_frame = NULL; m_dock_constraint_x = 0.3; m_dock_constraint_y = 0.3; + m_reserved = NULL; if (managed_wnd) { @@ -919,8 +920,8 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) } bool wxAuiManager::AddPane(wxWindow* window, - int direction, - const wxString& caption) + int direction, + const wxString& caption) { wxAuiPaneInfo pinfo; pinfo.Caption(caption); @@ -936,8 +937,8 @@ bool wxAuiManager::AddPane(wxWindow* window, } bool wxAuiManager::AddPane(wxWindow* window, - const wxAuiPaneInfo& pane_info, - const wxPoint& drop_pos) + const wxAuiPaneInfo& pane_info, + const wxPoint& drop_pos) { if (!AddPane(window, pane_info)) return false; @@ -1123,7 +1124,8 @@ void wxAuiManager::MaximizePane(wxAuiPaneInfo& pane_info) p.Restore(); // save hidden state - p.SetFlag(wxAuiPaneInfo::savedHiddenState, p.HasFlag(wxAuiPaneInfo::optionHidden)); + p.SetFlag(wxAuiPaneInfo::savedHiddenState, + p.HasFlag(wxAuiPaneInfo::optionHidden)); // hide the pane, because only the newly // maximized pane should show @@ -1153,7 +1155,8 @@ void wxAuiManager::RestorePane(wxAuiPaneInfo& pane_info) wxAuiPaneInfo& p = m_panes.Item(i); if (!p.IsToolbar()) { - p.SetFlag(wxAuiPaneInfo::optionHidden, p.HasFlag(wxAuiPaneInfo::savedHiddenState)); + p.SetFlag(wxAuiPaneInfo::optionHidden, + p.HasFlag(wxAuiPaneInfo::savedHiddenState)); } } @@ -1318,7 +1321,7 @@ wxString wxAuiManager::SavePerspective() { wxString result; result.Alloc(500); - result = wxT("layout1|"); + result = wxT("layout2|"); int pane_i, pane_count = m_panes.GetCount(); for (pane_i = 0; pane_i < pane_count; ++pane_i) @@ -1349,11 +1352,13 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) wxString part; // check layout string version + // 'layout1' = wxAUI 0.9.0 - wxAUI 0.9.2 + // 'layout2' = wxAUI 0.9.2 (wxWidgets 2.8) part = input.BeforeFirst(wxT('|')); input = input.AfterFirst(wxT('|')); part.Trim(true); part.Trim(false); - if (part != wxT("layout1")) + if (part != wxT("layout2")) return false; // mark all panes currently managed as docked and hidden @@ -1521,10 +1526,10 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, void wxAuiManager::LayoutAddPane(wxSizer* cont, - wxAuiDockInfo& dock, - wxAuiPaneInfo& pane, - wxAuiDockUIPartArray& uiparts, - bool spacer_only) + wxAuiDockInfo& dock, + wxAuiPaneInfo& pane, + wxAuiDockUIPartArray& uiparts, + bool spacer_only) { wxAuiDockUIPart part; wxSizerItem* sizer_item; @@ -1642,7 +1647,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, // determine if the pane should have a minimum size; if the pane is - // non-resizable (fixed) then we must set a minimum size. Alternitavely, + // non-resizable (fixed) then we must set a minimum size. Alternatively, // if the pane.min_size is set, we must use that value as well wxSize min_size = pane.min_size; @@ -2572,7 +2577,7 @@ int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test) // the target info. If the operation was allowed, the function returns true. bool wxAuiManager::ProcessDockResult(wxAuiPaneInfo& target, - const wxAuiPaneInfo& new_pos) + const wxAuiPaneInfo& new_pos) { bool allowed = false; switch (new_pos.dock_direction) -- 2.47.2