From 55424c8c22c1b9de4f475d6c6e6194df4df77778 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 22 Dec 2006 23:57:34 +0000 Subject: [PATCH] wxColor --> wxColour git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_pseudodc.i | 2 +- wxPython/src/aui.i | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wxPython/src/_pseudodc.i b/wxPython/src/_pseudodc.i index 1fd1cc1ca1..d1248ec865 100644 --- a/wxPython/src/_pseudodc.i +++ b/wxPython/src/_pseudodc.i @@ -73,7 +73,7 @@ current platform.", ""); KeepGIL(FindObjects); DocDeclStr( PyObject*, FindObjects(wxCoord x, wxCoord y, - wxCoord radius=1, const wxColor& bg=*wxWHITE), + wxCoord radius=1, const wxColour& bg=*wxWHITE), "Returns a list of all the id's that draw a pixel with color not equal to bg within radius of (x,y). Returns an empty list if nothing is found. The list is in diff --git a/wxPython/src/aui.i b/wxPython/src/aui.i index 24788f1f62..389abd760c 100755 --- a/wxPython/src/aui.i +++ b/wxPython/src/aui.i @@ -189,11 +189,16 @@ The following example shows a simple implementation that utilizes //--------------------------------------------------------------------------- // Get all our defs from the REAL header files. + +#define wxColor wxColour // fix problem in dockart.h + %include framemanager.h %include dockart.h %include floatpane.h %include auibook.h +#undef wxColor + //--------------------------------------------------------------------------- // Methods to inject into the FrameManager class that will sort out calls to // the overloaded versions of GetPane and AddPane