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/trunk@49698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-11-06 23:05:38 +00:00
parent 676c8c1d39
commit ef26a5c409
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,8 +53,6 @@ setting it to $0$ makes it always unavailable.}
environment determination. Supported values are \texttt{GNOME} and \texttt{KDE}.} 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 \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}

8
src/gtk/utilsgtk.cpp
View File

@@ -18,7 +18,6 @@
#include "wx/log.h" #include "wx/log.h"
#endif #endif
#include "wx/sysopt.h"
#include "wx/apptrait.h" #include "wx/apptrait.h"
#include "wx/process.h" #include "wx/process.h"
#include "wx/sysopt.h" #include "wx/sysopt.h"
@@ -143,11 +142,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 )