forward port from 2.8

[wxWidgets.git] / src / x11 / window.cpp

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index dbd6b97cff2dc9d22a5c4a4263a306fdf2f9aed6..7026b5aa658b9b4951f34d913b25fb0f830bc58f 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -1416,7 +1416,10 @@ WXWindow wxWindowX11::GetClientAreaWindow() const
 // TranslateXXXEvent() functions
 // ----------------------------------------------------------------------------
 
-bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent)
+bool wxTranslateMouseEvent(wxMouseEvent& wxevent,
+                           wxWindow *win,
+                           Window WXUNUSED(window),
+                           XEvent *xevent)
 {
     switch (XEventGetType(xevent))
     {
@@ -1648,7 +1651,8 @@ wxWindow *wxWindowBase::GetCapture()
 // position.
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
-    return wxFindWindowAtPoint(wxGetMousePosition());
+    pt = wxGetMousePosition();
+    return wxFindWindowAtPoint(pt);
 }
 
 void wxGetMouseState(int& rootX, int& rootY, unsigned& maskReturn)