X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/89d1e2eeab15869685246c20dc260432ea548ea6..070a1e7e3b4232304fa8315f8f71b99cf01d8caf:/wxPython/src/msw/_gdi_wrap.cpp

diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index 09411f87ab..7bb46350f9 100644
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_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)
 
@@ -3837,9 +3836,8 @@ public:
     virtual void StrokeLines( size_t , const wxPoint2DDouble *, const wxPoint2DDouble *) {}
     virtual void DrawLines( size_t , const wxPoint2DDouble *, int ) {}
     virtual void DrawRectangle( wxDouble , wxDouble , wxDouble , wxDouble ) {}
-    virtual void DrawRoundedRectangle( wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual void DrawEllipse( wxDouble , wxDouble , wxDouble , wxDouble ) {}
-    virtual void DrawRoundedRectangle( wxDouble  wxDouble , wxDouble , wxDouble , wxDouble ) {}
+    virtual void DrawRoundedRectangle( wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {}
     virtual bool ShouldOffset() const { return false; }
 };
 
@@ -36473,8 +36471,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 ;
@@ -36484,8 +36482,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 ;
@@ -36519,17 +36516,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 &""'"); 
-    }
-    if (!argp5) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PseudoDC_FindObjects" "', expected argument " "5"" of type '" "wxColor const &""'"); 
+    {
+      arg5 = &temp5;
+      if ( ! wxColour_helper(obj4, &arg5)) SWIG_fail;
     }
-    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;
@@ -40861,7 +40854,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};
@@ -41042,7 +41034,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,
@@ -41205,7 +41196,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}};
@@ -41386,7 +41376,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,