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

Removed no longer needed desktop size hack

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-11-06 23:06:07 +00:00
parent c4ce3de05c
commit 51e2413b5a
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@@ -107,8 +107,6 @@ wxGTK:
a background colour bug in the gtk-qt theme under KDE. a background colour bug in the gtk-qt theme under KDE.
- wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) now returns the background - wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) now returns the background
colour of text controls. colour of text controls.
- Added gtk.desktopmargin.x/y system options to allow windows to fit the desktop
when Xinerama is not available.
wxMac: wxMac:

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

@@ -45,8 +45,6 @@ used if wider fonts selection is more important than higher quality.}
\twocolitem{{\bf Option}}{{\bf Value}} \twocolitem{{\bf Option}}{{\bf Value}}
\twocolitem{gtk.window.force-background-colour}{If 1, the backgrounds of windows with the wxBG\_STYLE\_COLOUR background style are cleared forcibly instead \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).} 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} \end{twocollist}
\wxheading{Mac} \wxheading{Mac}

7
src/gtk/utilsgtk.cpp
View File

@@ -139,11 +139,8 @@ void *wxGetDisplay()
void wxDisplaySize( int *width, int *height ) void wxDisplaySize( int *width, int *height )
{ {
int marginX = wxSystemOptions::GetOptionInt(wxT("gtk.desktopmargin.x")); if (width) *width = gdk_screen_width();
int marginY = wxSystemOptions::GetOptionInt(wxT("gtk.desktopmargin.y")); if (height) *height = gdk_screen_height();
if (width) *width = gdk_screen_width() - marginX;
if (height) *height = gdk_screen_height() - marginY;
} }
void wxDisplaySizeMM( int *width, int *height ) void wxDisplaySizeMM( int *width, int *height )