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

use ClientToWindowSize/WindowToClientSize

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-02-12 15:53:35 +00:00
parent 301d7a0da6
commit 77fe7204b5
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/sizer.cpp
View File

@@ -861,10 +861,7 @@ wxSize wxSizer::Fit( wxWindow *window )
sizeMax = wxDisplay(disp).GetClientArea().GetSize(); sizeMax = wxDisplay(disp).GetClientArea().GetSize();
// space for decorations and toolbars etc. // space for decorations and toolbars etc.
wxSize tlw_client_size = tlw->GetClientSize(); sizeMax = tlw->WindowToClientSize(sizeMax);
wxSize tlw_size = tlw->GetSize();
sizeMax.x -= tlw_size.x - tlw_client_size.x;
sizeMax.y -= tlw_size.y - tlw_client_size.y;
} }
else else
{ {
@@ -931,12 +928,7 @@ wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) const
wxSize wxSizer::GetMinWindowSize( wxWindow *window ) wxSize wxSizer::GetMinWindowSize( wxWindow *window )
{ {
wxSize minSize( GetMinSize() ); return window->ClientToWindowSize(GetMinSize());
wxSize size( window->GetSize() );
wxSize client_size( window->GetClientSize() );
return wxSize( minSize.x+size.x-client_size.x,
minSize.y+size.y-client_size.y );
} }
// TODO on mac we need a function that determines how much free space this // TODO on mac we need a function that determines how much free space this
@@ -944,18 +936,7 @@ wxSize wxSizer::GetMinWindowSize( wxWindow *window )
// space around the controls // space around the controls
wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const
{ {
wxSize maxSize( window->GetMaxSize() ); return window->WindowToClientSize(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) ) wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) )