X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84f7908b99660dc0556d9352c62ad717e679dd4d..936b18ac298f757c460f070411a33445efe40eb2:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 410aac2bd8..678dd70433 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -2,7 +2,7 @@ // Name: sizer.cpp // Purpose: provide new wxSizer class for layout // Author: Robert Roebling and Robin Dunn -// Modified by: +// Modified by: Ron Lee // Created: // RCS-ID: $Id$ // Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling @@ -27,16 +27,16 @@ //--------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject); -IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject); -IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer); -IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer); -IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer); +IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject) +IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer) +IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer) +IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer) #if wxUSE_STATBOX -IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer); +IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer) #endif #if wxUSE_NOTEBOOK -IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer); +IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer) #endif //--------------------------------------------------------------------------- @@ -236,7 +236,7 @@ void wxSizerItem::DeleteWindows() { if (m_window) m_window->Destroy(); - + if (m_sizer) m_sizer->DeleteWindows(); } @@ -269,11 +269,13 @@ wxSizer::wxSizer() wxSizer::~wxSizer() { + Clear(); } void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData ) { m_children.Append( new wxSizerItem( window, option, flag, border, userData ) ); + window->SetContainingSizer(this); } void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) @@ -289,6 +291,7 @@ void wxSizer::Add( int width, int height, int option, int flag, int border, wxOb void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData ) { m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) ); + window->SetContainingSizer(this); } void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) @@ -304,6 +307,7 @@ void wxSizer::Prepend( int width, int height, int option, int flag, int border, void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData ) { m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) ); + window->SetContainingSizer(this); } void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData ) @@ -326,6 +330,7 @@ bool wxSizer::Remove( wxWindow *window ) wxSizerItem *item = (wxSizerItem*)node->Data(); if (item->GetWindow() == window) { + item->GetWindow()->SetContainingSizer(NULL); m_children.DeleteNode( node ); return TRUE; } @@ -366,9 +371,21 @@ bool wxSizer::Remove( int pos ) void wxSizer::Clear( bool delete_windows ) { + // First clear the ContainingSizer pointers + wxNode *node = m_children.First(); + while (node) + { + wxSizerItem *item = (wxSizerItem*)node->Data(); + if (item->IsWindow()) + item->GetWindow()->SetContainingSizer(NULL); + node = node->Next(); + } + + // Destroy the windows if needed if (delete_windows) DeleteWindows(); - + + // Now empty the list m_children.Clear(); } @@ -391,9 +408,21 @@ void wxSizer::Fit( wxWindow *window ) else size = GetMinWindowSize( window ); + //window->SetClientSize( size ); window->SetSize( size ); } +void wxSizer::FitInside( wxWindow *window ) +{ + wxSize size; + if (window->IsTopLevel()) + size = VirtualFitSize( window ); + else + size = GetMinClientSize( window ); + + window->SetVirtualSize( size ); +} + void wxSizer::Layout() { CalcMin(); @@ -402,29 +431,33 @@ void wxSizer::Layout() void wxSizer::SetSizeHints( wxWindow *window ) { - wxSize size = FitSize( window ); - window->SetSizeHints( size.x, size.y ); + // Preserve the window's max size hints, but set the + // lower bound according to the sizer calculations. + + Fit( window ); + wxSize size( window->GetSize() ); + window->SetSizeHints( size.x, + size.y, + window->GetMaxWidth(), + window->GetMaxHeight() ); } -wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) ) +void wxSizer::SetVirtualSizeHints( wxWindow *window ) { - wxRect rect = wxGetClientDisplayRect(); - wxSize sizeMax (rect.width,rect.height); + // Preserve the window's max size hints, but set the + // lower bound according to the sizer calculations. - // Sorry, but this bit is wrong -- it makes a window that should just be - // able to fit onto the screen, not fit on the screen. -- JACS -#if 0 - // Make the max size a bit smaller than the visible portion of - // the screen. A window which takes the entire screen doesn't - // look very nice either - sizeMax.x *= 9; - sizeMax.x /= 10; - - sizeMax.y *= 9; - sizeMax.y /= 10; -#endif + FitInside( window ); + wxSize size( window->GetVirtualSize() ); + window->SetVirtualSizeHints( size.x, + size.y, + window->GetMaxWidth(), + window->GetMaxHeight() ); +} - return sizeMax; +wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) +{ + return window->GetMaxSize(); } wxSize wxSizer::GetMinWindowSize( wxWindow *window ) @@ -442,9 +475,47 @@ wxSize wxSizer::FitSize( wxWindow *window ) wxSize size = GetMinWindowSize( window ); wxSize sizeMax = GetMaxWindowSize( window ); - if ( size.x > sizeMax.x ) + // Limit the size if sizeMax != wxDefaultSize + + if ( size.x > sizeMax.x && sizeMax.x != -1 ) size.x = sizeMax.x; - if ( size.y > sizeMax.y ) + if ( size.y > sizeMax.y && sizeMax.y != -1 ) + size.y = sizeMax.y; + + return size; +} + +wxSize wxSizer::GetMaxClientSize( wxWindow *window ) +{ + wxSize maxSize( window->GetMaxSize() ); + + if( maxSize != wxDefaultSize ) + { + wxSize size( window->GetSize() ); + wxSize client_size( window->GetClientSize() ); + + return wxSize( maxSize.x + client_size.x - size.x, + maxSize.y + client_size.y - size.y ); + } + else + return wxDefaultSize; +} + +wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) ) +{ + return GetMinSize(); // Already returns client size. +} + +wxSize wxSizer::VirtualFitSize( wxWindow *window ) +{ + wxSize size = GetMinClientSize( window ); + wxSize sizeMax = GetMaxClientSize( window ); + + // Limit the size if sizeMax != wxDefaultSize + + if ( size.x > sizeMax.x && sizeMax.x != -1 ) + size.x = sizeMax.x; + if ( size.y > sizeMax.y && sizeMax.y != -1 ) size.y = sizeMax.y; return size; @@ -1166,3 +1237,5 @@ wxSize wxNotebookSizer::CalcMin() } #endif // wxUSE_NOTEBOOK + +// vi:sts=4:sw=4:et