Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fixes for the const patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-09-25 12:53:28 +00:00
parent 9864ef3b5c
commit 2e2a55b22e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/motif/private.h
View File

@@ -76,7 +76,7 @@ extern bool wxAddWindowToTable(Widget w, wxWindow *win);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Creates a bitmap with transparent areas drawn in the given colour. // 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 // key events related functions
@@ -101,7 +101,7 @@ extern void wxDoChangeForegroundColour(WXWidget widget,
extern void wxDoChangeBackgroundColour(WXWidget widget, extern void wxDoChangeBackgroundColour(WXWidget widget,
wxColour& backgroundColour, wxColour& backgroundColour,
bool changeArmColour = false); 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, extern void wxGetTextExtent(WXDisplay* display, const wxFont& font,
double scale, double scale,
const wxString& string, int* width, int* height, const wxString& string, int* width, int* height,

5
src/motif/window.cpp
View File

@@ -2519,9 +2519,10 @@ wxWindow *wxWindowBase::GetCapture()
// Find the wxWindow at the current mouse position, returning the mouse // Find the wxWindow at the current mouse position, returning the mouse
// position. // position.
wxWindow* wxFindWindowAtPointer(const wxPoint& pt) wxWindow* wxFindWindowAtPointer(wxPoint& pt)
{ {
return wxFindWindowAtPoint(wxGetMousePosition()); pt = wxGetMousePosition();
return wxFindWindowAtPoint(pt);
} }
// Get the current mouse position. // Get the current mouse position.