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

wxRect2DDouble --> wxRect2D

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-12-07 03:27:25 +00:00
parent cce4a2cec8
commit 4fe9ce473e
7 changed files with 188 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/src/_graphics.i
View File

@@ -620,7 +620,7 @@ returned by GetNativePath is newly allocated each time).", "");
DocDeclStr( DocDeclStr(
wxRect2DDouble , GetBox() const, wxRect2D , GetBox() const,
"Gets the bounding box enclosing all points (possibly including control points)", ""); "Gets the bounding box enclosing all points (possibly including control points)", "");
@@ -628,7 +628,7 @@ returned by GetNativePath is newly allocated each time).", "");
DocStr(Contains, DocStr(Contains,
"Returns ``True`` if the point is within the path.", ""); "Returns ``True`` if the point is within the path.", "");
virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const; virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const;
bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE) const; bool Contains( const wxPoint2D& c, int fillStyle = wxODDEVEN_RULE) const;
}; };

4
wxPython/src/gtk/_gdi.py
View File

@@ -5341,7 +5341,7 @@ class GraphicsPath(GraphicsObject):
def GetBox(*args, **kwargs): def GetBox(*args, **kwargs):
""" """
GetBox(self) -> wxRect2DDouble 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)
""" """
@@ -5350,7 +5350,7 @@ class GraphicsPath(GraphicsObject):
def Contains(*args): def Contains(*args):
""" """
Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool
Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, Point2D c, int fillStyle=ODDEVEN_RULE) -> bool
Returns ``True`` if the point is within the path. Returns ``True`` if the point is within the path.
""" """

129
wxPython/src/gtk/_gdi_wrap.cpp
View File

@@ -2590,52 +2590,51 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
#define SWIGTYPE_p_wxPixelDataBase swig_types[124] #define SWIGTYPE_p_wxPixelDataBase swig_types[124]
#define SWIGTYPE_p_wxPoint swig_types[125] #define SWIGTYPE_p_wxPoint swig_types[125]
#define SWIGTYPE_p_wxPoint2D swig_types[126] #define SWIGTYPE_p_wxPoint2D swig_types[126]
#define SWIGTYPE_p_wxPoint2DDouble swig_types[127] #define SWIGTYPE_p_wxPostScriptDC swig_types[127]
#define SWIGTYPE_p_wxPostScriptDC swig_types[128] #define SWIGTYPE_p_wxPrintData swig_types[128]
#define SWIGTYPE_p_wxPrintData swig_types[129] #define SWIGTYPE_p_wxPrinterDC swig_types[129]
#define SWIGTYPE_p_wxPrinterDC swig_types[130] #define SWIGTYPE_p_wxPseudoDC swig_types[130]
#define SWIGTYPE_p_wxPseudoDC swig_types[131] #define SWIGTYPE_p_wxPyApp swig_types[131]
#define SWIGTYPE_p_wxPyApp swig_types[132] #define SWIGTYPE_p_wxPyCommandEvent swig_types[132]
#define SWIGTYPE_p_wxPyCommandEvent swig_types[133] #define SWIGTYPE_p_wxPyEvent swig_types[133]
#define SWIGTYPE_p_wxPyEvent swig_types[134] #define SWIGTYPE_p_wxPyFontEnumerator swig_types[134]
#define SWIGTYPE_p_wxPyFontEnumerator swig_types[135] #define SWIGTYPE_p_wxPyImageHandler swig_types[135]
#define SWIGTYPE_p_wxPyImageHandler swig_types[136] #define SWIGTYPE_p_wxPyLocale swig_types[136]
#define SWIGTYPE_p_wxPyLocale swig_types[137] #define SWIGTYPE_p_wxPySizer swig_types[137]
#define SWIGTYPE_p_wxPySizer swig_types[138] #define SWIGTYPE_p_wxPyValidator swig_types[138]
#define SWIGTYPE_p_wxPyValidator swig_types[139] #define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[139]
#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[140] #define SWIGTYPE_p_wxRect swig_types[140]
#define SWIGTYPE_p_wxRect swig_types[141] #define SWIGTYPE_p_wxRect2D swig_types[141]
#define SWIGTYPE_p_wxRect2DDouble swig_types[142] #define SWIGTYPE_p_wxRegion swig_types[142]
#define SWIGTYPE_p_wxRegion swig_types[143] #define SWIGTYPE_p_wxRegionIterator swig_types[143]
#define SWIGTYPE_p_wxRegionIterator swig_types[144] #define SWIGTYPE_p_wxRendererNative swig_types[144]
#define SWIGTYPE_p_wxRendererNative swig_types[145] #define SWIGTYPE_p_wxRendererVersion swig_types[145]
#define SWIGTYPE_p_wxRendererVersion swig_types[146] #define SWIGTYPE_p_wxScreenDC swig_types[146]
#define SWIGTYPE_p_wxScreenDC swig_types[147] #define SWIGTYPE_p_wxScrollEvent swig_types[147]
#define SWIGTYPE_p_wxScrollEvent swig_types[148] #define SWIGTYPE_p_wxScrollWinEvent swig_types[148]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[149] #define SWIGTYPE_p_wxSetCursorEvent swig_types[149]
#define SWIGTYPE_p_wxSetCursorEvent swig_types[150] #define SWIGTYPE_p_wxShowEvent swig_types[150]
#define SWIGTYPE_p_wxShowEvent swig_types[151] #define SWIGTYPE_p_wxSize swig_types[151]
#define SWIGTYPE_p_wxSize swig_types[152] #define SWIGTYPE_p_wxSizeEvent swig_types[152]
#define SWIGTYPE_p_wxSizeEvent swig_types[153] #define SWIGTYPE_p_wxSizer swig_types[153]
#define SWIGTYPE_p_wxSizer swig_types[154] #define SWIGTYPE_p_wxSizerItem swig_types[154]
#define SWIGTYPE_p_wxSizerItem swig_types[155] #define SWIGTYPE_p_wxSplitterRenderParams swig_types[155]
#define SWIGTYPE_p_wxSplitterRenderParams swig_types[156] #define SWIGTYPE_p_wxStaticBoxSizer swig_types[156]
#define SWIGTYPE_p_wxStaticBoxSizer swig_types[157] #define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[157]
#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[158] #define SWIGTYPE_p_wxStockGDI swig_types[158]
#define SWIGTYPE_p_wxStockGDI swig_types[159] #define SWIGTYPE_p_wxString swig_types[159]
#define SWIGTYPE_p_wxString swig_types[160] #define SWIGTYPE_p_wxSysColourChangedEvent swig_types[160]
#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[161] #define SWIGTYPE_p_wxTGAHandler swig_types[161]
#define SWIGTYPE_p_wxTGAHandler swig_types[162] #define SWIGTYPE_p_wxTIFFHandler swig_types[162]
#define SWIGTYPE_p_wxTIFFHandler swig_types[163] #define SWIGTYPE_p_wxUpdateUIEvent swig_types[163]
#define SWIGTYPE_p_wxUpdateUIEvent swig_types[164] #define SWIGTYPE_p_wxValidator swig_types[164]
#define SWIGTYPE_p_wxValidator swig_types[165] #define SWIGTYPE_p_wxWindow swig_types[165]
#define SWIGTYPE_p_wxWindow swig_types[166] #define SWIGTYPE_p_wxWindowCreateEvent swig_types[166]
#define SWIGTYPE_p_wxWindowCreateEvent swig_types[167] #define SWIGTYPE_p_wxWindowDC swig_types[167]
#define SWIGTYPE_p_wxWindowDC swig_types[168] #define SWIGTYPE_p_wxWindowDestroyEvent swig_types[168]
#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[169] #define SWIGTYPE_p_wxXPMHandler swig_types[169]
#define SWIGTYPE_p_wxXPMHandler swig_types[170] static swig_type_info *swig_types[171];
static swig_type_info *swig_types[172]; static swig_module_info swig_module = {swig_types, 170, 0, 0, 0, 0};
static swig_module_info swig_module = {swig_types, 171, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -27204,7 +27203,7 @@ fail:
SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
wxRect2DDouble result; wxRect2D result;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
PyObject *swig_obj[1] ; PyObject *swig_obj[1] ;
@@ -27220,7 +27219,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), P
result = ((wxGraphicsPath const *)arg1)->GetBox(); result = ((wxGraphicsPath const *)arg1)->GetBox();
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }
resultobj = SWIG_NewPointerObj((new wxRect2DDouble(static_cast< const wxRect2DDouble& >(result))), SWIGTYPE_p_wxRect2DDouble, SWIG_POINTER_OWN | 0 ); resultobj = SWIG_NewPointerObj((new wxRect2D(static_cast< const wxRect2D& >(result))), SWIGTYPE_p_wxRect2D, SWIG_POINTER_OWN | 0 );
return resultobj; return resultobj;
fail: fail:
return NULL; return NULL;
@@ -27282,13 +27281,12 @@ fail:
SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
wxPoint2DDouble *arg2 = 0 ; wxPoint2D *arg2 = 0 ;
int arg3 = (int) wxODDEVEN_RULE ; int arg3 = (int) wxODDEVEN_RULE ;
bool result; bool result;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
void *argp2 = 0 ; wxPoint2D temp2 ;
int res2 = 0 ;
int val3 ; int val3 ;
int ecode3 = 0 ; int ecode3 = 0 ;
@@ -27298,14 +27296,10 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'");
} }
arg1 = reinterpret_cast< wxGraphicsPath * >(argp1); arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxPoint2DDouble, 0 | 0); {
if (!SWIG_IsOK(res2)) { arg2 = &temp2;
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_Contains" "', expected argument " "2"" of type '" "wxPoint2DDouble const &""'"); if ( ! wxPoint2D_helper(swig_obj[1], &arg2)) SWIG_fail;
} }
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsPath_Contains" "', expected argument " "2"" of type '" "wxPoint2DDouble const &""'");
}
arg2 = reinterpret_cast< wxPoint2DDouble * >(argp2);
if (swig_obj[2]) { if (swig_obj[2]) {
ecode3 = SWIG_AsVal_int(swig_obj[2], &val3); ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) { if (!SWIG_IsOK(ecode3)) {
@@ -27314,7 +27308,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
arg3 = static_cast< int >(val3); arg3 = static_cast< int >(val3);
} }
{ {
result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2DDouble const &)*arg2,arg3); result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2D const &)*arg2,arg3);
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }
{ {
@@ -27335,8 +27329,9 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains(PyObject *self, PyObject *args)
if ((argc >= 2) && (argc <= 3)) { if ((argc >= 2) && (argc <= 3)) {
int _v = 0; int _v = 0;
{ {
int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxPoint2DDouble, 0); {
_v = SWIG_CheckState(res); _v = wxPySimple_typecheck(argv[1], wxT("wxPoint2D"), 2);
}
} }
if (!_v) goto check_1; if (!_v) goto check_1;
if (argc > 2) { if (argc > 2) {
@@ -39998,7 +39993,6 @@ static swig_type_info _swigt__p_wxPenList = {"_p_wxPenList", "wxPenList *", 0, 0
static swig_type_info _swigt__p_wxPixelDataBase = {"_p_wxPixelDataBase", "wxPixelDataBase *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPixelDataBase = {"_p_wxPixelDataBase", "wxPixelDataBase *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint = {"_p_wxPoint", "wxPoint *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPoint = {"_p_wxPoint", "wxPoint *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint2D = {"_p_wxPoint2D", "wxPoint2D *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPoint2D = {"_p_wxPoint2D", "wxPoint2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint2DDouble = {"_p_wxPoint2DDouble", "wxPoint2DDouble *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPostScriptDC = {"_p_wxPostScriptDC", "wxPostScriptDC *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPostScriptDC = {"_p_wxPostScriptDC", "wxPostScriptDC *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0};
@@ -40006,7 +40000,7 @@ static swig_type_info _swigt__p_wxPseudoDC = {"_p_wxPseudoDC", "wxPseudoDC *", 0
static swig_type_info _swigt__p_wxPyFontEnumerator = {"_p_wxPyFontEnumerator", "wxPyFontEnumerator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyFontEnumerator = {"_p_wxPyFontEnumerator", "wxPyFontEnumerator *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPyLocale = {"_p_wxPyLocale", "wxPyLocale *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyLocale = {"_p_wxPyLocale", "wxPyLocale *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRect = {"_p_wxRect", "wxRect *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRect = {"_p_wxRect", "wxRect *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRect2DDouble = {"_p_wxRect2DDouble", "wxRect2DDouble *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRect2D = {"_p_wxRect2D", "wxRect2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRegion = {"_p_wxRegion", "wxRegion *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRegion = {"_p_wxRegion", "wxRegion *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRendererNative = {"_p_wxRendererNative", "wxRendererNative *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRendererNative = {"_p_wxRendererNative", "wxRendererNative *", 0, 0, (void*)0, 0};
@@ -40147,7 +40141,6 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_wxPixelDataBase, &_swigt__p_wxPixelDataBase,
&_swigt__p_wxPoint, &_swigt__p_wxPoint,
&_swigt__p_wxPoint2D, &_swigt__p_wxPoint2D,
&_swigt__p_wxPoint2DDouble,
&_swigt__p_wxPostScriptDC, &_swigt__p_wxPostScriptDC,
&_swigt__p_wxPrintData, &_swigt__p_wxPrintData,
&_swigt__p_wxPrinterDC, &_swigt__p_wxPrinterDC,
@@ -40162,7 +40155,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_wxPyValidator, &_swigt__p_wxPyValidator,
&_swigt__p_wxQueryNewPaletteEvent, &_swigt__p_wxQueryNewPaletteEvent,
&_swigt__p_wxRect, &_swigt__p_wxRect,
&_swigt__p_wxRect2DDouble, &_swigt__p_wxRect2D,
&_swigt__p_wxRegion, &_swigt__p_wxRegion,
&_swigt__p_wxRegionIterator, &_swigt__p_wxRegionIterator,
&_swigt__p_wxRendererNative, &_swigt__p_wxRendererNative,
@@ -40344,7 +40337,6 @@ static swig_cast_info _swigc__p_wxPenList[] = { {&_swigt__p_wxPenList, 0, 0, 0}
static swig_cast_info _swigc__p_wxPixelDataBase[] = { {&_swigt__p_wxPixelDataBase, 0, 0, 0}, {&_swigt__p_wxNativePixelData, _p_wxNativePixelDataTo_p_wxPixelDataBase, 0, 0}, {&_swigt__p_wxAlphaPixelData, _p_wxAlphaPixelDataTo_p_wxPixelDataBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPixelDataBase[] = { {&_swigt__p_wxPixelDataBase, 0, 0, 0}, {&_swigt__p_wxNativePixelData, _p_wxNativePixelDataTo_p_wxPixelDataBase, 0, 0}, {&_swigt__p_wxAlphaPixelData, _p_wxAlphaPixelDataTo_p_wxPixelDataBase, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint2D[] = { {&_swigt__p_wxPoint2D, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint2D[] = { {&_swigt__p_wxPoint2D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint2DDouble[] = { {&_swigt__p_wxPoint2DDouble, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPostScriptDC[] = { {&_swigt__p_wxPostScriptDC, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPostScriptDC[] = { {&_swigt__p_wxPostScriptDC, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPrintData[] = { {&_swigt__p_wxPrintData, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrintData[] = { {&_swigt__p_wxPrintData, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPrinterDC[] = { {&_swigt__p_wxPrinterDC, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrinterDC[] = { {&_swigt__p_wxPrinterDC, 0, 0, 0},{0, 0, 0, 0}};
@@ -40352,7 +40344,7 @@ static swig_cast_info _swigc__p_wxPseudoDC[] = { {&_swigt__p_wxPseudoDC, 0, 0,
static swig_cast_info _swigc__p_wxPyFontEnumerator[] = { {&_swigt__p_wxPyFontEnumerator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyFontEnumerator[] = { {&_swigt__p_wxPyFontEnumerator, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPyLocale[] = { {&_swigt__p_wxPyLocale, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyLocale[] = { {&_swigt__p_wxPyLocale, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRect[] = { {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRect[] = { {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRect2DDouble[] = { {&_swigt__p_wxRect2DDouble, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRect2D[] = { {&_swigt__p_wxRect2D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRegion[] = { {&_swigt__p_wxRegion, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRegion[] = { {&_swigt__p_wxRegion, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRegionIterator[] = { {&_swigt__p_wxRegionIterator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRegionIterator[] = { {&_swigt__p_wxRegionIterator, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRendererNative[] = { {&_swigt__p_wxRendererNative, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRendererNative[] = { {&_swigt__p_wxRendererNative, 0, 0, 0},{0, 0, 0, 0}};
@@ -40493,7 +40485,6 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_wxPixelDataBase, _swigc__p_wxPixelDataBase,
_swigc__p_wxPoint, _swigc__p_wxPoint,
_swigc__p_wxPoint2D, _swigc__p_wxPoint2D,
_swigc__p_wxPoint2DDouble,
_swigc__p_wxPostScriptDC, _swigc__p_wxPostScriptDC,
_swigc__p_wxPrintData, _swigc__p_wxPrintData,
_swigc__p_wxPrinterDC, _swigc__p_wxPrinterDC,
@@ -40508,7 +40499,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_wxPyValidator, _swigc__p_wxPyValidator,
_swigc__p_wxQueryNewPaletteEvent, _swigc__p_wxQueryNewPaletteEvent,
_swigc__p_wxRect, _swigc__p_wxRect,
_swigc__p_wxRect2DDouble, _swigc__p_wxRect2D,
_swigc__p_wxRegion, _swigc__p_wxRegion,
_swigc__p_wxRegionIterator, _swigc__p_wxRegionIterator,
_swigc__p_wxRendererNative, _swigc__p_wxRendererNative,

4
wxPython/src/mac/_gdi.py
View File

@@ -5368,7 +5368,7 @@ class GraphicsPath(GraphicsObject):
def GetBox(*args, **kwargs): def GetBox(*args, **kwargs):
""" """
GetBox(self) -> wxRect2DDouble 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)
""" """
@@ -5377,7 +5377,7 @@ class GraphicsPath(GraphicsObject):
def Contains(*args): def Contains(*args):
""" """
Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool
Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, Point2D c, int fillStyle=ODDEVEN_RULE) -> bool
Returns ``True`` if the point is within the path. Returns ``True`` if the point is within the path.
""" """

129
wxPython/src/mac/_gdi_wrap.cpp
View File

@@ -2590,52 +2590,51 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
#define SWIGTYPE_p_wxPixelDataBase swig_types[124] #define SWIGTYPE_p_wxPixelDataBase swig_types[124]
#define SWIGTYPE_p_wxPoint swig_types[125] #define SWIGTYPE_p_wxPoint swig_types[125]
#define SWIGTYPE_p_wxPoint2D swig_types[126] #define SWIGTYPE_p_wxPoint2D swig_types[126]
#define SWIGTYPE_p_wxPoint2DDouble swig_types[127] #define SWIGTYPE_p_wxPostScriptDC swig_types[127]
#define SWIGTYPE_p_wxPostScriptDC swig_types[128] #define SWIGTYPE_p_wxPrintData swig_types[128]
#define SWIGTYPE_p_wxPrintData swig_types[129] #define SWIGTYPE_p_wxPrinterDC swig_types[129]
#define SWIGTYPE_p_wxPrinterDC swig_types[130] #define SWIGTYPE_p_wxPseudoDC swig_types[130]
#define SWIGTYPE_p_wxPseudoDC swig_types[131] #define SWIGTYPE_p_wxPyApp swig_types[131]
#define SWIGTYPE_p_wxPyApp swig_types[132] #define SWIGTYPE_p_wxPyCommandEvent swig_types[132]
#define SWIGTYPE_p_wxPyCommandEvent swig_types[133] #define SWIGTYPE_p_wxPyEvent swig_types[133]
#define SWIGTYPE_p_wxPyEvent swig_types[134] #define SWIGTYPE_p_wxPyFontEnumerator swig_types[134]
#define SWIGTYPE_p_wxPyFontEnumerator swig_types[135] #define SWIGTYPE_p_wxPyImageHandler swig_types[135]
#define SWIGTYPE_p_wxPyImageHandler swig_types[136] #define SWIGTYPE_p_wxPyLocale swig_types[136]
#define SWIGTYPE_p_wxPyLocale swig_types[137] #define SWIGTYPE_p_wxPySizer swig_types[137]
#define SWIGTYPE_p_wxPySizer swig_types[138] #define SWIGTYPE_p_wxPyValidator swig_types[138]
#define SWIGTYPE_p_wxPyValidator swig_types[139] #define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[139]
#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[140] #define SWIGTYPE_p_wxRect swig_types[140]
#define SWIGTYPE_p_wxRect swig_types[141] #define SWIGTYPE_p_wxRect2D swig_types[141]
#define SWIGTYPE_p_wxRect2DDouble swig_types[142] #define SWIGTYPE_p_wxRegion swig_types[142]
#define SWIGTYPE_p_wxRegion swig_types[143] #define SWIGTYPE_p_wxRegionIterator swig_types[143]
#define SWIGTYPE_p_wxRegionIterator swig_types[144] #define SWIGTYPE_p_wxRendererNative swig_types[144]
#define SWIGTYPE_p_wxRendererNative swig_types[145] #define SWIGTYPE_p_wxRendererVersion swig_types[145]
#define SWIGTYPE_p_wxRendererVersion swig_types[146] #define SWIGTYPE_p_wxScreenDC swig_types[146]
#define SWIGTYPE_p_wxScreenDC swig_types[147] #define SWIGTYPE_p_wxScrollEvent swig_types[147]
#define SWIGTYPE_p_wxScrollEvent swig_types[148] #define SWIGTYPE_p_wxScrollWinEvent swig_types[148]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[149] #define SWIGTYPE_p_wxSetCursorEvent swig_types[149]
#define SWIGTYPE_p_wxSetCursorEvent swig_types[150] #define SWIGTYPE_p_wxShowEvent swig_types[150]
#define SWIGTYPE_p_wxShowEvent swig_types[151] #define SWIGTYPE_p_wxSize swig_types[151]
#define SWIGTYPE_p_wxSize swig_types[152] #define SWIGTYPE_p_wxSizeEvent swig_types[152]
#define SWIGTYPE_p_wxSizeEvent swig_types[153] #define SWIGTYPE_p_wxSizer swig_types[153]
#define SWIGTYPE_p_wxSizer swig_types[154] #define SWIGTYPE_p_wxSizerItem swig_types[154]
#define SWIGTYPE_p_wxSizerItem swig_types[155] #define SWIGTYPE_p_wxSplitterRenderParams swig_types[155]
#define SWIGTYPE_p_wxSplitterRenderParams swig_types[156] #define SWIGTYPE_p_wxStaticBoxSizer swig_types[156]
#define SWIGTYPE_p_wxStaticBoxSizer swig_types[157] #define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[157]
#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[158] #define SWIGTYPE_p_wxStockGDI swig_types[158]
#define SWIGTYPE_p_wxStockGDI swig_types[159] #define SWIGTYPE_p_wxString swig_types[159]
#define SWIGTYPE_p_wxString swig_types[160] #define SWIGTYPE_p_wxSysColourChangedEvent swig_types[160]
#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[161] #define SWIGTYPE_p_wxTGAHandler swig_types[161]
#define SWIGTYPE_p_wxTGAHandler swig_types[162] #define SWIGTYPE_p_wxTIFFHandler swig_types[162]
#define SWIGTYPE_p_wxTIFFHandler swig_types[163] #define SWIGTYPE_p_wxUpdateUIEvent swig_types[163]
#define SWIGTYPE_p_wxUpdateUIEvent swig_types[164] #define SWIGTYPE_p_wxValidator swig_types[164]
#define SWIGTYPE_p_wxValidator swig_types[165] #define SWIGTYPE_p_wxWindow swig_types[165]
#define SWIGTYPE_p_wxWindow swig_types[166] #define SWIGTYPE_p_wxWindowCreateEvent swig_types[166]
#define SWIGTYPE_p_wxWindowCreateEvent swig_types[167] #define SWIGTYPE_p_wxWindowDC swig_types[167]
#define SWIGTYPE_p_wxWindowDC swig_types[168] #define SWIGTYPE_p_wxWindowDestroyEvent swig_types[168]
#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[169] #define SWIGTYPE_p_wxXPMHandler swig_types[169]
#define SWIGTYPE_p_wxXPMHandler swig_types[170] static swig_type_info *swig_types[171];
static swig_type_info *swig_types[172]; static swig_module_info swig_module = {swig_types, 170, 0, 0, 0, 0};
static swig_module_info swig_module = {swig_types, 171, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -27413,7 +27412,7 @@ fail:
SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
wxRect2DDouble result; wxRect2D result;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
PyObject *swig_obj[1] ; PyObject *swig_obj[1] ;
@@ -27429,7 +27428,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), P
result = ((wxGraphicsPath const *)arg1)->GetBox(); result = ((wxGraphicsPath const *)arg1)->GetBox();
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }
resultobj = SWIG_NewPointerObj((new wxRect2DDouble(static_cast< const wxRect2DDouble& >(result))), SWIGTYPE_p_wxRect2DDouble, SWIG_POINTER_OWN | 0 ); resultobj = SWIG_NewPointerObj((new wxRect2D(static_cast< const wxRect2D& >(result))), SWIGTYPE_p_wxRect2D, SWIG_POINTER_OWN | 0 );
return resultobj; return resultobj;
fail: fail:
return NULL; return NULL;
@@ -27491,13 +27490,12 @@ fail:
SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
wxPoint2DDouble *arg2 = 0 ; wxPoint2D *arg2 = 0 ;
int arg3 = (int) wxODDEVEN_RULE ; int arg3 = (int) wxODDEVEN_RULE ;
bool result; bool result;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
void *argp2 = 0 ; wxPoint2D temp2 ;
int res2 = 0 ;
int val3 ; int val3 ;
int ecode3 = 0 ; int ecode3 = 0 ;
@@ -27507,14 +27505,10 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'");
} }
arg1 = reinterpret_cast< wxGraphicsPath * >(argp1); arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxPoint2DDouble, 0 | 0); {
if (!SWIG_IsOK(res2)) { arg2 = &temp2;
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_Contains" "', expected argument " "2"" of type '" "wxPoint2DDouble const &""'"); if ( ! wxPoint2D_helper(swig_obj[1], &arg2)) SWIG_fail;
} }
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsPath_Contains" "', expected argument " "2"" of type '" "wxPoint2DDouble const &""'");
}
arg2 = reinterpret_cast< wxPoint2DDouble * >(argp2);
if (swig_obj[2]) { if (swig_obj[2]) {
ecode3 = SWIG_AsVal_int(swig_obj[2], &val3); ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) { if (!SWIG_IsOK(ecode3)) {
@@ -27523,7 +27517,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
arg3 = static_cast< int >(val3); arg3 = static_cast< int >(val3);
} }
{ {
result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2DDouble const &)*arg2,arg3); result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2D const &)*arg2,arg3);
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }
{ {
@@ -27544,8 +27538,9 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains(PyObject *self, PyObject *args)
if ((argc >= 2) && (argc <= 3)) { if ((argc >= 2) && (argc <= 3)) {
int _v = 0; int _v = 0;
{ {
int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxPoint2DDouble, 0); {
_v = SWIG_CheckState(res); _v = wxPySimple_typecheck(argv[1], wxT("wxPoint2D"), 2);
}
} }
if (!_v) goto check_1; if (!_v) goto check_1;
if (argc > 2) { if (argc > 2) {
@@ -40214,7 +40209,6 @@ static swig_type_info _swigt__p_wxPenList = {"_p_wxPenList", "wxPenList *", 0, 0
static swig_type_info _swigt__p_wxPixelDataBase = {"_p_wxPixelDataBase", "wxPixelDataBase *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPixelDataBase = {"_p_wxPixelDataBase", "wxPixelDataBase *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint = {"_p_wxPoint", "wxPoint *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPoint = {"_p_wxPoint", "wxPoint *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint2D = {"_p_wxPoint2D", "wxPoint2D *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPoint2D = {"_p_wxPoint2D", "wxPoint2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint2DDouble = {"_p_wxPoint2DDouble", "wxPoint2DDouble *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPostScriptDC = {"_p_wxPostScriptDC", "wxPostScriptDC *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPostScriptDC = {"_p_wxPostScriptDC", "wxPostScriptDC *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0};
@@ -40222,7 +40216,7 @@ static swig_type_info _swigt__p_wxPseudoDC = {"_p_wxPseudoDC", "wxPseudoDC *", 0
static swig_type_info _swigt__p_wxPyFontEnumerator = {"_p_wxPyFontEnumerator", "wxPyFontEnumerator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyFontEnumerator = {"_p_wxPyFontEnumerator", "wxPyFontEnumerator *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPyLocale = {"_p_wxPyLocale", "wxPyLocale *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyLocale = {"_p_wxPyLocale", "wxPyLocale *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRect = {"_p_wxRect", "wxRect *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRect = {"_p_wxRect", "wxRect *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRect2DDouble = {"_p_wxRect2DDouble", "wxRect2DDouble *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRect2D = {"_p_wxRect2D", "wxRect2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRegion = {"_p_wxRegion", "wxRegion *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRegion = {"_p_wxRegion", "wxRegion *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRendererNative = {"_p_wxRendererNative", "wxRendererNative *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRendererNative = {"_p_wxRendererNative", "wxRendererNative *", 0, 0, (void*)0, 0};
@@ -40363,7 +40357,6 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_wxPixelDataBase, &_swigt__p_wxPixelDataBase,
&_swigt__p_wxPoint, &_swigt__p_wxPoint,
&_swigt__p_wxPoint2D, &_swigt__p_wxPoint2D,
&_swigt__p_wxPoint2DDouble,
&_swigt__p_wxPostScriptDC, &_swigt__p_wxPostScriptDC,
&_swigt__p_wxPrintData, &_swigt__p_wxPrintData,
&_swigt__p_wxPrinterDC, &_swigt__p_wxPrinterDC,
@@ -40378,7 +40371,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_wxPyValidator, &_swigt__p_wxPyValidator,
&_swigt__p_wxQueryNewPaletteEvent, &_swigt__p_wxQueryNewPaletteEvent,
&_swigt__p_wxRect, &_swigt__p_wxRect,
&_swigt__p_wxRect2DDouble, &_swigt__p_wxRect2D,
&_swigt__p_wxRegion, &_swigt__p_wxRegion,
&_swigt__p_wxRegionIterator, &_swigt__p_wxRegionIterator,
&_swigt__p_wxRendererNative, &_swigt__p_wxRendererNative,
@@ -40560,7 +40553,6 @@ static swig_cast_info _swigc__p_wxPenList[] = { {&_swigt__p_wxPenList, 0, 0, 0}
static swig_cast_info _swigc__p_wxPixelDataBase[] = { {&_swigt__p_wxPixelDataBase, 0, 0, 0}, {&_swigt__p_wxNativePixelData, _p_wxNativePixelDataTo_p_wxPixelDataBase, 0, 0}, {&_swigt__p_wxAlphaPixelData, _p_wxAlphaPixelDataTo_p_wxPixelDataBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPixelDataBase[] = { {&_swigt__p_wxPixelDataBase, 0, 0, 0}, {&_swigt__p_wxNativePixelData, _p_wxNativePixelDataTo_p_wxPixelDataBase, 0, 0}, {&_swigt__p_wxAlphaPixelData, _p_wxAlphaPixelDataTo_p_wxPixelDataBase, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint2D[] = { {&_swigt__p_wxPoint2D, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint2D[] = { {&_swigt__p_wxPoint2D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint2DDouble[] = { {&_swigt__p_wxPoint2DDouble, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPostScriptDC[] = { {&_swigt__p_wxPostScriptDC, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPostScriptDC[] = { {&_swigt__p_wxPostScriptDC, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPrintData[] = { {&_swigt__p_wxPrintData, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrintData[] = { {&_swigt__p_wxPrintData, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPrinterDC[] = { {&_swigt__p_wxPrinterDC, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrinterDC[] = { {&_swigt__p_wxPrinterDC, 0, 0, 0},{0, 0, 0, 0}};
@@ -40568,7 +40560,7 @@ static swig_cast_info _swigc__p_wxPseudoDC[] = { {&_swigt__p_wxPseudoDC, 0, 0,
static swig_cast_info _swigc__p_wxPyFontEnumerator[] = { {&_swigt__p_wxPyFontEnumerator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyFontEnumerator[] = { {&_swigt__p_wxPyFontEnumerator, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPyLocale[] = { {&_swigt__p_wxPyLocale, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyLocale[] = { {&_swigt__p_wxPyLocale, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRect[] = { {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRect[] = { {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRect2DDouble[] = { {&_swigt__p_wxRect2DDouble, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRect2D[] = { {&_swigt__p_wxRect2D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRegion[] = { {&_swigt__p_wxRegion, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRegion[] = { {&_swigt__p_wxRegion, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRegionIterator[] = { {&_swigt__p_wxRegionIterator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRegionIterator[] = { {&_swigt__p_wxRegionIterator, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRendererNative[] = { {&_swigt__p_wxRendererNative, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRendererNative[] = { {&_swigt__p_wxRendererNative, 0, 0, 0},{0, 0, 0, 0}};
@@ -40709,7 +40701,6 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_wxPixelDataBase, _swigc__p_wxPixelDataBase,
_swigc__p_wxPoint, _swigc__p_wxPoint,
_swigc__p_wxPoint2D, _swigc__p_wxPoint2D,
_swigc__p_wxPoint2DDouble,
_swigc__p_wxPostScriptDC, _swigc__p_wxPostScriptDC,
_swigc__p_wxPrintData, _swigc__p_wxPrintData,
_swigc__p_wxPrinterDC, _swigc__p_wxPrinterDC,
@@ -40724,7 +40715,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_wxPyValidator, _swigc__p_wxPyValidator,
_swigc__p_wxQueryNewPaletteEvent, _swigc__p_wxQueryNewPaletteEvent,
_swigc__p_wxRect, _swigc__p_wxRect,
_swigc__p_wxRect2DDouble, _swigc__p_wxRect2D,
_swigc__p_wxRegion, _swigc__p_wxRegion,
_swigc__p_wxRegionIterator, _swigc__p_wxRegionIterator,
_swigc__p_wxRendererNative, _swigc__p_wxRendererNative,

4
wxPython/src/msw/_gdi.py
View File

@@ -5466,7 +5466,7 @@ class GraphicsPath(GraphicsObject):
def GetBox(*args, **kwargs): def GetBox(*args, **kwargs):
""" """
GetBox(self) -> wxRect2DDouble 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)
""" """
@@ -5475,7 +5475,7 @@ class GraphicsPath(GraphicsObject):
def Contains(*args): def Contains(*args):
""" """
Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool
Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, Point2D c, int fillStyle=ODDEVEN_RULE) -> bool
Returns ``True`` if the point is within the path. Returns ``True`` if the point is within the path.
""" """

129
wxPython/src/msw/_gdi_wrap.cpp
View File

@@ -2590,52 +2590,51 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
#define SWIGTYPE_p_wxPixelDataBase swig_types[124] #define SWIGTYPE_p_wxPixelDataBase swig_types[124]
#define SWIGTYPE_p_wxPoint swig_types[125] #define SWIGTYPE_p_wxPoint swig_types[125]
#define SWIGTYPE_p_wxPoint2D swig_types[126] #define SWIGTYPE_p_wxPoint2D swig_types[126]
#define SWIGTYPE_p_wxPoint2DDouble swig_types[127] #define SWIGTYPE_p_wxPostScriptDC swig_types[127]
#define SWIGTYPE_p_wxPostScriptDC swig_types[128] #define SWIGTYPE_p_wxPrintData swig_types[128]
#define SWIGTYPE_p_wxPrintData swig_types[129] #define SWIGTYPE_p_wxPrinterDC swig_types[129]
#define SWIGTYPE_p_wxPrinterDC swig_types[130] #define SWIGTYPE_p_wxPseudoDC swig_types[130]
#define SWIGTYPE_p_wxPseudoDC swig_types[131] #define SWIGTYPE_p_wxPyApp swig_types[131]
#define SWIGTYPE_p_wxPyApp swig_types[132] #define SWIGTYPE_p_wxPyCommandEvent swig_types[132]
#define SWIGTYPE_p_wxPyCommandEvent swig_types[133] #define SWIGTYPE_p_wxPyEvent swig_types[133]
#define SWIGTYPE_p_wxPyEvent swig_types[134] #define SWIGTYPE_p_wxPyFontEnumerator swig_types[134]
#define SWIGTYPE_p_wxPyFontEnumerator swig_types[135] #define SWIGTYPE_p_wxPyImageHandler swig_types[135]
#define SWIGTYPE_p_wxPyImageHandler swig_types[136] #define SWIGTYPE_p_wxPyLocale swig_types[136]
#define SWIGTYPE_p_wxPyLocale swig_types[137] #define SWIGTYPE_p_wxPySizer swig_types[137]
#define SWIGTYPE_p_wxPySizer swig_types[138] #define SWIGTYPE_p_wxPyValidator swig_types[138]
#define SWIGTYPE_p_wxPyValidator swig_types[139] #define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[139]
#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[140] #define SWIGTYPE_p_wxRect swig_types[140]
#define SWIGTYPE_p_wxRect swig_types[141] #define SWIGTYPE_p_wxRect2D swig_types[141]
#define SWIGTYPE_p_wxRect2DDouble swig_types[142] #define SWIGTYPE_p_wxRegion swig_types[142]
#define SWIGTYPE_p_wxRegion swig_types[143] #define SWIGTYPE_p_wxRegionIterator swig_types[143]
#define SWIGTYPE_p_wxRegionIterator swig_types[144] #define SWIGTYPE_p_wxRendererNative swig_types[144]
#define SWIGTYPE_p_wxRendererNative swig_types[145] #define SWIGTYPE_p_wxRendererVersion swig_types[145]
#define SWIGTYPE_p_wxRendererVersion swig_types[146] #define SWIGTYPE_p_wxScreenDC swig_types[146]
#define SWIGTYPE_p_wxScreenDC swig_types[147] #define SWIGTYPE_p_wxScrollEvent swig_types[147]
#define SWIGTYPE_p_wxScrollEvent swig_types[148] #define SWIGTYPE_p_wxScrollWinEvent swig_types[148]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[149] #define SWIGTYPE_p_wxSetCursorEvent swig_types[149]
#define SWIGTYPE_p_wxSetCursorEvent swig_types[150] #define SWIGTYPE_p_wxShowEvent swig_types[150]
#define SWIGTYPE_p_wxShowEvent swig_types[151] #define SWIGTYPE_p_wxSize swig_types[151]
#define SWIGTYPE_p_wxSize swig_types[152] #define SWIGTYPE_p_wxSizeEvent swig_types[152]
#define SWIGTYPE_p_wxSizeEvent swig_types[153] #define SWIGTYPE_p_wxSizer swig_types[153]
#define SWIGTYPE_p_wxSizer swig_types[154] #define SWIGTYPE_p_wxSizerItem swig_types[154]
#define SWIGTYPE_p_wxSizerItem swig_types[155] #define SWIGTYPE_p_wxSplitterRenderParams swig_types[155]
#define SWIGTYPE_p_wxSplitterRenderParams swig_types[156] #define SWIGTYPE_p_wxStaticBoxSizer swig_types[156]
#define SWIGTYPE_p_wxStaticBoxSizer swig_types[157] #define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[157]
#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[158] #define SWIGTYPE_p_wxStockGDI swig_types[158]
#define SWIGTYPE_p_wxStockGDI swig_types[159] #define SWIGTYPE_p_wxString swig_types[159]
#define SWIGTYPE_p_wxString swig_types[160] #define SWIGTYPE_p_wxSysColourChangedEvent swig_types[160]
#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[161] #define SWIGTYPE_p_wxTGAHandler swig_types[161]
#define SWIGTYPE_p_wxTGAHandler swig_types[162] #define SWIGTYPE_p_wxTIFFHandler swig_types[162]
#define SWIGTYPE_p_wxTIFFHandler swig_types[163] #define SWIGTYPE_p_wxUpdateUIEvent swig_types[163]
#define SWIGTYPE_p_wxUpdateUIEvent swig_types[164] #define SWIGTYPE_p_wxValidator swig_types[164]
#define SWIGTYPE_p_wxValidator swig_types[165] #define SWIGTYPE_p_wxWindow swig_types[165]
#define SWIGTYPE_p_wxWindow swig_types[166] #define SWIGTYPE_p_wxWindowCreateEvent swig_types[166]
#define SWIGTYPE_p_wxWindowCreateEvent swig_types[167] #define SWIGTYPE_p_wxWindowDC swig_types[167]
#define SWIGTYPE_p_wxWindowDC swig_types[168] #define SWIGTYPE_p_wxWindowDestroyEvent swig_types[168]
#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[169] #define SWIGTYPE_p_wxXPMHandler swig_types[169]
#define SWIGTYPE_p_wxXPMHandler swig_types[170] static swig_type_info *swig_types[171];
static swig_type_info *swig_types[172]; static swig_module_info swig_module = {swig_types, 170, 0, 0, 0, 0};
static swig_module_info swig_module = {swig_types, 171, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -28153,7 +28152,7 @@ fail:
SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
wxRect2DDouble result; wxRect2D result;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
PyObject *swig_obj[1] ; PyObject *swig_obj[1] ;
@@ -28169,7 +28168,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), P
result = ((wxGraphicsPath const *)arg1)->GetBox(); result = ((wxGraphicsPath const *)arg1)->GetBox();
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }
resultobj = SWIG_NewPointerObj((new wxRect2DDouble(static_cast< const wxRect2DDouble& >(result))), SWIGTYPE_p_wxRect2DDouble, SWIG_POINTER_OWN | 0 ); resultobj = SWIG_NewPointerObj((new wxRect2D(static_cast< const wxRect2D& >(result))), SWIGTYPE_p_wxRect2D, SWIG_POINTER_OWN | 0 );
return resultobj; return resultobj;
fail: fail:
return NULL; return NULL;
@@ -28231,13 +28230,12 @@ fail:
SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ;
wxPoint2DDouble *arg2 = 0 ; wxPoint2D *arg2 = 0 ;
int arg3 = (int) wxODDEVEN_RULE ; int arg3 = (int) wxODDEVEN_RULE ;
bool result; bool result;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
void *argp2 = 0 ; wxPoint2D temp2 ;
int res2 = 0 ;
int val3 ; int val3 ;
int ecode3 = 0 ; int ecode3 = 0 ;
@@ -28247,14 +28245,10 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'");
} }
arg1 = reinterpret_cast< wxGraphicsPath * >(argp1); arg1 = reinterpret_cast< wxGraphicsPath * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxPoint2DDouble, 0 | 0); {
if (!SWIG_IsOK(res2)) { arg2 = &temp2;
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_Contains" "', expected argument " "2"" of type '" "wxPoint2DDouble const &""'"); if ( ! wxPoint2D_helper(swig_obj[1], &arg2)) SWIG_fail;
} }
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsPath_Contains" "', expected argument " "2"" of type '" "wxPoint2DDouble const &""'");
}
arg2 = reinterpret_cast< wxPoint2DDouble * >(argp2);
if (swig_obj[2]) { if (swig_obj[2]) {
ecode3 = SWIG_AsVal_int(swig_obj[2], &val3); ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) { if (!SWIG_IsOK(ecode3)) {
@@ -28263,7 +28257,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR
arg3 = static_cast< int >(val3); arg3 = static_cast< int >(val3);
} }
{ {
result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2DDouble const &)*arg2,arg3); result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2D const &)*arg2,arg3);
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }
{ {
@@ -28284,8 +28278,9 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains(PyObject *self, PyObject *args)
if ((argc >= 2) && (argc <= 3)) { if ((argc >= 2) && (argc <= 3)) {
int _v = 0; int _v = 0;
{ {
int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxPoint2DDouble, 0); {
_v = SWIG_CheckState(res); _v = wxPySimple_typecheck(argv[1], wxT("wxPoint2D"), 2);
}
} }
if (!_v) goto check_1; if (!_v) goto check_1;
if (argc > 2) { if (argc > 2) {
@@ -40976,7 +40971,6 @@ static swig_type_info _swigt__p_wxPenList = {"_p_wxPenList", "wxPenList *", 0, 0
static swig_type_info _swigt__p_wxPixelDataBase = {"_p_wxPixelDataBase", "wxPixelDataBase *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPixelDataBase = {"_p_wxPixelDataBase", "wxPixelDataBase *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint = {"_p_wxPoint", "wxPoint *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPoint = {"_p_wxPoint", "wxPoint *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint2D = {"_p_wxPoint2D", "wxPoint2D *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPoint2D = {"_p_wxPoint2D", "wxPoint2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPoint2DDouble = {"_p_wxPoint2DDouble", "wxPoint2DDouble *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPostScriptDC = {"_p_wxPostScriptDC", "wxPostScriptDC *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPostScriptDC = {"_p_wxPostScriptDC", "wxPostScriptDC *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0};
@@ -40984,7 +40978,7 @@ static swig_type_info _swigt__p_wxPseudoDC = {"_p_wxPseudoDC", "wxPseudoDC *", 0
static swig_type_info _swigt__p_wxPyFontEnumerator = {"_p_wxPyFontEnumerator", "wxPyFontEnumerator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyFontEnumerator = {"_p_wxPyFontEnumerator", "wxPyFontEnumerator *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxPyLocale = {"_p_wxPyLocale", "wxPyLocale *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPyLocale = {"_p_wxPyLocale", "wxPyLocale *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRect = {"_p_wxRect", "wxRect *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRect = {"_p_wxRect", "wxRect *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRect2DDouble = {"_p_wxRect2DDouble", "wxRect2DDouble *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRect2D = {"_p_wxRect2D", "wxRect2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRegion = {"_p_wxRegion", "wxRegion *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRegion = {"_p_wxRegion", "wxRegion *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxRendererNative = {"_p_wxRendererNative", "wxRendererNative *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRendererNative = {"_p_wxRendererNative", "wxRendererNative *", 0, 0, (void*)0, 0};
@@ -41125,7 +41119,6 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_wxPixelDataBase, &_swigt__p_wxPixelDataBase,
&_swigt__p_wxPoint, &_swigt__p_wxPoint,
&_swigt__p_wxPoint2D, &_swigt__p_wxPoint2D,
&_swigt__p_wxPoint2DDouble,
&_swigt__p_wxPostScriptDC, &_swigt__p_wxPostScriptDC,
&_swigt__p_wxPrintData, &_swigt__p_wxPrintData,
&_swigt__p_wxPrinterDC, &_swigt__p_wxPrinterDC,
@@ -41140,7 +41133,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_wxPyValidator, &_swigt__p_wxPyValidator,
&_swigt__p_wxQueryNewPaletteEvent, &_swigt__p_wxQueryNewPaletteEvent,
&_swigt__p_wxRect, &_swigt__p_wxRect,
&_swigt__p_wxRect2DDouble, &_swigt__p_wxRect2D,
&_swigt__p_wxRegion, &_swigt__p_wxRegion,
&_swigt__p_wxRegionIterator, &_swigt__p_wxRegionIterator,
&_swigt__p_wxRendererNative, &_swigt__p_wxRendererNative,
@@ -41322,7 +41315,6 @@ static swig_cast_info _swigc__p_wxPenList[] = { {&_swigt__p_wxPenList, 0, 0, 0}
static swig_cast_info _swigc__p_wxPixelDataBase[] = { {&_swigt__p_wxPixelDataBase, 0, 0, 0}, {&_swigt__p_wxNativePixelData, _p_wxNativePixelDataTo_p_wxPixelDataBase, 0, 0}, {&_swigt__p_wxAlphaPixelData, _p_wxAlphaPixelDataTo_p_wxPixelDataBase, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPixelDataBase[] = { {&_swigt__p_wxPixelDataBase, 0, 0, 0}, {&_swigt__p_wxNativePixelData, _p_wxNativePixelDataTo_p_wxPixelDataBase, 0, 0}, {&_swigt__p_wxAlphaPixelData, _p_wxAlphaPixelDataTo_p_wxPixelDataBase, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint[] = { {&_swigt__p_wxPoint, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint2D[] = { {&_swigt__p_wxPoint2D, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPoint2D[] = { {&_swigt__p_wxPoint2D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPoint2DDouble[] = { {&_swigt__p_wxPoint2DDouble, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPostScriptDC[] = { {&_swigt__p_wxPostScriptDC, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPostScriptDC[] = { {&_swigt__p_wxPostScriptDC, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPrintData[] = { {&_swigt__p_wxPrintData, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrintData[] = { {&_swigt__p_wxPrintData, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPrinterDC[] = { {&_swigt__p_wxPrinterDC, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPrinterDC[] = { {&_swigt__p_wxPrinterDC, 0, 0, 0},{0, 0, 0, 0}};
@@ -41330,7 +41322,7 @@ static swig_cast_info _swigc__p_wxPseudoDC[] = { {&_swigt__p_wxPseudoDC, 0, 0,
static swig_cast_info _swigc__p_wxPyFontEnumerator[] = { {&_swigt__p_wxPyFontEnumerator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyFontEnumerator[] = { {&_swigt__p_wxPyFontEnumerator, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxPyLocale[] = { {&_swigt__p_wxPyLocale, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyLocale[] = { {&_swigt__p_wxPyLocale, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRect[] = { {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRect[] = { {&_swigt__p_wxRect, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRect2DDouble[] = { {&_swigt__p_wxRect2DDouble, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRect2D[] = { {&_swigt__p_wxRect2D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRegion[] = { {&_swigt__p_wxRegion, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRegion[] = { {&_swigt__p_wxRegion, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRegionIterator[] = { {&_swigt__p_wxRegionIterator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRegionIterator[] = { {&_swigt__p_wxRegionIterator, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxRendererNative[] = { {&_swigt__p_wxRendererNative, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxRendererNative[] = { {&_swigt__p_wxRendererNative, 0, 0, 0},{0, 0, 0, 0}};
@@ -41471,7 +41463,6 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_wxPixelDataBase, _swigc__p_wxPixelDataBase,
_swigc__p_wxPoint, _swigc__p_wxPoint,
_swigc__p_wxPoint2D, _swigc__p_wxPoint2D,
_swigc__p_wxPoint2DDouble,
_swigc__p_wxPostScriptDC, _swigc__p_wxPostScriptDC,
_swigc__p_wxPrintData, _swigc__p_wxPrintData,
_swigc__p_wxPrinterDC, _swigc__p_wxPrinterDC,
@@ -41486,7 +41477,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_wxPyValidator, _swigc__p_wxPyValidator,
_swigc__p_wxQueryNewPaletteEvent, _swigc__p_wxQueryNewPaletteEvent,
_swigc__p_wxRect, _swigc__p_wxRect,
_swigc__p_wxRect2DDouble, _swigc__p_wxRect2D,
_swigc__p_wxRegion, _swigc__p_wxRegion,
_swigc__p_wxRegionIterator, _swigc__p_wxRegionIterator,
_swigc__p_wxRendererNative, _swigc__p_wxRendererNative,