X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e967d5417d49764276cf121a32c35d5770b1332..4af4b5253176b7a14d961cf6ee8872a7694475bd:/src/gtk/utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 1abdee7f37..dde2a7bff9 100644
--- 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"
@@ -97,41 +96,6 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 }
 #endif
 
-// Escapes string so that it is valid Pango markup XML string:
-wxString wxEscapeStringForPangoMarkup(const wxString& str)
-{
-    size_t len = str.length();
-    wxString out;
-    out.Alloc(len);
-    for (size_t i = 0; i < len; i++)
-    {
-        wxChar c = str[i];
-        switch (c)
-        {
-            case _T('&'):
-                out << _T("&amp;");
-                break;
-            case _T('<'):
-                out << _T("&lt;");
-                break;
-            case _T('>'):
-                out << _T("&gt;");
-                break;
-            case _T('\''):
-                out << _T("&apos;");
-                break;
-            case _T('"'):
-                out << _T("&quot;");
-                break;
-            default:
-                out << c;
-                break;
-        }
-    }
-    return out;
-}
-
-
 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------
@@ -143,11 +107,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 )
@@ -156,17 +117,6 @@ void wxDisplaySizeMM( int *width, int *height )
     if (height) *height = gdk_screen_height_mm();
 }
 
-void wxClientDisplayRect(int *x, int *y, int *width, int *height)
-{
-    // This is supposed to return desktop dimensions minus any window
-    // manager panels, menus, taskbars, etc.  If there is a way to do that
-    // for this platform please fix this function, otherwise it defaults
-    // to the entire desktop.
-    if (x) *x = 0;
-    if (y) *y = 0;
-    wxDisplaySize(width, height);
-}
-
 void wxGetMousePosition( int* x, int* y )
 {
     gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
@@ -230,10 +180,10 @@ wxConvertFromGTK(const wxString& s, wxFontEncoding enc)
 
 #endif // !wxUSE_UNICODE
 
-// Returns false if version is certainly greater or equal than major.minor.micro
-// Returns true if version is lower than major.minor.micro OR it cannot be
-// determined and one should not rely on the availability of pango version
-// major.minor.micro, nor the non-availability
+// Returns NULL if version is certainly greater or equal than major.minor.micro
+// Returns string describing the error if version is lower than
+// major.minor.micro OR it cannot be determined and one should not rely on the
+// availability of pango version major.minor.micro, nor the non-availability
 const gchar *wx_pango_version_check (int major, int minor, int micro)
 {
 #ifdef PANGO_VERSION_MAJOR