diff --git a/docs/changes.txt b/docs/changes.txt index 147a420e2f..6eaaa7086d 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -107,8 +107,6 @@ wxGTK: a background colour bug in the gtk-qt theme under KDE. - wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) now returns the background colour of text controls. -- Added gtk.desktopmargin.x/y system options to allow windows to fit the desktop - when Xinerama is not available. wxMac: diff --git a/docs/latex/wx/sysopt.tex b/docs/latex/wx/sysopt.tex index 1f8dd969c8..62e68454de 100644 --- a/docs/latex/wx/sysopt.tex +++ b/docs/latex/wx/sysopt.tex @@ -45,8 +45,6 @@ used if wider fonts selection is more important than higher quality.} \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 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} diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 9c4934db37..bb1c1b4195 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -139,11 +139,8 @@ void *wxGetDisplay() void wxDisplaySize( int *width, int *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; + if (width) *width = gdk_screen_width(); + if (height) *height = gdk_screen_height(); } void wxDisplaySizeMM( int *width, int *height )