From 2e2a55b22eebde25797bd030660d8c644bc7700b Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 25 Sep 2005 12:53:28 +0000 Subject: [PATCH] Compile fixes for the const patch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/private.h | 4 ++-- src/motif/window.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h index 5cf2b7d0e9..f68f32c033 100644 --- a/include/wx/motif/private.h +++ b/include/wx/motif/private.h @@ -76,7 +76,7 @@ extern bool wxAddWindowToTable(Widget w, wxWindow *win); // ---------------------------------------------------------------------------- // Creates a bitmap with transparent areas drawn in the given colour. -wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour); +wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, const wxColour& colour); // ---------------------------------------------------------------------------- // key events related functions @@ -101,7 +101,7 @@ extern void wxDoChangeForegroundColour(WXWidget widget, extern void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = false); -extern void wxDoChangeFont(WXWidget widget, wxFont& font); +extern void wxDoChangeFont(WXWidget widget, const wxFont& font); extern void wxGetTextExtent(WXDisplay* display, const wxFont& font, double scale, const wxString& string, int* width, int* height, diff --git a/src/motif/window.cpp b/src/motif/window.cpp index 837bedda45..57aa52ecd5 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -2519,9 +2519,10 @@ wxWindow *wxWindowBase::GetCapture() // Find the wxWindow at the current mouse position, returning the mouse // position. -wxWindow* wxFindWindowAtPointer(const wxPoint& pt) +wxWindow* wxFindWindowAtPointer(wxPoint& pt) { - return wxFindWindowAtPoint(wxGetMousePosition()); + pt = wxGetMousePosition(); + return wxFindWindowAtPoint(pt); } // Get the current mouse position. -- 2.47.2