Moved desktop margin options to a more sensible place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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 )
|
||||
|
Reference in New Issue
Block a user