reSWIGGed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 00:11:49 +00:00
parent 2bd162773d
commit 59ccbf7fec
21 changed files with 995 additions and 1001 deletions
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -10728,9 +10728,15 @@ class Menu(EvtHandler):
        """Remove(self, int id) -> MenuItem"""
        return _core_.Menu_Remove(*args, **kwargs)

-    def RemoveItem(*args, **kwargs):
+    def RemoveItem(self, item):
        """RemoveItem(self, MenuItem item) -> MenuItem"""
-        return _core_.Menu_RemoveItem(*args, **kwargs)
+        #// The return object is always the parameter, so return that 
+        #// proxy instead of the new one
+        val = _core_.Menu_RemoveItem(self, item)
+        item.this.own(val.this.own())
+        val.this.disown()
+        return item
+

    def Delete(*args, **kwargs):
        """Delete(self, int id) -> bool"""
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -5121,7 +5121,8 @@ class GraphicsMatrix(GraphicsObject):
        """
        IsEqual(self, GraphicsMatrix t) -> bool

-        Returns ``True`` if the elements of the transformation matrix are equal
+        Returns ``True`` if the elements of the transformation matrix are
+        equal
        """
        return _gdi_.GraphicsMatrix_IsEqual(*args, **kwargs)

@@ -5290,8 +5291,8 @@ class GraphicsPath(GraphicsObject):
        """
        AddArcToPoint(self, Double x1, Double y1, Double x2, Double y2, Double r)

-        Appends an arc to two tangents connecting (current) to (x1,y1) and (x1,y1)
-        to (x2,y2), also a straight line from (current) to (x1,y1)
+        Appends an arc to two tangents connecting (current) to (x1,y1) and
+        (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
        """
        return _gdi_.GraphicsPath_AddArcToPoint(*args, **kwargs)

@@ -5343,7 +5344,8 @@ class GraphicsPath(GraphicsObject):
        """
        GetBox(self) -> Rect2D

-        Gets the bounding box enclosing all points (possibly including control points)
+        Gets the bounding box enclosing all points (possibly including control
+        points)
        """
        return _gdi_.GraphicsPath_GetBox(*args, **kwargs)

@@ -5398,9 +5400,9 @@ class GraphicsContext(GraphicsObject):
        """
        CreateFromNative(void context) -> GraphicsContext

-        Creates a wx.GraphicsContext from a native context. This native context
-        must be eg a CGContextRef for Core Graphics, a Graphics pointer for
-        GDIPlus or a cairo_t pointer for Cairo.
+        Creates a wx.GraphicsContext from a native context. This native
+        context must be eg a CGContextRef for Core Graphics, a Graphics
+        pointer for GDIPlus or a cairo_t pointer for Cairo.
        """
        return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)

@@ -5453,8 +5455,8 @@ class GraphicsContext(GraphicsObject):
        CreateRadialGradientBrush(self, Double xo, Double yo, Double xc, Double yc, Double radius, 
            Colour oColor, Colour cColor) -> GraphicsBrush

-        Creates a native brush, having a radial gradient originating at 
-        point (xo,yc) with color oColour and ends on a circle around (xc,yc) with
+        Creates a native brush, having a radial gradient originating at point
+        (xo,yc) with color oColour and ends on a circle around (xc,yc) with
        radius r and color cColour.
        """
        return _gdi_.GraphicsContext_CreateRadialGradientBrush(*args, **kwargs)
@@ -5481,7 +5483,8 @@ class GraphicsContext(GraphicsObject):
        """
        PushState(self)

-        push the current state of the context, ie the transformation matrix on a stack
+        Push the current state of the context, (ie the transformation matrix)
+        on a stack
        """
        return _gdi_.GraphicsContext_PushState(*args, **kwargs)

@@ -5489,7 +5492,7 @@ class GraphicsContext(GraphicsObject):
        """
        PopState(self)

-        pops a stored state from the stack
+        Pops a stored state from the stack
        """
        return _gdi_.GraphicsContext_PopState(*args, **kwargs)

@@ -5806,9 +5809,9 @@ def GraphicsContext_CreateFromNative(*args, **kwargs):
  """
    GraphicsContext_CreateFromNative(void context) -> GraphicsContext

-    Creates a wx.GraphicsContext from a native context. This native context
-    must be eg a CGContextRef for Core Graphics, a Graphics pointer for
-    GDIPlus or a cairo_t pointer for Cairo.
+    Creates a wx.GraphicsContext from a native context. This native
+    context must be eg a CGContextRef for Core Graphics, a Graphics
+    pointer for GDIPlus or a cairo_t pointer for Cairo.
    """
  return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs)

@@ -6901,7 +6904,7 @@ class PseudoDC(_core.Object):

    def FindObjects(*args, **kwargs):
        """
-        FindObjects(self, int x, int y, int radius=1, wxColor bg=*wxWHITE) -> PyObject
+        FindObjects(self, int x, int y, int radius=1, Colour bg=*wxWHITE) -> PyObject

        Returns a list of all the id's that draw a pixel with color
        not equal to bg within radius of (x,y).
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -2491,150 +2491,149 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxClientDC swig_types[25]
 #define SWIGTYPE_p_wxClipboardTextEvent swig_types[26]
 #define SWIGTYPE_p_wxCloseEvent swig_types[27]
-#define SWIGTYPE_p_wxColor swig_types[28]
-#define SWIGTYPE_p_wxColour swig_types[29]
-#define SWIGTYPE_p_wxColourDatabase swig_types[30]
-#define SWIGTYPE_p_wxCommandEvent swig_types[31]
-#define SWIGTYPE_p_wxContextMenuEvent swig_types[32]
-#define SWIGTYPE_p_wxControl swig_types[33]
-#define SWIGTYPE_p_wxControlWithItems swig_types[34]
-#define SWIGTYPE_p_wxCursor swig_types[35]
-#define SWIGTYPE_p_wxDC swig_types[36]
-#define SWIGTYPE_p_wxDCBrushChanger swig_types[37]
-#define SWIGTYPE_p_wxDCClipper swig_types[38]
-#define SWIGTYPE_p_wxDCOverlay swig_types[39]
-#define SWIGTYPE_p_wxDCPenChanger swig_types[40]
-#define SWIGTYPE_p_wxDCTextColourChanger swig_types[41]
-#define SWIGTYPE_p_wxDash swig_types[42]
-#define SWIGTYPE_p_wxDateEvent swig_types[43]
-#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[44]
-#define SWIGTYPE_p_wxDropFilesEvent swig_types[45]
-#define SWIGTYPE_p_wxDuplexMode swig_types[46]
-#define SWIGTYPE_p_wxEffects swig_types[47]
-#define SWIGTYPE_p_wxEncodingConverter swig_types[48]
-#define SWIGTYPE_p_wxEraseEvent swig_types[49]
-#define SWIGTYPE_p_wxEvent swig_types[50]
-#define SWIGTYPE_p_wxEvtHandler swig_types[51]
-#define SWIGTYPE_p_wxFSFile swig_types[52]
-#define SWIGTYPE_p_wxFileSystem swig_types[53]
-#define SWIGTYPE_p_wxFlexGridSizer swig_types[54]
-#define SWIGTYPE_p_wxFocusEvent swig_types[55]
-#define SWIGTYPE_p_wxFont swig_types[56]
-#define SWIGTYPE_p_wxFontList swig_types[57]
-#define SWIGTYPE_p_wxFontMapper swig_types[58]
-#define SWIGTYPE_p_wxGBSizerItem swig_types[59]
-#define SWIGTYPE_p_wxGCDC swig_types[60]
-#define SWIGTYPE_p_wxGDIObjListBase swig_types[61]
-#define SWIGTYPE_p_wxGDIObject swig_types[62]
-#define SWIGTYPE_p_wxGIFHandler swig_types[63]
-#define SWIGTYPE_p_wxGraphicsBrush swig_types[64]
-#define SWIGTYPE_p_wxGraphicsContext swig_types[65]
-#define SWIGTYPE_p_wxGraphicsFont swig_types[66]
-#define SWIGTYPE_p_wxGraphicsMatrix swig_types[67]
-#define SWIGTYPE_p_wxGraphicsObject swig_types[68]
-#define SWIGTYPE_p_wxGraphicsPath swig_types[69]
-#define SWIGTYPE_p_wxGraphicsPen swig_types[70]
-#define SWIGTYPE_p_wxGraphicsRenderer swig_types[71]
-#define SWIGTYPE_p_wxGridBagSizer swig_types[72]
-#define SWIGTYPE_p_wxGridSizer swig_types[73]
-#define SWIGTYPE_p_wxHeaderButtonParams swig_types[74]
-#define SWIGTYPE_p_wxICOHandler swig_types[75]
-#define SWIGTYPE_p_wxIcon swig_types[76]
-#define SWIGTYPE_p_wxIconBundle swig_types[77]
-#define SWIGTYPE_p_wxIconLocation swig_types[78]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[79]
-#define SWIGTYPE_p_wxIdleEvent swig_types[80]
-#define SWIGTYPE_p_wxImage swig_types[81]
-#define SWIGTYPE_p_wxImageHandler swig_types[82]
-#define SWIGTYPE_p_wxImageList swig_types[83]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[84]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[85]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[86]
-#define SWIGTYPE_p_wxKeyEvent swig_types[87]
-#define SWIGTYPE_p_wxLanguageInfo swig_types[88]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[89]
-#define SWIGTYPE_p_wxLocale swig_types[90]
-#define SWIGTYPE_p_wxMask swig_types[91]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[92]
-#define SWIGTYPE_p_wxMemoryDC swig_types[93]
-#define SWIGTYPE_p_wxMenu swig_types[94]
-#define SWIGTYPE_p_wxMenuBar swig_types[95]
-#define SWIGTYPE_p_wxMenuEvent swig_types[96]
-#define SWIGTYPE_p_wxMenuItem swig_types[97]
-#define SWIGTYPE_p_wxMetaFile swig_types[98]
-#define SWIGTYPE_p_wxMetaFileDC swig_types[99]
-#define SWIGTYPE_p_wxMirrorDC swig_types[100]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[101]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[102]
-#define SWIGTYPE_p_wxMouseEvent swig_types[103]
-#define SWIGTYPE_p_wxMoveEvent swig_types[104]
-#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[105]
-#define SWIGTYPE_p_wxNativeFontInfo swig_types[106]
-#define SWIGTYPE_p_wxNativePixelData swig_types[107]
-#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[108]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[109]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[110]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[111]
-#define SWIGTYPE_p_wxObject swig_types[112]
-#define SWIGTYPE_p_wxOverlay swig_types[113]
-#define SWIGTYPE_p_wxPCXHandler swig_types[114]
-#define SWIGTYPE_p_wxPNGHandler swig_types[115]
-#define SWIGTYPE_p_wxPNMHandler swig_types[116]
-#define SWIGTYPE_p_wxPaintDC swig_types[117]
-#define SWIGTYPE_p_wxPaintEvent swig_types[118]
-#define SWIGTYPE_p_wxPalette swig_types[119]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[120]
-#define SWIGTYPE_p_wxPaperSize swig_types[121]
-#define SWIGTYPE_p_wxPen swig_types[122]
-#define SWIGTYPE_p_wxPenList swig_types[123]
-#define SWIGTYPE_p_wxPixelDataBase swig_types[124]
-#define SWIGTYPE_p_wxPoint swig_types[125]
-#define SWIGTYPE_p_wxPoint2D swig_types[126]
-#define SWIGTYPE_p_wxPostScriptDC swig_types[127]
-#define SWIGTYPE_p_wxPrintData swig_types[128]
-#define SWIGTYPE_p_wxPrinterDC swig_types[129]
-#define SWIGTYPE_p_wxPseudoDC swig_types[130]
-#define SWIGTYPE_p_wxPyApp swig_types[131]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[132]
-#define SWIGTYPE_p_wxPyEvent swig_types[133]
-#define SWIGTYPE_p_wxPyFontEnumerator swig_types[134]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[135]
-#define SWIGTYPE_p_wxPyLocale swig_types[136]
-#define SWIGTYPE_p_wxPySizer swig_types[137]
-#define SWIGTYPE_p_wxPyValidator swig_types[138]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[139]
-#define SWIGTYPE_p_wxRect swig_types[140]
-#define SWIGTYPE_p_wxRect2D swig_types[141]
-#define SWIGTYPE_p_wxRegion swig_types[142]
-#define SWIGTYPE_p_wxRegionIterator swig_types[143]
-#define SWIGTYPE_p_wxRendererNative swig_types[144]
-#define SWIGTYPE_p_wxRendererVersion swig_types[145]
-#define SWIGTYPE_p_wxScreenDC swig_types[146]
-#define SWIGTYPE_p_wxScrollEvent swig_types[147]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[148]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[149]
-#define SWIGTYPE_p_wxShowEvent swig_types[150]
-#define SWIGTYPE_p_wxSize swig_types[151]
-#define SWIGTYPE_p_wxSizeEvent swig_types[152]
-#define SWIGTYPE_p_wxSizer swig_types[153]
-#define SWIGTYPE_p_wxSizerItem swig_types[154]
-#define SWIGTYPE_p_wxSplitterRenderParams swig_types[155]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[156]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[157]
-#define SWIGTYPE_p_wxStockGDI swig_types[158]
-#define SWIGTYPE_p_wxString swig_types[159]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[160]
-#define SWIGTYPE_p_wxTGAHandler swig_types[161]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[162]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[163]
-#define SWIGTYPE_p_wxValidator swig_types[164]
-#define SWIGTYPE_p_wxWindow swig_types[165]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[166]
-#define SWIGTYPE_p_wxWindowDC swig_types[167]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[168]
-#define SWIGTYPE_p_wxXPMHandler swig_types[169]
-static swig_type_info *swig_types[171];
-static swig_module_info swig_module = {swig_types, 170, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxColour swig_types[28]
+#define SWIGTYPE_p_wxColourDatabase swig_types[29]
+#define SWIGTYPE_p_wxCommandEvent swig_types[30]
+#define SWIGTYPE_p_wxContextMenuEvent swig_types[31]
+#define SWIGTYPE_p_wxControl swig_types[32]
+#define SWIGTYPE_p_wxControlWithItems swig_types[33]
+#define SWIGTYPE_p_wxCursor swig_types[34]
+#define SWIGTYPE_p_wxDC swig_types[35]
+#define SWIGTYPE_p_wxDCBrushChanger swig_types[36]
+#define SWIGTYPE_p_wxDCClipper swig_types[37]
+#define SWIGTYPE_p_wxDCOverlay swig_types[38]
+#define SWIGTYPE_p_wxDCPenChanger swig_types[39]
+#define SWIGTYPE_p_wxDCTextColourChanger swig_types[40]
+#define SWIGTYPE_p_wxDash swig_types[41]
+#define SWIGTYPE_p_wxDateEvent swig_types[42]
+#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[43]
+#define SWIGTYPE_p_wxDropFilesEvent swig_types[44]
+#define SWIGTYPE_p_wxDuplexMode swig_types[45]
+#define SWIGTYPE_p_wxEffects swig_types[46]
+#define SWIGTYPE_p_wxEncodingConverter swig_types[47]
+#define SWIGTYPE_p_wxEraseEvent swig_types[48]
+#define SWIGTYPE_p_wxEvent swig_types[49]
+#define SWIGTYPE_p_wxEvtHandler swig_types[50]
+#define SWIGTYPE_p_wxFSFile swig_types[51]
+#define SWIGTYPE_p_wxFileSystem swig_types[52]
+#define SWIGTYPE_p_wxFlexGridSizer swig_types[53]
+#define SWIGTYPE_p_wxFocusEvent swig_types[54]
+#define SWIGTYPE_p_wxFont swig_types[55]
+#define SWIGTYPE_p_wxFontList swig_types[56]
+#define SWIGTYPE_p_wxFontMapper swig_types[57]
+#define SWIGTYPE_p_wxGBSizerItem swig_types[58]
+#define SWIGTYPE_p_wxGCDC swig_types[59]
+#define SWIGTYPE_p_wxGDIObjListBase swig_types[60]
+#define SWIGTYPE_p_wxGDIObject swig_types[61]
+#define SWIGTYPE_p_wxGIFHandler swig_types[62]
+#define SWIGTYPE_p_wxGraphicsBrush swig_types[63]
+#define SWIGTYPE_p_wxGraphicsContext swig_types[64]
+#define SWIGTYPE_p_wxGraphicsFont swig_types[65]
+#define SWIGTYPE_p_wxGraphicsMatrix swig_types[66]
+#define SWIGTYPE_p_wxGraphicsObject swig_types[67]
+#define SWIGTYPE_p_wxGraphicsPath swig_types[68]
+#define SWIGTYPE_p_wxGraphicsPen swig_types[69]
+#define SWIGTYPE_p_wxGraphicsRenderer swig_types[70]
+#define SWIGTYPE_p_wxGridBagSizer swig_types[71]
+#define SWIGTYPE_p_wxGridSizer swig_types[72]
+#define SWIGTYPE_p_wxHeaderButtonParams swig_types[73]
+#define SWIGTYPE_p_wxICOHandler swig_types[74]
+#define SWIGTYPE_p_wxIcon swig_types[75]
+#define SWIGTYPE_p_wxIconBundle swig_types[76]
+#define SWIGTYPE_p_wxIconLocation swig_types[77]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[78]
+#define SWIGTYPE_p_wxIdleEvent swig_types[79]
+#define SWIGTYPE_p_wxImage swig_types[80]
+#define SWIGTYPE_p_wxImageHandler swig_types[81]
+#define SWIGTYPE_p_wxImageList swig_types[82]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[83]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[84]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[85]
+#define SWIGTYPE_p_wxKeyEvent swig_types[86]
+#define SWIGTYPE_p_wxLanguageInfo swig_types[87]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[88]
+#define SWIGTYPE_p_wxLocale swig_types[89]
+#define SWIGTYPE_p_wxMask swig_types[90]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[91]
+#define SWIGTYPE_p_wxMemoryDC swig_types[92]
+#define SWIGTYPE_p_wxMenu swig_types[93]
+#define SWIGTYPE_p_wxMenuBar swig_types[94]
+#define SWIGTYPE_p_wxMenuEvent swig_types[95]
+#define SWIGTYPE_p_wxMenuItem swig_types[96]
+#define SWIGTYPE_p_wxMetaFile swig_types[97]
+#define SWIGTYPE_p_wxMetaFileDC swig_types[98]
+#define SWIGTYPE_p_wxMirrorDC swig_types[99]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[100]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[101]
+#define SWIGTYPE_p_wxMouseEvent swig_types[102]
+#define SWIGTYPE_p_wxMoveEvent swig_types[103]
+#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[104]
+#define SWIGTYPE_p_wxNativeFontInfo swig_types[105]
+#define SWIGTYPE_p_wxNativePixelData swig_types[106]
+#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[107]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[108]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[109]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[110]
+#define SWIGTYPE_p_wxObject swig_types[111]
+#define SWIGTYPE_p_wxOverlay swig_types[112]
+#define SWIGTYPE_p_wxPCXHandler swig_types[113]
+#define SWIGTYPE_p_wxPNGHandler swig_types[114]
+#define SWIGTYPE_p_wxPNMHandler swig_types[115]
+#define SWIGTYPE_p_wxPaintDC swig_types[116]
+#define SWIGTYPE_p_wxPaintEvent swig_types[117]
+#define SWIGTYPE_p_wxPalette swig_types[118]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[119]
+#define SWIGTYPE_p_wxPaperSize swig_types[120]
+#define SWIGTYPE_p_wxPen swig_types[121]
+#define SWIGTYPE_p_wxPenList swig_types[122]
+#define SWIGTYPE_p_wxPixelDataBase swig_types[123]
+#define SWIGTYPE_p_wxPoint swig_types[124]
+#define SWIGTYPE_p_wxPoint2D swig_types[125]
+#define SWIGTYPE_p_wxPostScriptDC swig_types[126]
+#define SWIGTYPE_p_wxPrintData swig_types[127]
+#define SWIGTYPE_p_wxPrinterDC swig_types[128]
+#define SWIGTYPE_p_wxPseudoDC swig_types[129]
+#define SWIGTYPE_p_wxPyApp swig_types[130]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[131]
+#define SWIGTYPE_p_wxPyEvent swig_types[132]
+#define SWIGTYPE_p_wxPyFontEnumerator swig_types[133]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[134]
+#define SWIGTYPE_p_wxPyLocale swig_types[135]
+#define SWIGTYPE_p_wxPySizer swig_types[136]
+#define SWIGTYPE_p_wxPyValidator swig_types[137]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[138]
+#define SWIGTYPE_p_wxRect swig_types[139]
+#define SWIGTYPE_p_wxRect2D swig_types[140]
+#define SWIGTYPE_p_wxRegion swig_types[141]
+#define SWIGTYPE_p_wxRegionIterator swig_types[142]
+#define SWIGTYPE_p_wxRendererNative swig_types[143]
+#define SWIGTYPE_p_wxRendererVersion swig_types[144]
+#define SWIGTYPE_p_wxScreenDC swig_types[145]
+#define SWIGTYPE_p_wxScrollEvent swig_types[146]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[147]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[148]
+#define SWIGTYPE_p_wxShowEvent swig_types[149]
+#define SWIGTYPE_p_wxSize swig_types[150]
+#define SWIGTYPE_p_wxSizeEvent swig_types[151]
+#define SWIGTYPE_p_wxSizer swig_types[152]
+#define SWIGTYPE_p_wxSizerItem swig_types[153]
+#define SWIGTYPE_p_wxSplitterRenderParams swig_types[154]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[155]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[156]
+#define SWIGTYPE_p_wxStockGDI swig_types[157]
+#define SWIGTYPE_p_wxString swig_types[158]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[159]
+#define SWIGTYPE_p_wxTGAHandler swig_types[160]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[161]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[162]
+#define SWIGTYPE_p_wxValidator swig_types[163]
+#define SWIGTYPE_p_wxWindow swig_types[164]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[165]
+#define SWIGTYPE_p_wxWindowDC swig_types[166]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[167]
+#define SWIGTYPE_p_wxXPMHandler swig_types[168]
+static swig_type_info *swig_types[170];
+static swig_module_info swig_module = {swig_types, 169, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)

@@ -35524,8 +35523,8 @@ SWIGINTERN PyObject *_wrap_PseudoDC_FindObjects(PyObject *SWIGUNUSEDPARM(self),
  int arg2 ;
  int arg3 ;
  int arg4 = (int) 1 ;
-  wxColor const &arg5_defvalue = *wxWHITE ;
-  wxColor *arg5 = (wxColor *) &arg5_defvalue ;
+  wxColour const &arg5_defvalue = *wxWHITE ;
+  wxColour *arg5 = (wxColour *) &arg5_defvalue ;
  PyObject *result = 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
@@ -35535,8 +35534,7 @@ SWIGINTERN PyObject *_wrap_PseudoDC_FindObjects(PyObject *SWIGUNUSEDPARM(self),
  int ecode3 = 0 ;
  int val4 ;
  int ecode4 = 0 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
+  wxColour temp5 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
@@ -35570,17 +35568,13 @@ SWIGINTERN PyObject *_wrap_PseudoDC_FindObjects(PyObject *SWIGUNUSEDPARM(self),
    arg4 = static_cast< int >(val4);
  }
  if (obj4) {
-    res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxColor,  0  | 0);
-    if (!SWIG_IsOK(res5)) {
-      SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "PseudoDC_FindObjects" "', expected argument " "5"" of type '" "wxColor const &""'"); 
+    {
+      arg5 = &temp5;
+      if ( ! wxColour_helper(obj4, &arg5)) SWIG_fail;
    }
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PseudoDC_FindObjects" "', expected argument " "5"" of type '" "wxColor const &""'"); 
-    }
-    arg5 = reinterpret_cast< wxColor * >(argp5);
  }
  {
-    result = (PyObject *)(arg1)->FindObjects(arg2,arg3,arg4,(wxColor const &)*arg5);
+    result = (PyObject *)(arg1)->FindObjects(arg2,arg3,arg4,(wxColour const &)*arg5);
    if (PyErr_Occurred()) SWIG_fail;
  }
  resultobj = result;
@@ -39883,7 +39877,6 @@ static swig_type_info _swigt__p_wxBufferedDC = {"_p_wxBufferedDC", "wxBufferedDC
 static swig_type_info _swigt__p_wxBufferedPaintDC = {"_p_wxBufferedPaintDC", "wxBufferedPaintDC *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxChar = {"_p_wxChar", "wxChar *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxClientDC = {"_p_wxClientDC", "wxClientDC *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_wxColor = {"_p_wxColor", "wxColor *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColourDatabase = {"_p_wxColourDatabase", "wxColourDatabase *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxCursor = {"_p_wxCursor", "wxCursor *", 0, 0, (void*)0, 0};
@@ -40064,7 +40057,6 @@ static swig_type_info *swig_type_initial[] = {
  &_swigt__p_wxClientDC,
  &_swigt__p_wxClipboardTextEvent,
  &_swigt__p_wxCloseEvent,
-  &_swigt__p_wxColor,
  &_swigt__p_wxColour,
  &_swigt__p_wxColourDatabase,
  &_swigt__p_wxCommandEvent,
@@ -40227,7 +40219,6 @@ static swig_cast_info _swigc__p_wxBufferedDC[] = {  {&_swigt__p_wxBufferedDC, 0,
 static swig_cast_info _swigc__p_wxBufferedPaintDC[] = {  {&_swigt__p_wxBufferedPaintDC, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxChar[] = {  {&_swigt__p_wxChar, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxClientDC[] = {  {&_swigt__p_wxClientDC, 0, 0, 0},  {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxClientDC, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_wxColor[] = {  {&_swigt__p_wxColor, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColour[] = {  {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColourDatabase[] = {  {&_swigt__p_wxColourDatabase, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxCursor[] = {  {&_swigt__p_wxCursor, 0, 0, 0},{0, 0, 0, 0}};
@@ -40408,7 +40399,6 @@ static swig_cast_info *swig_cast_initial[] = {
  _swigc__p_wxClientDC,
  _swigc__p_wxClipboardTextEvent,
  _swigc__p_wxCloseEvent,
-  _swigc__p_wxColor,
  _swigc__p_wxColour,
  _swigc__p_wxColourDatabase,
  _swigc__p_wxCommandEvent,
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -924,7 +924,7 @@ class BusyInfo(_core.Object):
    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
    __repr__ = _swig_repr
    def __init__(self, *args, **kwargs): 
-        """__init__(self, String message) -> BusyInfo"""
+        """__init__(self, String message, Window parent=None) -> BusyInfo"""
        _misc_.BusyInfo_swiginit(self,_misc_.new_BusyInfo(*args, **kwargs))
    __swig_destroy__ = _misc_.delete_BusyInfo
    __del__ = lambda self : None;
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -9197,23 +9197,34 @@ SWIGINTERN PyObject *WindowDisabler_swiginit(PyObject *SWIGUNUSEDPARM(self), PyO
 SWIGINTERN PyObject *_wrap_new_BusyInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
  PyObject *resultobj = 0;
  wxString *arg1 = 0 ;
+  wxWindow *arg2 = (wxWindow *) NULL ;
  wxBusyInfo *result = 0 ;
  bool temp1 = false ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
  char *  kwnames[] = {
-    (char *) "message", NULL 
+    (char *) "message",(char *) "parent", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_BusyInfo",kwnames,&obj0)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BusyInfo",kwnames,&obj0,&obj1)) SWIG_fail;
  {
    arg1 = wxString_in_helper(obj0);
    if (arg1 == NULL) SWIG_fail;
    temp1 = true;
  }
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BusyInfo" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+    }
+    arg2 = reinterpret_cast< wxWindow * >(argp2);
+  }
  {
    if (!wxPyCheckForApp()) SWIG_fail;
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxBusyInfo *)new wxBusyInfo((wxString const &)*arg1);
+    result = (wxBusyInfo *)new wxBusyInfo((wxString const &)*arg1,arg2);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
--- a/wxPython/src/gtk/aui.py
+++ b/wxPython/src/gtk/aui.py
@@ -948,7 +948,7 @@ class AuiDockArt(object):
        return _aui.AuiDockArt_GetColour(*args, **kwargs)

    def SetColour(*args, **kwargs):
-        """SetColour(self, int id, wxColor colour)"""
+        """SetColour(self, int id, Colour colour)"""
        return _aui.AuiDockArt_SetColour(*args, **kwargs)

    def GetColor(*args, **kwargs):
--- a/wxPython/src/gtk/aui_wrap.cpp
+++ b/wxPython/src/gtk/aui_wrap.cpp
@@ -2552,152 +2552,151 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxChildFocusEvent swig_types[86]
 #define SWIGTYPE_p_wxClipboardTextEvent swig_types[87]
 #define SWIGTYPE_p_wxCloseEvent swig_types[88]
-#define SWIGTYPE_p_wxColor swig_types[89]
-#define SWIGTYPE_p_wxColour swig_types[90]
-#define SWIGTYPE_p_wxColourData swig_types[91]
-#define SWIGTYPE_p_wxColourDialog swig_types[92]
-#define SWIGTYPE_p_wxCommandEvent swig_types[93]
-#define SWIGTYPE_p_wxContextMenuEvent swig_types[94]
-#define SWIGTYPE_p_wxControl swig_types[95]
-#define SWIGTYPE_p_wxControlWithItems swig_types[96]
-#define SWIGTYPE_p_wxDC swig_types[97]
-#define SWIGTYPE_p_wxDateEvent swig_types[98]
-#define SWIGTYPE_p_wxDialog swig_types[99]
-#define SWIGTYPE_p_wxDirDialog swig_types[100]
-#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[101]
-#define SWIGTYPE_p_wxDropFilesEvent swig_types[102]
-#define SWIGTYPE_p_wxDuplexMode swig_types[103]
-#define SWIGTYPE_p_wxEraseEvent swig_types[104]
-#define SWIGTYPE_p_wxEvent swig_types[105]
-#define SWIGTYPE_p_wxEvtHandler swig_types[106]
-#define SWIGTYPE_p_wxFSFile swig_types[107]
-#define SWIGTYPE_p_wxFileDialog swig_types[108]
-#define SWIGTYPE_p_wxFileSystem swig_types[109]
-#define SWIGTYPE_p_wxFindDialogEvent swig_types[110]
-#define SWIGTYPE_p_wxFindReplaceData swig_types[111]
-#define SWIGTYPE_p_wxFindReplaceDialog swig_types[112]
-#define SWIGTYPE_p_wxFlexGridSizer swig_types[113]
-#define SWIGTYPE_p_wxFocusEvent swig_types[114]
-#define SWIGTYPE_p_wxFont swig_types[115]
-#define SWIGTYPE_p_wxFontData swig_types[116]
-#define SWIGTYPE_p_wxFontDialog swig_types[117]
-#define SWIGTYPE_p_wxFrame swig_types[118]
-#define SWIGTYPE_p_wxGBSizerItem swig_types[119]
-#define SWIGTYPE_p_wxGIFHandler swig_types[120]
-#define SWIGTYPE_p_wxGridBagSizer swig_types[121]
-#define SWIGTYPE_p_wxGridSizer swig_types[122]
-#define SWIGTYPE_p_wxICOHandler swig_types[123]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[124]
-#define SWIGTYPE_p_wxIdleEvent swig_types[125]
-#define SWIGTYPE_p_wxImage swig_types[126]
-#define SWIGTYPE_p_wxImageHandler swig_types[127]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[128]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[129]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[130]
-#define SWIGTYPE_p_wxKeyEvent swig_types[131]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[132]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[133]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[134]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[135]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[136]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[137]
-#define SWIGTYPE_p_wxMenu swig_types[138]
-#define SWIGTYPE_p_wxMenuBar swig_types[139]
-#define SWIGTYPE_p_wxMenuEvent swig_types[140]
-#define SWIGTYPE_p_wxMenuItem swig_types[141]
-#define SWIGTYPE_p_wxMessageDialog swig_types[142]
-#define SWIGTYPE_p_wxMiniFrame swig_types[143]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[144]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[145]
-#define SWIGTYPE_p_wxMouseEvent swig_types[146]
-#define SWIGTYPE_p_wxMoveEvent swig_types[147]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[148]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[149]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[150]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[151]
-#define SWIGTYPE_p_wxNumberEntryDialog swig_types[152]
-#define SWIGTYPE_p_wxObject swig_types[153]
-#define SWIGTYPE_p_wxPCXHandler swig_types[154]
-#define SWIGTYPE_p_wxPNGHandler swig_types[155]
-#define SWIGTYPE_p_wxPNMHandler swig_types[156]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[157]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[158]
-#define SWIGTYPE_p_wxPaintEvent swig_types[159]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[160]
-#define SWIGTYPE_p_wxPanel swig_types[161]
-#define SWIGTYPE_p_wxPaperSize swig_types[162]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[163]
-#define SWIGTYPE_p_wxPoint swig_types[164]
-#define SWIGTYPE_p_wxPopupWindow swig_types[165]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[166]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[167]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[168]
-#define SWIGTYPE_p_wxPrintData swig_types[169]
-#define SWIGTYPE_p_wxPrintDialog swig_types[170]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[171]
-#define SWIGTYPE_p_wxPrintPreview swig_types[172]
-#define SWIGTYPE_p_wxPrinter swig_types[173]
-#define SWIGTYPE_p_wxProgressDialog swig_types[174]
-#define SWIGTYPE_p_wxPyApp swig_types[175]
-#define SWIGTYPE_p_wxPyAuiDockArt swig_types[176]
-#define SWIGTYPE_p_wxPyAuiTabArt swig_types[177]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[178]
-#define SWIGTYPE_p_wxPyEvent swig_types[179]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[180]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[181]
-#define SWIGTYPE_p_wxPyPanel swig_types[182]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[183]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[184]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[185]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[186]
-#define SWIGTYPE_p_wxPyPrintout swig_types[187]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[188]
-#define SWIGTYPE_p_wxPySizer swig_types[189]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[190]
-#define SWIGTYPE_p_wxPyVListBox swig_types[191]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[192]
-#define SWIGTYPE_p_wxPyValidator swig_types[193]
-#define SWIGTYPE_p_wxPyWindow swig_types[194]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[195]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[196]
-#define SWIGTYPE_p_wxRect swig_types[197]
-#define SWIGTYPE_p_wxSashEvent swig_types[198]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[199]
-#define SWIGTYPE_p_wxSashWindow swig_types[200]
-#define SWIGTYPE_p_wxScrollEvent swig_types[201]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[202]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[203]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[204]
-#define SWIGTYPE_p_wxShowEvent swig_types[205]
-#define SWIGTYPE_p_wxSimpleHtmlListBox swig_types[206]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[207]
-#define SWIGTYPE_p_wxSize swig_types[208]
-#define SWIGTYPE_p_wxSizeEvent swig_types[209]
-#define SWIGTYPE_p_wxSizer swig_types[210]
-#define SWIGTYPE_p_wxSizerItem swig_types[211]
-#define SWIGTYPE_p_wxSplashScreen swig_types[212]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[213]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[214]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[215]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[216]
-#define SWIGTYPE_p_wxStatusBar swig_types[217]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[218]
-#define SWIGTYPE_p_wxString swig_types[219]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[220]
-#define SWIGTYPE_p_wxTGAHandler swig_types[221]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[222]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[223]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[224]
-#define SWIGTYPE_p_wxTipWindow swig_types[225]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[226]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[227]
-#define SWIGTYPE_p_wxValidator swig_types[228]
-#define SWIGTYPE_p_wxWindow swig_types[229]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[230]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[231]
-#define SWIGTYPE_p_wxXPMHandler swig_types[232]
-static swig_type_info *swig_types[234];
-static swig_module_info swig_module = {swig_types, 233, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxColour swig_types[89]
+#define SWIGTYPE_p_wxColourData swig_types[90]
+#define SWIGTYPE_p_wxColourDialog swig_types[91]
+#define SWIGTYPE_p_wxCommandEvent swig_types[92]
+#define SWIGTYPE_p_wxContextMenuEvent swig_types[93]
+#define SWIGTYPE_p_wxControl swig_types[94]
+#define SWIGTYPE_p_wxControlWithItems swig_types[95]
+#define SWIGTYPE_p_wxDC swig_types[96]
+#define SWIGTYPE_p_wxDateEvent swig_types[97]
+#define SWIGTYPE_p_wxDialog swig_types[98]
+#define SWIGTYPE_p_wxDirDialog swig_types[99]
+#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[100]
+#define SWIGTYPE_p_wxDropFilesEvent swig_types[101]
+#define SWIGTYPE_p_wxDuplexMode swig_types[102]
+#define SWIGTYPE_p_wxEraseEvent swig_types[103]
+#define SWIGTYPE_p_wxEvent swig_types[104]
+#define SWIGTYPE_p_wxEvtHandler swig_types[105]
+#define SWIGTYPE_p_wxFSFile swig_types[106]
+#define SWIGTYPE_p_wxFileDialog swig_types[107]
+#define SWIGTYPE_p_wxFileSystem swig_types[108]
+#define SWIGTYPE_p_wxFindDialogEvent swig_types[109]
+#define SWIGTYPE_p_wxFindReplaceData swig_types[110]
+#define SWIGTYPE_p_wxFindReplaceDialog swig_types[111]
+#define SWIGTYPE_p_wxFlexGridSizer swig_types[112]
+#define SWIGTYPE_p_wxFocusEvent swig_types[113]
+#define SWIGTYPE_p_wxFont swig_types[114]
+#define SWIGTYPE_p_wxFontData swig_types[115]
+#define SWIGTYPE_p_wxFontDialog swig_types[116]
+#define SWIGTYPE_p_wxFrame swig_types[117]
+#define SWIGTYPE_p_wxGBSizerItem swig_types[118]
+#define SWIGTYPE_p_wxGIFHandler swig_types[119]
+#define SWIGTYPE_p_wxGridBagSizer swig_types[120]
+#define SWIGTYPE_p_wxGridSizer swig_types[121]
+#define SWIGTYPE_p_wxICOHandler swig_types[122]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[123]
+#define SWIGTYPE_p_wxIdleEvent swig_types[124]
+#define SWIGTYPE_p_wxImage swig_types[125]
+#define SWIGTYPE_p_wxImageHandler swig_types[126]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[127]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[128]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[129]
+#define SWIGTYPE_p_wxKeyEvent swig_types[130]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[131]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[132]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[133]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[134]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[135]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[136]
+#define SWIGTYPE_p_wxMenu swig_types[137]
+#define SWIGTYPE_p_wxMenuBar swig_types[138]
+#define SWIGTYPE_p_wxMenuEvent swig_types[139]
+#define SWIGTYPE_p_wxMenuItem swig_types[140]
+#define SWIGTYPE_p_wxMessageDialog swig_types[141]
+#define SWIGTYPE_p_wxMiniFrame swig_types[142]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[143]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[144]
+#define SWIGTYPE_p_wxMouseEvent swig_types[145]
+#define SWIGTYPE_p_wxMoveEvent swig_types[146]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[147]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[148]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[149]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[150]
+#define SWIGTYPE_p_wxNumberEntryDialog swig_types[151]
+#define SWIGTYPE_p_wxObject swig_types[152]
+#define SWIGTYPE_p_wxPCXHandler swig_types[153]
+#define SWIGTYPE_p_wxPNGHandler swig_types[154]
+#define SWIGTYPE_p_wxPNMHandler swig_types[155]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[156]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[157]
+#define SWIGTYPE_p_wxPaintEvent swig_types[158]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[159]
+#define SWIGTYPE_p_wxPanel swig_types[160]
+#define SWIGTYPE_p_wxPaperSize swig_types[161]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[162]
+#define SWIGTYPE_p_wxPoint swig_types[163]
+#define SWIGTYPE_p_wxPopupWindow swig_types[164]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[165]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[166]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[167]
+#define SWIGTYPE_p_wxPrintData swig_types[168]
+#define SWIGTYPE_p_wxPrintDialog swig_types[169]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[170]
+#define SWIGTYPE_p_wxPrintPreview swig_types[171]
+#define SWIGTYPE_p_wxPrinter swig_types[172]
+#define SWIGTYPE_p_wxProgressDialog swig_types[173]
+#define SWIGTYPE_p_wxPyApp swig_types[174]
+#define SWIGTYPE_p_wxPyAuiDockArt swig_types[175]
+#define SWIGTYPE_p_wxPyAuiTabArt swig_types[176]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[177]
+#define SWIGTYPE_p_wxPyEvent swig_types[178]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[179]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[180]
+#define SWIGTYPE_p_wxPyPanel swig_types[181]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[182]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[183]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[184]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[185]
+#define SWIGTYPE_p_wxPyPrintout swig_types[186]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[187]
+#define SWIGTYPE_p_wxPySizer swig_types[188]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[189]
+#define SWIGTYPE_p_wxPyVListBox swig_types[190]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[191]
+#define SWIGTYPE_p_wxPyValidator swig_types[192]
+#define SWIGTYPE_p_wxPyWindow swig_types[193]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[194]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[195]
+#define SWIGTYPE_p_wxRect swig_types[196]
+#define SWIGTYPE_p_wxSashEvent swig_types[197]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[198]
+#define SWIGTYPE_p_wxSashWindow swig_types[199]
+#define SWIGTYPE_p_wxScrollEvent swig_types[200]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[201]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[202]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[203]
+#define SWIGTYPE_p_wxShowEvent swig_types[204]
+#define SWIGTYPE_p_wxSimpleHtmlListBox swig_types[205]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[206]
+#define SWIGTYPE_p_wxSize swig_types[207]
+#define SWIGTYPE_p_wxSizeEvent swig_types[208]
+#define SWIGTYPE_p_wxSizer swig_types[209]
+#define SWIGTYPE_p_wxSizerItem swig_types[210]
+#define SWIGTYPE_p_wxSplashScreen swig_types[211]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[212]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[213]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[214]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[215]
+#define SWIGTYPE_p_wxStatusBar swig_types[216]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[217]
+#define SWIGTYPE_p_wxString swig_types[218]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[219]
+#define SWIGTYPE_p_wxTGAHandler swig_types[220]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[221]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[222]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[223]
+#define SWIGTYPE_p_wxTipWindow swig_types[224]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[225]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[226]
+#define SWIGTYPE_p_wxValidator swig_types[227]
+#define SWIGTYPE_p_wxWindow swig_types[228]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[229]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[230]
+#define SWIGTYPE_p_wxXPMHandler swig_types[231]
+static swig_type_info *swig_types[233];
+static swig_module_info swig_module = {swig_types, 232, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)

@@ -10966,13 +10965,12 @@ SWIGINTERN PyObject *_wrap_AuiDockArt_SetColour(PyObject *SWIGUNUSEDPARM(self),
  PyObject *resultobj = 0;
  wxAuiDockArt *arg1 = (wxAuiDockArt *) 0 ;
  int arg2 ;
-  wxColor *arg3 = 0 ;
+  wxColour *arg3 = 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  int val2 ;
  int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  wxColour temp3 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
@@ -10991,17 +10989,13 @@ SWIGINTERN PyObject *_wrap_AuiDockArt_SetColour(PyObject *SWIGUNUSEDPARM(self),
    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AuiDockArt_SetColour" "', expected argument " "2"" of type '" "int""'");
  } 
  arg2 = static_cast< int >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxColor,  0  | 0);
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiDockArt_SetColour" "', expected argument " "3"" of type '" "wxColor const &""'"); 
+  {
+    arg3 = &temp3;
+    if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
  }
-  if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiDockArt_SetColour" "', expected argument " "3"" of type '" "wxColor const &""'"); 
-  }
-  arg3 = reinterpret_cast< wxColor * >(argp3);
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetColour(arg2,(wxColor const &)*arg3);
+    (arg1)->SetColour(arg2,(wxColour const &)*arg3);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
@@ -17725,7 +17719,6 @@ static swig_type_info _swigt__p_wxAuiTabContainer = {"_p_wxAuiTabContainer", "wx
 static swig_type_info _swigt__p_wxAuiTabContainerButton = {"_p_wxAuiTabContainerButton", "wxAuiTabContainerButton *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxAuiTabCtrl = {"_p_wxAuiTabCtrl", "wxAuiTabCtrl *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_wxColor = {"_p_wxColor", "wxColor *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxCommandEvent = {"_p_wxCommandEvent", "wxCommandEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxSashEvent = {"_p_wxSashEvent", 0, 0, 0, 0, 0};
@@ -17970,7 +17963,6 @@ static swig_type_info *swig_type_initial[] = {
  &_swigt__p_wxChildFocusEvent,
  &_swigt__p_wxClipboardTextEvent,
  &_swigt__p_wxCloseEvent,
-  &_swigt__p_wxColor,
  &_swigt__p_wxColour,
  &_swigt__p_wxColourData,
  &_swigt__p_wxColourDialog,
@@ -18195,7 +18187,6 @@ static swig_cast_info _swigc__p_wxAuiTabContainer[] = {  {&_swigt__p_wxAuiTabCon
 static swig_cast_info _swigc__p_wxAuiTabContainerButton[] = {  {&_swigt__p_wxAuiTabContainerButton, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxAuiTabCtrl[] = {  {&_swigt__p_wxAuiTabCtrl, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBitmap[] = {  {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_wxColor[] = {  {&_swigt__p_wxColor, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColour[] = {  {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSashEvent[] = {{&_swigt__p_wxSashEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxWindowDestroyEvent[] = {{&_swigt__p_wxWindowDestroyEvent, 0, 0, 0},{0, 0, 0, 0}};
@@ -18440,7 +18431,6 @@ static swig_cast_info *swig_cast_initial[] = {
  _swigc__p_wxChildFocusEvent,
  _swigc__p_wxClipboardTextEvent,
  _swigc__p_wxCloseEvent,
-  _swigc__p_wxColor,
  _swigc__p_wxColour,
  _swigc__p_wxColourData,
  _swigc__p_wxColourDialog,