Removed no longer needed desktop size hack

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/sysopt.tex b/docs/latex/wx/sysopt.tex
index 965b5b2dd47e434b48a08a00e3339030b4287a5b..08eb57b3a8e439e7e48b29b50000a3852078b3dc 100644 (file)
--- a/docs/latex/wx/sysopt.tex
+++ b/docs/latex/wx/sysopt.tex
@@ -53,8 +53,6 @@ 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}

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 1e3df51b0292b3dd25b1c133ee239650b9cc0ab0..66bc5b31f1dbc758646f4afad5bdefd8bdc0bac1 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -18,7 +18,6 @@
     #include "wx/log.h"
 #endif
 
-#include "wx/sysopt.h"
 #include "wx/apptrait.h"
 #include "wx/process.h"
 #include "wx/sysopt.h"
@@ -143,11 +142,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 )