AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved desktop margin options to a more sensible place

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2007-11-06 10:52:14 +00:00
parent 3ed6c6f4ac
commit 9e967d5417
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/latex/wx/sysopt.tex
View File

@ -53,6 +53,8 @@ setting it to $0$ makes it always unavailable.}
environment determination. Supported values are \texttt{GNOME} and \texttt{KDE}.}
\twocolitem{gtk.window.force-background-colour}{If 1, the backgrounds of windows with the wxBG\_STYLE\_COLOUR background style are cleared forcibly instead
of relying on the underlying GTK+ window colour. This works around a display problem when running applications under KDE with the gtk-qt theme installed (0.6 and below).}
\twocolitem{gtk.desktopmargin.x}{The horizontal margin to subtract from the desktop size when Xinerama is not available.}
\twocolitem{gtk.desktopmargin.y}{The vertical margin to subtract from the desktop size when Xinerama is not available.}
\end{twocollist}
\wxheading{Mac}
@ -88,15 +90,6 @@ 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.

11
src/common/sizer.cpp
View File

@ -31,10 +31,6 @@
#include "wx/toplevel.h"
#endif // WX_PRECOMP
#if wxUSE_SYSTEM_OPTIONS
#include "wx/sysopt.h"
#endif
#include "wx/listimpl.cpp"
@ -796,13 +792,6 @@ 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
}
}

10
src/gtk/utilsgtk.cpp
View File

@ -18,11 +18,10 @@
#include "wx/log.h"
#endif
#include "wx/sysopt.h"
#include "wx/apptrait.h"
#include "wx/process.h"
#include "wx/sysopt.h"
#include "wx/unix/execute.h"
#include "wx/gtk/private/timer.h"
@ -144,8 +143,11 @@ void *wxGetDisplay()
void wxDisplaySize( int *width, int *height )
{
if (width) *width = gdk_screen_width();
if (height) *height = gdk_screen_height();
int marginX = wxSystemOptions::GetOptionInt(wxT("gtk.desktopmargin.x"));
int marginY = wxSystemOptions::GetOptionInt(wxT("gtk.desktopmargin.y"));
if (width) *width = gdk_screen_width() - marginX;
if (height) *height = gdk_screen_height() - marginY;
}
void wxDisplaySizeMM( int *width, int *height )