use const for xpm icons

[wxWidgets.git] / src / gtk / utilsgtk.cpp

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/log.h"
 #endif
 

-#include "wx/sysopt.h"

 #include "wx/apptrait.h"
 #include "wx/process.h"
 #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 )
 {
 
 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 )
 }
 
 void wxDisplaySizeMM( int *width, int *height )