really applied Robert's patch (and not the converse of it)

[wxWidgets.git] / src / unix / displayx11.cpp

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 78a1656812a823f7b01793e8cc5b635a11e4e1bd..20cd747e13dc594a037b395968f3970a05733e08 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "display.h"
 #endif
 
@@ -92,7 +92,16 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
   }
   else
   {
-    return 0;
+    wxSize size = wxGetDisplaySize();
+    if (p.x >= 0 &&
+        p.x <= size.GetWidth() && 
+        p.y > 0 &&
+        p.y <= size.GetHeight())
+    {
+        return 0;
+    }
+
+    return -1
   }
 }
 
@@ -135,7 +144,7 @@ int wxDisplay::GetDepth() const
 
 wxString wxDisplay::GetName() const
 {
-  return "";
+  return wxEmptyString;
 }
 
 #endif /* wxUSE_DISPLAY */