Added sizer.desktopmargin.x, sizer.desktopmargin.y options to allow for desktop decorations in wxSizer::Fit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2007-11-06 09:42:28 +00:00
parent 595fda6f9c
commit 3ed6c6f4ac
2 changed files with 20 additions and 0 deletions

View File

@ -88,6 +88,15 @@ A reasonable default is used if not specified.}
\twocolitem{motif.largebuttons}{If 1, uses a bigger default size for wxButtons.}
\end{twocollist}
\wxheading{All}
\twocolwidtha{7cm}
\begin{twocollist}\itemsep=0pt
\twocolitem{{\bf Option}}{{\bf Value}}
\twocolitem{sizer.desktopmargin.x}{The horizontal margin to subtract from the desktop size when computing the maximum top-level window size in wxSizer::Fit.}
\twocolitem{sizer.desktopmargin.y}{The vertical margin to subtract from the desktop size when computing the maximum top-level window size in wxSizer::Fit.}
\end{twocollist}
The compile-time option to include or exclude this functionality
is wxUSE\_SYSTEM\_OPTIONS.

View File

@ -31,6 +31,10 @@
#include "wx/toplevel.h"
#endif // WX_PRECOMP
#if wxUSE_SYSTEM_OPTIONS
#include "wx/sysopt.h"
#endif
#include "wx/listimpl.cpp"
@ -792,6 +796,13 @@ wxSize wxSizer::Fit( wxWindow *window )
}
sizeMax = wxDisplay(disp).GetClientArea().GetSize();
#if wxUSE_SYSTEM_OPTIONS
int marginX = wxSystemOptions::GetOptionInt(wxT("sizer.desktopmargin.x"));
int marginY = wxSystemOptions::GetOptionInt(wxT("sizer.desktopmargin.y"));
sizeMax.x -= marginX;
sizeMax.y -= marginY;
#endif
}
}