X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c8c7dd3246fdcebc66f0d81940469eb526c8719..70ee369088ef1d54628883a1da7c20b1796d5b94:/wxPython/src/msw/_gdi_wrap.cpp diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index c16c80e994..6de3de8aad 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -2486,155 +2486,154 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxBufferedDC swig_types[20] #define SWIGTYPE_p_wxBufferedPaintDC swig_types[21] #define SWIGTYPE_p_wxCURHandler swig_types[22] -#define SWIGTYPE_p_wxChar swig_types[23] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[24] -#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_wxPoint2DDouble swig_types[127] -#define SWIGTYPE_p_wxPostScriptDC swig_types[128] -#define SWIGTYPE_p_wxPrintData swig_types[129] -#define SWIGTYPE_p_wxPrinterDC swig_types[130] -#define SWIGTYPE_p_wxPseudoDC swig_types[131] -#define SWIGTYPE_p_wxPyApp swig_types[132] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[133] -#define SWIGTYPE_p_wxPyEvent swig_types[134] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[135] -#define SWIGTYPE_p_wxPyImageHandler swig_types[136] -#define SWIGTYPE_p_wxPyLocale swig_types[137] -#define SWIGTYPE_p_wxPySizer swig_types[138] -#define SWIGTYPE_p_wxPyValidator swig_types[139] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[140] -#define SWIGTYPE_p_wxRect swig_types[141] -#define SWIGTYPE_p_wxRect2DDouble swig_types[142] -#define SWIGTYPE_p_wxRegion swig_types[143] -#define SWIGTYPE_p_wxRegionIterator swig_types[144] -#define SWIGTYPE_p_wxRendererNative swig_types[145] -#define SWIGTYPE_p_wxRendererVersion swig_types[146] -#define SWIGTYPE_p_wxScreenDC swig_types[147] -#define SWIGTYPE_p_wxScrollEvent swig_types[148] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[149] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[150] -#define SWIGTYPE_p_wxShowEvent swig_types[151] -#define SWIGTYPE_p_wxSize swig_types[152] -#define SWIGTYPE_p_wxSizeEvent swig_types[153] -#define SWIGTYPE_p_wxSizer swig_types[154] -#define SWIGTYPE_p_wxSizerItem swig_types[155] -#define SWIGTYPE_p_wxSplitterRenderParams swig_types[156] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[157] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[158] -#define SWIGTYPE_p_wxStockGDI swig_types[159] -#define SWIGTYPE_p_wxString swig_types[160] -#define SWIGTYPE_p_wxSysColourChangedEvent 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_wxChildFocusEvent swig_types[23] +#define SWIGTYPE_p_wxClientDC swig_types[24] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[25] +#define SWIGTYPE_p_wxCloseEvent swig_types[26] +#define SWIGTYPE_p_wxColour swig_types[27] +#define SWIGTYPE_p_wxColourDatabase swig_types[28] +#define SWIGTYPE_p_wxCommandEvent swig_types[29] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[30] +#define SWIGTYPE_p_wxControl swig_types[31] +#define SWIGTYPE_p_wxControlWithItems swig_types[32] +#define SWIGTYPE_p_wxCursor swig_types[33] +#define SWIGTYPE_p_wxDC swig_types[34] +#define SWIGTYPE_p_wxDCBrushChanger swig_types[35] +#define SWIGTYPE_p_wxDCClipper swig_types[36] +#define SWIGTYPE_p_wxDCOverlay swig_types[37] +#define SWIGTYPE_p_wxDCPenChanger swig_types[38] +#define SWIGTYPE_p_wxDCTextColourChanger swig_types[39] +#define SWIGTYPE_p_wxDash swig_types[40] +#define SWIGTYPE_p_wxDateEvent swig_types[41] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[42] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[43] +#define SWIGTYPE_p_wxDuplexMode swig_types[44] +#define SWIGTYPE_p_wxEffects swig_types[45] +#define SWIGTYPE_p_wxEncodingConverter swig_types[46] +#define SWIGTYPE_p_wxEraseEvent swig_types[47] +#define SWIGTYPE_p_wxEvent swig_types[48] +#define SWIGTYPE_p_wxEventBlocker 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) @@ -2926,6 +2925,18 @@ SWIGINTERN bool wxPen___ne__(wxPen *self,wxPen const *other){ return other ? (*s #include +// See http://tinyurl.com/e5adr for what premultiplying alpha means. It +// appears to me that the other platforms are already doing it, so I'll just +// automatically do it for wxMSW here. +#ifdef __WXMSW__ +#define wxPy_premultiply(p, a) ((p) * (a) / 0xff) +#define wxPy_unpremultiply(p, a) ((a) ? ((p) * 0xff / (a)) : (p)) +#else +#define wxPy_premultiply(p, a) (p) +#define wxPy_unpremultiply(p, a) (p) +#endif + + #include static char** ConvertListOfStrings(PyObject* listOfStrings) { @@ -2977,20 +2988,67 @@ SWIGINTERN void wxBitmap_SetSize(wxBitmap *self,wxSize const &size){ self->SetWidth(size.x); self->SetHeight(size.y); } -SWIGINTERN bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? (*self == *other) : false; } -SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? (*self != *other) : true; } +SWIGINTERN void wxBitmap_CopyFromBuffer(wxBitmap *self,buffer data,int DATASIZE){ + int height=self->GetHeight(); + int width=self->GetWidth(); -// See http://tinyurl.com/e5adr for what premultiplying alpha means. It -// appears to me that the other platforms are already doing it, so I'll just -// automatically do it for wxMSW here. -#ifdef __WXMSW__ -#define wxPy_premultiply(p, a) ((p) * (a) / 0xff) -#define wxPy_unpremultiply(p, a) ((a) ? ((p) * 0xff / (a)) : (p)) -#else -#define wxPy_premultiply(p, a) (p) -#define wxPy_unpremultiply(p, a) (p) -#endif + if (DATASIZE != width * height * 3) { + wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size."); + } + wxNativePixelData pixData(*self, wxPoint(0,0), wxSize(width, height)); + if (! pixData) { + // raise an exception... + wxPyErr_SetString(PyExc_RuntimeError, + "Failed to gain raw access to bitmap data."); + return; + } + wxNativePixelData::Iterator p(pixData); + for (int y=0; yGetHeight(); + int width=self->GetWidth(); + + if (DATASIZE != width * height * 4) { + wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size."); + } + wxAlphaPixelData pixData(*self, wxPoint(0,0), wxSize(width, height)); + if (! pixData) { + // raise an exception... + wxPyErr_SetString(PyExc_RuntimeError, + "Failed to gain raw access to bitmap data."); + return; + } + + pixData.UseAlpha(); + wxAlphaPixelData::Iterator p(pixData); + for (int y=0; yIsSameAs(*other) : false; } +SWIGINTERN bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? !self->IsSameAs(*other) : true; } wxBitmap* _BitmapFromBufferAlpha(int width, int height, buffer data, int DATASIZE, @@ -3313,8 +3371,8 @@ SWIGINTERN wxLocale *new_wxLocale(int language=-1,int flags=wxLOCALE_LOAD_DEFAUL #endif return loc; } -SWIGINTERN bool wxLocale_Init1(wxLocale *self,wxString const &szName,wxString const &szShort=wxPyEmptyString,wxString const &szLocale=wxPyEmptyString,bool bLoadDefault=true,bool bConvertEncoding=false){ - bool rc = self->Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding); +SWIGINTERN bool wxLocale_Init1(wxLocale *self,wxString const &name,wxString const &shortName=wxPyEmptyString,wxString const &locale=wxPyEmptyString,bool bLoadDefault=true,bool bConvertEncoding=false){ + bool rc = self->Init(name, shortName, locale, bLoadDefault, bConvertEncoding); // Python before 2.4 needs to have LC_NUMERIC set to "C" in order // for the floating point conversions and such to work right. #if PY_VERSION_HEX < 0x02040000 @@ -3337,28 +3395,31 @@ class wxPyLocale : public wxLocale public: wxPyLocale(); - wxPyLocale(const wxChar *szName, // name (for messages) - const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files) - const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale) - bool bLoadDefault = true, // preload wxstd.mo? - bool bConvertEncoding = false); // convert Win<->Unix if necessary? + wxPyLocale(const wxString& name, // name (for messages) + const wxString& shortName = wxPyEmptyString, // dir prefix (for msg files) + const wxString& locale = wxPyEmptyString, // locale (for setlocale) + bool bLoadDefault = true, // preload wxstd.mo? + bool bConvertEncoding = false); // convert Win<->Unix if necessary? wxPyLocale(int language, // wxLanguage id or custom language - int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); + int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); ~wxPyLocale(); - virtual const wxChar *GetString(const wxChar *szOrigString, - const wxChar *szDomain = NULL) const; - virtual const wxChar *GetString(const wxChar *szOrigString, - const wxChar *szOrigString2, size_t n, - const wxChar *szDomain = NULL) const; - - virtual wxChar *GetSingularString(const wxChar *szOrigString, - const wxChar *szDomain = NULL) const; - virtual wxChar *GetPluralString(const wxChar *szOrigString, - const wxChar *szOrigString2, size_t n, - const wxChar *szDomain = NULL) const; + virtual const wxString& GetString(const wxString& origString, + const wxString& domain = wxPyEmptyString) const; + virtual const wxString& GetString(const wxString& origString, + const wxString& origString2, + size_t n, + const wxString& domain = wxPyEmptyString) const; + + virtual const wxString& GetSingularString(const wxString& origString, + const wxString& domain = wxPyEmptyString) const; + virtual const wxString& GetPluralString(const wxString& origString, + const wxString& origString2, + size_t n, + const wxString& domain = wxPyEmptyString) const; + PYPRIVATE; private: @@ -3369,12 +3430,12 @@ wxPyLocale::wxPyLocale() : wxLocale() { } -wxPyLocale::wxPyLocale(const wxChar *szName, // name (for messages) - const wxChar *szShort, // dir prefix (for msg files) - const wxChar *szLocale, // locale (for setlocale) - bool bLoadDefault, // preload wxstd.mo? - bool bConvertEncoding) // convert Win<->Unix if necessary? - : wxLocale(szName, szShort, szLocale, bLoadDefault, bConvertEncoding) +wxPyLocale::wxPyLocale(const wxString& name, // name (for messages) + const wxString& shortName, // dir prefix (for msg files) + const wxString& locale, // locale (for setlocale) + bool bLoadDefault, // preload wxstd.mo? + bool bConvertEncoding) // convert Win<->Unix if necessary? + : wxLocale(name, shortName, locale, bLoadDefault, bConvertEncoding) { } @@ -3387,31 +3448,29 @@ wxPyLocale::~wxPyLocale() { } -const wxChar *wxPyLocale::GetString(const wxChar *szOrigString, - const wxChar *szDomain) const +const wxString& wxPyLocale::GetString(const wxString& origString, + const wxString& domain) const { - wxChar *str = GetSingularString(szOrigString, szDomain); - return (str != NULL) ? str : wxLocale::GetString(szOrigString, szDomain); + return GetSingularString(origString, domain); } -const wxChar *wxPyLocale::GetString(const wxChar *szOrigString, - const wxChar *szOrigString2, size_t n, - const wxChar *szDomain) const +const wxString& wxPyLocale::GetString(const wxString& origString, + const wxString& origString2, + size_t n, + const wxString& domain) const { - wxChar *str = GetPluralString(szOrigString, szOrigString2, n, szDomain); - return (str != NULL) ? str : wxLocale::GetString(szOrigString, szOrigString2, n, szDomain); + return GetPluralString(origString, origString2, n, domain); } -wxChar *wxPyLocale::GetSingularString(const wxChar *szOrigString, - const wxChar *szDomain) const +const wxString& wxPyLocale::GetSingularString(const wxString& origString, + const wxString& domain) const { bool found; - static wxString str; - str = _T("error in translation"); // when the first if condition is true but the second if condition is not we do not want to return the previously queried string. + wxString str( _T("error in translation")); wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) { - PyObject* param1 = wx2PyString(szOrigString); - PyObject* param2 = wx2PyString(szDomain); + if ((found=wxPyCBH_findCallback(m_myInst, "GetSingularString"))) { + PyObject* param1 = wx2PyString(origString); + PyObject* param2 = wx2PyString(domain); PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)", param1, param2)); Py_DECREF(param1); Py_DECREF(param2); @@ -3421,22 +3480,24 @@ wxChar *wxPyLocale::GetSingularString(const wxChar *szOrigString, } } wxPyEndBlockThreads(blocked); - return (found ? (wxChar*)str.c_str() : NULL); + return (found ? str : wxLocale::GetString(origString, domain)); } -wxChar *wxPyLocale::GetPluralString(const wxChar *szOrigString, - const wxChar *szOrigString2, size_t n, - const wxChar *szDomain) const +const wxString& wxPyLocale::GetPluralString(const wxString& origString, + const wxString& origString2, size_t n, + const wxString& domain) const { bool found; - static wxString str; - str = _T("error in translation"); // when the first if condition is true but the second if condition is not we do not want to return the previously queried string. + wxString str( _T("error in translation")); wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) { - PyObject* param1 = wx2PyString(szOrigString); - PyObject* param2 = wx2PyString(szOrigString2); - PyObject* param4 = wx2PyString(szDomain); - PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiO)", param1, param2, (int)n, param4)); + if ((found=wxPyCBH_findCallback(m_myInst, "GetPluralString"))) { + PyObject* param1 = wx2PyString(origString); + PyObject* param2 = wx2PyString(origString2); + PyObject* param4 = wx2PyString(domain); + PyObject* ret = wxPyCBH_callCallbackObj(m_myInst, + Py_BuildValue("(OOiO)", + param1, param2, + (int)n, param4)); Py_DECREF(param1); Py_DECREF(param2); Py_DECREF(param4); @@ -3446,7 +3507,7 @@ wxChar *wxPyLocale::GetPluralString(const wxChar *szOrigString, } } wxPyEndBlockThreads(blocked); - return (found ? (wxChar*)str.c_str() : NULL); + return (found ? str : wxLocale::GetString(origString, origString2, n, domain) ); } SWIGINTERN wxPyLocale *new_wxPyLocale(int language=-1,int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING){ @@ -3556,10 +3617,14 @@ static void wxDC_GetBoundingBox(wxDC* dc, int* x1, int* y1, int* x2, int* y2) { // C++ stub classes for platforms or build configurations that don't have // wxGraphicsContext yet. +class wxGraphicsRenderer; +class wxGraphicsMatrix; + class wxGraphicsObject : public wxObject { public : + wxGraphicsObject() {} wxGraphicsObject( wxGraphicsRenderer* ) { PyErr_SetString(PyExc_NotImplementedError, "wx.GraphicsObject is not available on this platform."); @@ -3574,6 +3639,7 @@ public : class wxGraphicsPen : public wxGraphicsObject { +public: wxGraphicsPen() {} virtual ~wxGraphicsPen() {} } ; @@ -3604,6 +3670,7 @@ wxGraphicsFont wxNullGraphicsFont; class wxGraphicsPath : public wxGraphicsObject { public : + wxGraphicsPath() { } wxGraphicsPath(wxGraphicsRenderer* ) { PyErr_SetString(PyExc_NotImplementedError, "wx.GraphicsPath is not available on this platform."); @@ -3616,10 +3683,10 @@ public : void AddLineToPoint( const wxPoint2DDouble& ) {} void AddCurveToPoint( wxDouble, wxDouble, wxDouble, wxDouble, wxDouble, wxDouble ) {} void AddCurveToPoint( const wxPoint2DDouble&, const wxPoint2DDouble&, const wxPoint2DDouble&) {} - void AddPath( const wxGraphicsPath* ) {} + void AddPath( const wxGraphicsPath& ) {} void CloseSubpath() {} - void GetCurrentPoint( wxDouble&, wxDouble&) {} - wxPoint2DDouble GetCurrentPoint() { reutrn wxPoint2D(0,0); } + void GetCurrentPoint( wxDouble&, wxDouble&) const {} + wxPoint2DDouble GetCurrentPoint() const { return wxPoint2D(0,0); } void AddArc( wxDouble, wxDouble, wxDouble, wxDouble, wxDouble, bool ) {} void AddArc( const wxPoint2DDouble& , wxDouble, wxDouble , wxDouble , bool ) {} @@ -3631,13 +3698,13 @@ public : void AddEllipse( wxDouble , wxDouble , wxDouble , wxDouble ) {} void AddRoundedRectangle( wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {} void * GetNativePath() const { return NULL; } - void UnGetNativePath(void *) {} - void Transform( wxGraphicsMatrix* ) {} - void GetBox(wxDouble *, wxDouble *, wxDouble *, wxDouble *) {} - wxRect2D GetBox() { return wxRect2D(0,0,0,0); } + void UnGetNativePath(void *) const {} + void Transform( const wxGraphicsMatrix& ) {} + void GetBox(wxDouble *, wxDouble *, wxDouble *, wxDouble *) const {} + wxRect2D GetBox() const { return wxRect2D(0,0,0,0); } - bool Contains( wxDouble , wxDouble , int ) { return false; } - bool Contains( const wxPoint2DDouble& , int ) { return false; } + bool Contains( wxDouble , wxDouble , int ) const { return false; } + bool Contains( const wxPoint2DDouble& , int ) const { return false; } }; wxGraphicsPath wxNullGraphicsPath; @@ -3645,23 +3712,26 @@ wxGraphicsPath wxNullGraphicsPath; class wxGraphicsMatrix : public wxGraphicsObject { public : + wxGraphicsMatrix() { } wxGraphicsMatrix(wxGraphicsRenderer* ) { PyErr_SetString(PyExc_NotImplementedError, "wx.GraphicsMatrix is not available on this platform."); } virtual ~wxGraphicsMatrix() {} - virtual void Concat( const wxGraphicsMatrix * ) {} - virtual void Copy( const wxGraphicsMatrix * ) {} + virtual void Concat( const wxGraphicsMatrix & ) {} + virtual void Copy( const wxGraphicsMatrix & ) {} virtual void Set(wxDouble , wxDouble , wxDouble , wxDouble , wxDouble , wxDouble ) {} + virtual void Get(wxDouble*, wxDouble*, wxDouble*, + wxDouble*, wxDouble*, wxDouble*) {} virtual void Invert() {} - virtual bool IsEqual( const wxGraphicsMatrix* t) const {} - virtual bool IsIdentity() { return false; } + virtual bool IsEqual( const wxGraphicsMatrix& t) const { return false; } + virtual bool IsIdentity() const { return false; } virtual void Translate( wxDouble , wxDouble ) {} virtual void Scale( wxDouble , wxDouble ) {} virtual void Rotate( wxDouble ) {} - virtual void TransformPoint( wxDouble *, wxDouble * ) {} - virtual void TransformDistance( wxDouble *, wxDouble * ) {} + virtual void TransformPoint( wxDouble *, wxDouble * ) const {} + virtual void TransformDistance( wxDouble *, wxDouble * ) const {} virtual void * GetNativeMatrix() const { return NULL; } }; wxGraphicsMatrix wxNullGraphicsMatrix; @@ -3678,43 +3748,52 @@ public: virtual ~wxGraphicsContext() {} + static wxGraphicsContext* Create() { + PyErr_SetString(PyExc_NotImplementedError, + "wx.GraphicsContext is not available on this platform."); + return NULL; + } static wxGraphicsContext* Create( const wxWindowDC& ) { PyErr_SetString(PyExc_NotImplementedError, "wx.GraphicsContext is not available on this platform."); + return NULL; } static wxGraphicsContext* CreateFromNative( void * ) { PyErr_SetString(PyExc_NotImplementedError, "wx.GraphicsContext is not available on this platform."); + return NULL; } static wxGraphicsContext* CreateFromNativeWindow( void * ) { PyErr_SetString(PyExc_NotImplementedError, "wx.GraphicsContext is not available on this platform."); + return NULL; } static wxGraphicsContext* Create( wxWindow* ) { PyErr_SetString(PyExc_NotImplementedError, "wx.GraphicsContext is not available on this platform."); + return NULL; } - wxGraphicsPath * CreatePath() { return NULL; } + wxGraphicsPath CreatePath() { return wxNullGraphicsPath; } - virtual wxGraphicsPen CreatePen(const wxPen& ) { return NULL; } + virtual wxGraphicsPen CreatePen(const wxPen& ) { return wxNullGraphicsPen; } - virtual wxGraphicsBrush CreateBrush(const wxBrush& ) { return NULL; } + virtual wxGraphicsBrush CreateBrush(const wxBrush& ) { return wxNullGraphicsBrush; } virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble , wxDouble , wxDouble , wxDouble , - const wxColour&, const wxColour&) { return NULL; } + const wxColour&, const wxColour&) { return wxNullGraphicsBrush; } virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, - const wxColour &oColor, const wxColour &cColor) { return NULL; } + const wxColour &oColor, const wxColour &cColor) { return wxNullGraphicsBrush; } - virtual wxGraphicsFont CreateFont( const wxFont &, const wxColour & ) { return NULL; } + virtual wxGraphicsFont CreateFont( const wxFont &, const wxColour & ) { return wxNullGraphicsFont; } - virtual wxGraphicsMatrix* CreateMatrix( wxDouble, wxDouble, wxDouble, wxDouble, - wxDouble, wxDouble) { return NULL; } + virtual wxGraphicsMatrix CreateMatrix( wxDouble, wxDouble, wxDouble, wxDouble, + wxDouble, wxDouble) { return wxNullGraphicsMatrix; } virtual void PushState() {} virtual void PopState() {} @@ -3722,12 +3801,14 @@ public: virtual void Clip( wxDouble , wxDouble , wxDouble , wxDouble ) {} virtual void ResetClip() {} virtual void * GetNativeContext() { return NULL; } + virtual int GetLogicalFunction() const { return 0; } + virtual bool SetLogicalFunction(int ) {} virtual void Translate( wxDouble , wxDouble ) {} virtual void Scale( wxDouble , wxDouble ) {} virtual void Rotate( wxDouble ) {} - virtual void ConcatTransform( const wxGraphicsMatrix* ) {} - virtual void SetTransform( const wxGraphicsMatrix* ) {} - virtual void GetTransform( wxGraphicsMatrix* ) {} + virtual void ConcatTransform( const wxGraphicsMatrix& ) {} + virtual void SetTransform( const wxGraphicsMatrix& ) {} + virtual wxGraphicsMatrix GetTransform() const { return wxNullGraphicsMatrix; } virtual void SetPen( const wxGraphicsPen& ) {} void SetPen( const wxPen& ) {} @@ -3738,12 +3819,14 @@ public: virtual void SetFont( const wxGraphicsFont& ) {} void SetFont( const wxFont&, const wxColour& ) {} - virtual void StrokePath( const wxGraphicsPath * ) {} - virtual void FillPath( const wxGraphicsPath *, int ) {} - virtual void DrawPath( const wxGraphicsPath *, int ) {} + virtual void StrokePath( const wxGraphicsPath & ) {} + virtual void FillPath( const wxGraphicsPath &, int ) {} + virtual void DrawPath( const wxGraphicsPath &, int ) {} virtual void DrawText( const wxString &, wxDouble , wxDouble ) {} virtual void DrawText( const wxString &, wxDouble , wxDouble , wxDouble ) {} + virtual void DrawText( const wxString &, wxDouble , wxDouble , wxGraphicsBrush ) {} + virtual void DrawText( const wxString &, wxDouble , wxDouble , wxDouble , wxGraphicsBrush ) {} virtual void GetTextExtent( const wxString &, wxDouble *, wxDouble *, wxDouble *, wxDouble * ) const {} virtual void GetPartialTextExtents(const wxString& , wxArrayDouble& ) const {} @@ -3757,7 +3840,7 @@ public: virtual void DrawLines( size_t , const wxPoint2DDouble *, int ) {} virtual void DrawRectangle( 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; } }; @@ -3772,28 +3855,30 @@ public : virtual ~wxGraphicsRenderer() {} - static wxGraphicsRenderer* GetDefaultRenderer( + static wxGraphicsRenderer* GetDefaultRenderer() { PyErr_SetString(PyExc_NotImplementedError, "wx.GraphicsRenderer is not available on this platform."); - ); + return NULL; + } virtual wxGraphicsContext * CreateContext( const wxWindowDC& ) { return NULL; } virtual wxGraphicsContext * CreateContextFromNativeContext( void * ) { return NULL; } virtual wxGraphicsContext * CreateContextFromNativeWindow( void * ) { return NULL; } virtual wxGraphicsContext * CreateContext( wxWindow* ) { return NULL; } + virtual wxGraphicsContext * CreateMeasuringContext() { return NULL; } - virtual wxGraphicsPath * CreatePath() { return NULL; } + virtual wxGraphicsPath CreatePath() { return wxNullGraphicsPath; } - virtual wxGraphicsMatrix * CreateMatrix( wxDouble , wxDouble , wxDouble , wxDouble , - wxDouble , wxDouble ) { return NULL; } + virtual wxGraphicsMatrix CreateMatrix( wxDouble , wxDouble , wxDouble , wxDouble , + wxDouble , wxDouble ) { return wxNullGraphicsMatrix; } - virtual wxGraphicsPen CreatePen(const wxPen& ) { return wxNullGaphicsPen; } - virtual wxGraphicsBrush CreateBrush(const wxBrush& ) { return wxNullGaphicsBrush; } - virtual wxGraphicsBrush CreateLinearGradientBrush(xDouble , wxDouble , wxDouble , wxDouble , - const wxColour&, const wxColour&) { return wxNullGaphicsBrush; } + virtual wxGraphicsPen CreatePen(const wxPen& ) { return wxNullGraphicsPen; } + virtual wxGraphicsBrush CreateBrush(const wxBrush& ) { return wxNullGraphicsBrush; } + virtual wxGraphicsBrush CreateLinearGradientBrush(wxDouble , wxDouble , wxDouble , wxDouble , + const wxColour&, const wxColour&) { return wxNullGraphicsBrush; } virtual wxGraphicsBrush CreateRadialGradientBrush(wxDouble , wxDouble , wxDouble , wxDouble , wxDouble , - const wxColour &, const wxColour &) { return wxNullGaphicsBrush; } - virtual wxGraphicsFont CreateFont( const wxFont & , const wxColour & ) { return wxNullGaphicsFont; } + const wxColour &, const wxColour &) { return wxNullGraphicsBrush; } + virtual wxGraphicsFont CreateFont( const wxFont & , const wxColour & ) { return wxNullGraphicsFont; } }; @@ -3808,6 +3893,13 @@ public: wxPyEndBlockThreads(blocked); } + wxGCDC(const wxWindow*) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "wxGCDC is not available on this platform."); + wxPyEndBlockThreads(blocked); + } + wxGCDC() { wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, @@ -3823,8 +3915,17 @@ public: #endif -SWIGINTERN void wxGraphicsMatrix_Copy(wxGraphicsMatrix *self,wxGraphicsMatrix const &t){ - *self = t; +SWIGINTERN void wxGraphicsContext_DrawText(wxGraphicsContext *self,wxString const &str,wxDouble x,wxDouble y,wxGraphicsBrush const &backgroundBrush=wxNullGraphicsBrush){ + if ( !backgroundBrush.IsNull() ) + self->DrawText(str, x, y, backgroundBrush); + else + self->DrawText(str, x, y); + } +SWIGINTERN void wxGraphicsContext_DrawRotatedText(wxGraphicsContext *self,wxString const &str,wxDouble x,wxDouble y,wxDouble angle,wxGraphicsBrush const &backgroundBrush=wxNullGraphicsBrush){ + if ( !backgroundBrush.IsNull() ) + self->DrawText(str, x, y, angle, backgroundBrush); + else + self->DrawText(str, x, y, angle); } SWIGINTERN PyObject *wxGraphicsContext_GetTextExtent(wxGraphicsContext *self,wxString const &text){ wxDouble width = 0.0, @@ -7086,6 +7187,76 @@ fail: } +SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBuffer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxBitmap *arg1 = (wxBitmap *) 0 ; + buffer arg2 ; + int arg3 ; + void *argp1 = 0 ; + int res1 = 0 ; + Py_ssize_t temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "data", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBuffer",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBitmap, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bitmap_CopyFromBuffer" "', expected argument " "1"" of type '" "wxBitmap *""'"); + } + arg1 = reinterpret_cast< wxBitmap * >(argp1); + { + if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail; + arg3 = (int)temp2; + } + { + wxBitmap_CopyFromBuffer(arg1,arg2,arg3); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_Bitmap_CopyFromBufferRGBA(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxBitmap *arg1 = (wxBitmap *) 0 ; + buffer arg2 ; + int arg3 ; + void *argp1 = 0 ; + int res1 = 0 ; + Py_ssize_t temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "data", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap_CopyFromBufferRGBA",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBitmap, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Bitmap_CopyFromBufferRGBA" "', expected argument " "1"" of type '" "wxBitmap *""'"); + } + arg1 = reinterpret_cast< wxBitmap * >(argp1); + { + if (PyObject_AsReadBuffer(obj1, (const void**)(&arg2), &temp2) == -1) SWIG_fail; + arg3 = (int)temp2; + } + { + wxBitmap_CopyFromBufferRGBA(arg1,arg2,arg3); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Bitmap___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxBitmap *arg1 = (wxBitmap *) 0 ; @@ -15953,10 +16124,10 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ; PyObject *arg2 = (PyObject *) 0 ; PyObject *arg3 = (PyObject *) 0 ; - bool arg4 ; + int arg4 = (int) 0 ; void *argp1 = 0 ; int res1 = 0 ; - bool val4 ; + int val4 ; int ecode4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -15966,7 +16137,7 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FontEnumerator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:FontEnumerator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); @@ -15974,11 +16145,13 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1); arg2 = obj1; arg3 = obj2; - ecode4 = SWIG_AsVal_bool(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "4"" of type '" "bool""'"); - } - arg4 = static_cast< bool >(val4); + if (obj3) { + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); (arg1)->_setCallbackInfo(arg2,arg3,arg4); @@ -16473,7 +16646,7 @@ SWIGINTERN PyObject *_wrap_Locale_Init1(PyObject *SWIGUNUSEDPARM(self), PyObject PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szName",(char *) "szShort",(char *) "szLocale",(char *) "bLoadDefault",(char *) "bConvertEncoding", NULL + (char *) "self",(char *) "name",(char *) "shortName",(char *) "locale",(char *) "bLoadDefault",(char *) "bConvertEncoding", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOOO:Locale_Init1",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; @@ -16875,7 +17048,7 @@ SWIGINTERN PyObject *_wrap_Locale_AddCatalog(PyObject *SWIGUNUSEDPARM(self), PyO PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szDomain", NULL + (char *) "self",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Locale_AddCatalog",kwnames,&obj0,&obj1)) SWIG_fail; @@ -16955,7 +17128,7 @@ SWIGINTERN PyObject *_wrap_Locale_IsLoaded(PyObject *SWIGUNUSEDPARM(self), PyObj PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szDomain", NULL + (char *) "self",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Locale_IsLoaded",kwnames,&obj0,&obj1)) SWIG_fail; @@ -17142,7 +17315,7 @@ SWIGINTERN PyObject *_wrap_Locale_GetString(PyObject *SWIGUNUSEDPARM(self), PyOb PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szOrigString",(char *) "szDomain", NULL + (char *) "self",(char *) "origString",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Locale_GetString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; @@ -17355,20 +17528,19 @@ fail: SWIGINTERN PyObject *_wrap_PyLocale_GetSingularString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyLocale *arg1 = (wxPyLocale *) 0 ; - wxChar *arg2 = (wxChar *) 0 ; - wxChar *arg3 = (wxChar *) NULL ; - wxChar *result = 0 ; + wxString *arg2 = 0 ; + wxString const &arg3_defvalue = wxPyEmptyString ; + wxString *arg3 = (wxString *) &arg3_defvalue ; + wxString *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + bool temp2 = false ; + bool temp3 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szOrigString",(char *) "szDomain", NULL + (char *) "self",(char *) "origString",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:PyLocale_GetSingularString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; @@ -17377,27 +17549,52 @@ SWIGINTERN PyObject *_wrap_PyLocale_GetSingularString(PyObject *SWIGUNUSEDPARM(s SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyLocale_GetSingularString" "', expected argument " "1"" of type '" "wxPyLocale const *""'"); } arg1 = reinterpret_cast< wxPyLocale * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyLocale_GetSingularString" "', expected argument " "2"" of type '" "wxChar const *""'"); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; } - arg2 = reinterpret_cast< wxChar * >(argp2); if (obj2) { - res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PyLocale_GetSingularString" "', expected argument " "3"" of type '" "wxChar const *""'"); + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; } - arg3 = reinterpret_cast< wxChar * >(argp3); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChar *)((wxPyLocale const *)arg1)->GetSingularString((wxChar const *)arg2,(wxChar const *)arg3); + { + wxString const &_result_ref = ((wxPyLocale const *)arg1)->GetSingularString((wxString const &)*arg2,(wxString const &)*arg3); + result = (wxString *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxChar, 0 | 0 ); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } + { + if (temp2) + delete arg2; + } + { + if (temp3) + delete arg3; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } + { + if (temp3) + delete arg3; + } return NULL; } @@ -17405,28 +17602,26 @@ fail: SWIGINTERN PyObject *_wrap_PyLocale_GetPluralString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyLocale *arg1 = (wxPyLocale *) 0 ; - wxChar *arg2 = (wxChar *) 0 ; - wxChar *arg3 = (wxChar *) 0 ; + wxString *arg2 = 0 ; + wxString *arg3 = 0 ; size_t arg4 ; - wxChar *arg5 = (wxChar *) NULL ; - wxChar *result = 0 ; + wxString const &arg5_defvalue = wxPyEmptyString ; + wxString *arg5 = (wxString *) &arg5_defvalue ; + wxString *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - void *argp3 = 0 ; - int res3 = 0 ; + bool temp2 = false ; + bool temp3 = false ; size_t val4 ; int ecode4 = 0 ; - void *argp5 = 0 ; - int res5 = 0 ; + bool temp5 = false ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "szOrigString",(char *) "szOrigString2",(char *) "n",(char *) "szDomain", NULL + (char *) "self",(char *) "origString",(char *) "origString2",(char *) "n",(char *) "domain", NULL }; if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:PyLocale_GetPluralString",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; @@ -17435,37 +17630,70 @@ SWIGINTERN PyObject *_wrap_PyLocale_GetPluralString(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyLocale_GetPluralString" "', expected argument " "1"" of type '" "wxPyLocale const *""'"); } arg1 = reinterpret_cast< wxPyLocale * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PyLocale_GetPluralString" "', expected argument " "2"" of type '" "wxChar const *""'"); + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; } - arg2 = reinterpret_cast< wxChar * >(argp2); - res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res3)) { - SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PyLocale_GetPluralString" "', expected argument " "3"" of type '" "wxChar const *""'"); + { + arg3 = wxString_in_helper(obj2); + if (arg3 == NULL) SWIG_fail; + temp3 = true; } - arg3 = reinterpret_cast< wxChar * >(argp3); ecode4 = SWIG_AsVal_size_t(obj3, &val4); if (!SWIG_IsOK(ecode4)) { SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyLocale_GetPluralString" "', expected argument " "4"" of type '" "size_t""'"); } arg4 = static_cast< size_t >(val4); if (obj4) { - res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_wxChar, 0 | 0 ); - if (!SWIG_IsOK(res5)) { - SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "PyLocale_GetPluralString" "', expected argument " "5"" of type '" "wxChar const *""'"); + { + arg5 = wxString_in_helper(obj4); + if (arg5 == NULL) SWIG_fail; + temp5 = true; } - arg5 = reinterpret_cast< wxChar * >(argp5); } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxChar *)((wxPyLocale const *)arg1)->GetPluralString((wxChar const *)arg2,(wxChar const *)arg3,arg4,(wxChar const *)arg5); + { + wxString const &_result_ref = ((wxPyLocale const *)arg1)->GetPluralString((wxString const &)*arg2,(wxString const &)*arg3,arg4,(wxString const &)*arg5); + result = (wxString *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxChar, 0 | 0 ); + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar(result->c_str(), result->Len()); +#else + resultobj = PyString_FromStringAndSize(result->c_str(), result->Len()); +#endif + } + { + if (temp2) + delete arg2; + } + { + if (temp3) + delete arg3; + } + { + if (temp5) + delete arg5; + } return resultobj; fail: + { + if (temp2) + delete arg2; + } + { + if (temp3) + delete arg3; + } + { + if (temp5) + delete arg5; + } return NULL; } @@ -20337,6 +20565,305 @@ fail: } +SWIGINTERN PyObject *_wrap_DC_StretchBlit(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDC *arg1 = (wxDC *) 0 ; + int arg2 ; + int arg3 ; + int arg4 ; + int arg5 ; + wxDC *arg6 = (wxDC *) 0 ; + int arg7 ; + int arg8 ; + int arg9 ; + int arg10 ; + int arg11 = (int) wxCOPY ; + bool arg12 = (bool) false ; + int arg13 = (int) wxDefaultCoord ; + int arg14 = (int) wxDefaultCoord ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + int val3 ; + int ecode3 = 0 ; + int val4 ; + int ecode4 = 0 ; + int val5 ; + int ecode5 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; + int val7 ; + int ecode7 = 0 ; + int val8 ; + int ecode8 = 0 ; + int val9 ; + int ecode9 = 0 ; + int val10 ; + int ecode10 = 0 ; + int val11 ; + int ecode11 = 0 ; + bool val12 ; + int ecode12 = 0 ; + int val13 ; + int ecode13 = 0 ; + int val14 ; + int ecode14 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; + PyObject * obj10 = 0 ; + PyObject * obj11 = 0 ; + PyObject * obj12 = 0 ; + PyObject * obj13 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "dstX",(char *) "dstY",(char *) "dstWidth",(char *) "dstHeight",(char *) "source",(char *) "srcX",(char *) "srcY",(char *) "srcWidth",(char *) "srcHeight",(char *) "rop",(char *) "useMask",(char *) "srcMaskX",(char *) "srcMaskY", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOOO|OOOO:DC_StretchBlit",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_StretchBlit" "', expected argument " "1"" of type '" "wxDC *""'"); + } + arg1 = reinterpret_cast< wxDC * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DC_StretchBlit" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + ecode3 = SWIG_AsVal_int(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DC_StretchBlit" "', expected argument " "3"" of type '" "int""'"); + } + arg3 = static_cast< int >(val3); + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DC_StretchBlit" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + ecode5 = SWIG_AsVal_int(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "DC_StretchBlit" "', expected argument " "5"" of type '" "int""'"); + } + arg5 = static_cast< int >(val5); + res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "DC_StretchBlit" "', expected argument " "6"" of type '" "wxDC *""'"); + } + arg6 = reinterpret_cast< wxDC * >(argp6); + ecode7 = SWIG_AsVal_int(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "DC_StretchBlit" "', expected argument " "7"" of type '" "int""'"); + } + arg7 = static_cast< int >(val7); + ecode8 = SWIG_AsVal_int(obj7, &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "DC_StretchBlit" "', expected argument " "8"" of type '" "int""'"); + } + arg8 = static_cast< int >(val8); + ecode9 = SWIG_AsVal_int(obj8, &val9); + if (!SWIG_IsOK(ecode9)) { + SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "DC_StretchBlit" "', expected argument " "9"" of type '" "int""'"); + } + arg9 = static_cast< int >(val9); + ecode10 = SWIG_AsVal_int(obj9, &val10); + if (!SWIG_IsOK(ecode10)) { + SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "DC_StretchBlit" "', expected argument " "10"" of type '" "int""'"); + } + arg10 = static_cast< int >(val10); + if (obj10) { + ecode11 = SWIG_AsVal_int(obj10, &val11); + if (!SWIG_IsOK(ecode11)) { + SWIG_exception_fail(SWIG_ArgError(ecode11), "in method '" "DC_StretchBlit" "', expected argument " "11"" of type '" "int""'"); + } + arg11 = static_cast< int >(val11); + } + if (obj11) { + ecode12 = SWIG_AsVal_bool(obj11, &val12); + if (!SWIG_IsOK(ecode12)) { + SWIG_exception_fail(SWIG_ArgError(ecode12), "in method '" "DC_StretchBlit" "', expected argument " "12"" of type '" "bool""'"); + } + arg12 = static_cast< bool >(val12); + } + if (obj12) { + ecode13 = SWIG_AsVal_int(obj12, &val13); + if (!SWIG_IsOK(ecode13)) { + SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "DC_StretchBlit" "', expected argument " "13"" of type '" "int""'"); + } + arg13 = static_cast< int >(val13); + } + if (obj13) { + ecode14 = SWIG_AsVal_int(obj13, &val14); + if (!SWIG_IsOK(ecode14)) { + SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "DC_StretchBlit" "', expected argument " "14"" of type '" "int""'"); + } + arg14 = static_cast< int >(val14); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->StretchBlit(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_DC_StretchBlitPointSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDC *arg1 = (wxDC *) 0 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxDC *arg4 = (wxDC *) 0 ; + wxPoint *arg5 = 0 ; + wxSize *arg6 = 0 ; + int arg7 = (int) wxCOPY ; + bool arg8 = (bool) false ; + wxPoint const &arg9_defvalue = wxDefaultPosition ; + wxPoint *arg9 = (wxPoint *) &arg9_defvalue ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; + void *argp4 = 0 ; + int res4 = 0 ; + wxPoint temp5 ; + wxSize temp6 ; + int val7 ; + int ecode7 = 0 ; + bool val8 ; + int ecode8 = 0 ; + wxPoint temp9 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; + PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "dstPt",(char *) "dstSize",(char *) "source",(char *) "srcPt",(char *) "srcSize",(char *) "rop",(char *) "useMask",(char *) "srcMaskPt", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO|OOO:DC_StretchBlitPointSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_StretchBlitPointSize" "', expected argument " "1"" of type '" "wxDC *""'"); + } + arg1 = reinterpret_cast< wxDC * >(argp1); + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DC_StretchBlitPointSize" "', expected argument " "4"" of type '" "wxDC *""'"); + } + arg4 = reinterpret_cast< wxDC * >(argp4); + { + arg5 = &temp5; + if ( ! wxPoint_helper(obj4, &arg5)) SWIG_fail; + } + { + arg6 = &temp6; + if ( ! wxSize_helper(obj5, &arg6)) SWIG_fail; + } + if (obj6) { + ecode7 = SWIG_AsVal_int(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "DC_StretchBlitPointSize" "', expected argument " "7"" of type '" "int""'"); + } + arg7 = static_cast< int >(val7); + } + if (obj7) { + ecode8 = SWIG_AsVal_bool(obj7, &val8); + if (!SWIG_IsOK(ecode8)) { + SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "DC_StretchBlitPointSize" "', expected argument " "8"" of type '" "bool""'"); + } + arg8 = static_cast< bool >(val8); + } + if (obj8) { + { + arg9 = &temp9; + if ( ! wxPoint_helper(obj8, &arg9)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->StretchBlit((wxPoint const &)*arg2,(wxSize const &)*arg3,arg4,(wxPoint const &)*arg5,(wxSize const &)*arg6,arg7,arg8,(wxPoint const &)*arg9); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_DC_GetAsBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDC *arg1 = (wxDC *) 0 ; + wxRect *arg2 = (wxRect *) NULL ; + SwigValueWrapper result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "subrect", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:DC_GetAsBitmap",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_GetAsBitmap" "', expected argument " "1"" of type '" "wxDC const *""'"); + } + arg1 = reinterpret_cast< wxDC * >(argp1); + if (obj1) { + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxRect, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DC_GetAsBitmap" "', expected argument " "2"" of type '" "wxRect const *""'"); + } + arg2 = reinterpret_cast< wxRect * >(argp2); + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxDC const *)arg1)->GetAsBitmap((wxRect const *)arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_DC_SetClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxDC *arg1 = (wxDC *) 0 ; @@ -24431,126 +24958,6 @@ SWIGINTERN PyObject *DCClipper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxBitmap const &arg1_defvalue = wxNullBitmap ; - wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ; - wxMemoryDC *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "bitmap", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail; - if (obj0) { - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 | 0); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap const &""'"); - } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap const &""'"); - } - arg1 = reinterpret_cast< wxBitmap * >(argp1); - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMemoryDC *)new wxMemoryDC((wxBitmap const &)*arg1); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxDC *arg1 = (wxDC *) 0 ; - wxMemoryDC *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "oldDC", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); - } - arg1 = reinterpret_cast< wxDC * >(argp1); - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMemoryDC *)new wxMemoryDC(arg1); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; - wxBitmap *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "bitmap", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); - } - arg1 = reinterpret_cast< wxMemoryDC * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap const &""'"); - } - arg2 = reinterpret_cast< wxBitmap * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectObject((wxBitmap const &)*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - SWIGINTERN PyObject *_wrap_new_ScreenDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxScreenDC *result = 0 ; @@ -24821,10 +25228,171 @@ SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject * return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxBitmap &arg1_defvalue = wxNullBitmap ; + wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ; + wxMemoryDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "bitmap", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail; + if (obj0) { + res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); + } + if (!argp1) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); + } + arg1 = reinterpret_cast< wxBitmap * >(argp1); + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMemoryDC *)new wxMemoryDC(*arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDC *arg1 = (wxDC *) 0 ; + wxMemoryDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "oldDC", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); + } + arg1 = reinterpret_cast< wxDC * >(argp1); + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMemoryDC *)new wxMemoryDC(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; + wxBitmap *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "bitmap", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); + } + arg1 = reinterpret_cast< wxMemoryDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectObject(*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; + wxBitmap *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "bmp", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); + } + arg1 = reinterpret_cast< wxMemoryDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxDC *arg1 = (wxDC *) 0 ; - wxBitmap const &arg2_defvalue = wxNullBitmap ; + wxBitmap &arg2_defvalue = wxNullBitmap ; wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedDC *result = 0 ; @@ -24842,12 +25410,12 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self) } arg1 = reinterpret_cast< wxDC * >(argp1); if (swig_obj[1]) { - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxBitmap, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); } arg2 = reinterpret_cast< wxBitmap * >(argp2); } @@ -24861,7 +25429,7 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self) { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxBitmap const &)*arg2,arg3); + result = (wxBufferedDC *)new wxBufferedDC(arg1,*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -24925,7 +25493,8 @@ SWIGINTERN PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { int _v = 0; if (argc > 1) { { - int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_wxBitmap, 0); + void *vptr = 0; + int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_wxBitmap, 0); _v = SWIG_CheckState(res); } if (!_v) goto check_1; @@ -24999,6 +25568,72 @@ fail: } +SWIGINTERN PyObject *_wrap_BufferedDC_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxBufferedDC *arg1 = (wxBufferedDC *) 0 ; + int arg2 ; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "style", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BufferedDC_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBufferedDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_SetStyle" "', expected argument " "1"" of type '" "wxBufferedDC *""'"); + } + arg1 = reinterpret_cast< wxBufferedDC * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BufferedDC_SetStyle" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetStyle(arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_BufferedDC_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxBufferedDC *arg1 = (wxBufferedDC *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBufferedDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BufferedDC_GetStyle" "', expected argument " "1"" of type '" "wxBufferedDC const *""'"); + } + arg1 = reinterpret_cast< wxBufferedDC * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxBufferedDC const *)arg1)->GetStyle(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *BufferedDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -25013,7 +25648,7 @@ SWIGINTERN PyObject *BufferedDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxWindow *arg1 = (wxWindow *) 0 ; - wxBitmap const &arg2_defvalue = wxNullBitmap ; + wxBitmap &arg2_defvalue = wxNullBitmap ; wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; int arg3 = (int) wxBUFFER_CLIENT_AREA ; wxBufferedPaintDC *result = 0 ; @@ -25037,12 +25672,12 @@ SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), P } arg1 = reinterpret_cast< wxWindow * >(argp1); if (obj1) { - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 ); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_BufferedPaintDC" "', expected argument " "2"" of type '" "wxBitmap &""'"); } arg2 = reinterpret_cast< wxBitmap * >(argp2); } @@ -25056,7 +25691,7 @@ SWIGINTERN PyObject *_wrap_new_BufferedPaintDC(PyObject *SWIGUNUSEDPARM(self), P { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2,arg3); + result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,*arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -26165,45 +26800,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsMatrix_Copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; - wxGraphicsMatrix *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "t", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsMatrix_Copy",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_Copy" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); - } - arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxGraphicsMatrix, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsMatrix_Copy" "', expected argument " "2"" of type '" "wxGraphicsMatrix const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsMatrix_Copy" "', expected argument " "2"" of type '" "wxGraphicsMatrix const &""'"); - } - arg2 = reinterpret_cast< wxGraphicsMatrix * >(argp2); - { - wxGraphicsMatrix_Copy(arg1,(wxGraphicsMatrix const &)*arg2); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_GraphicsMatrix_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; @@ -26297,6 +26893,91 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsMatrix_Get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; + wxDouble *arg2 = (wxDouble *) 0 ; + wxDouble *arg3 = (wxDouble *) 0 ; + wxDouble *arg4 = (wxDouble *) 0 ; + wxDouble *arg5 = (wxDouble *) 0 ; + wxDouble *arg6 = (wxDouble *) 0 ; + wxDouble *arg7 = (wxDouble *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + wxDouble temp2 ; + int res2 = SWIG_TMPOBJ ; + wxDouble temp3 ; + int res3 = SWIG_TMPOBJ ; + wxDouble temp4 ; + int res4 = SWIG_TMPOBJ ; + wxDouble temp5 ; + int res5 = SWIG_TMPOBJ ; + wxDouble temp6 ; + int res6 = SWIG_TMPOBJ ; + wxDouble temp7 ; + int res7 = SWIG_TMPOBJ ; + PyObject *swig_obj[1] ; + + arg2 = &temp2; + arg3 = &temp3; + arg4 = &temp4; + arg5 = &temp5; + arg6 = &temp6; + arg7 = &temp7; + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_Get" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); + } + arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1); + { + (arg1)->Get(arg2,arg3,arg4,arg5,arg6,arg7); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + if (SWIG_IsTmpObj(res2)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_double((*arg2))); + } else { + int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_double, new_flags)); + } + if (SWIG_IsTmpObj(res3)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_double((*arg3))); + } else { + int new_flags = SWIG_IsNewObj(res3) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg3), SWIGTYPE_p_double, new_flags)); + } + if (SWIG_IsTmpObj(res4)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_double((*arg4))); + } else { + int new_flags = SWIG_IsNewObj(res4) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg4), SWIGTYPE_p_double, new_flags)); + } + if (SWIG_IsTmpObj(res5)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_double((*arg5))); + } else { + int new_flags = SWIG_IsNewObj(res5) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg5), SWIGTYPE_p_double, new_flags)); + } + if (SWIG_IsTmpObj(res6)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_double((*arg6))); + } else { + int new_flags = SWIG_IsNewObj(res6) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg6), SWIGTYPE_p_double, new_flags)); + } + if (SWIG_IsTmpObj(res7)) { + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_double((*arg7))); + } else { + int new_flags = SWIG_IsNewObj(res7) ? (SWIG_POINTER_OWN | 0 ) : 0 ; + resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg7), SWIGTYPE_p_double, new_flags)); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsMatrix_Invert(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; @@ -26376,11 +27057,11 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_IsIdentity(PyObject *SWIGUNUSEDPARM(se swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_IsIdentity" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_IsIdentity" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); } arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1); { - result = (bool)(arg1)->IsIdentity(); + result = (bool)((wxGraphicsMatrix const *)arg1)->IsIdentity(); if (PyErr_Occurred()) SWIG_fail; } { @@ -26539,7 +27220,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformPoint(PyObject *SWIGUNUSEDPAR if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformPoint",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformPoint" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformPoint" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); } arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1); if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) { @@ -26563,7 +27244,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformPoint(PyObject *SWIGUNUSEDPAR res3 = SWIG_AddTmpMask(ecode); } { - (arg1)->TransformPoint(arg2,arg3); + ((wxGraphicsMatrix const *)arg1)->TransformPoint(arg2,arg3); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); @@ -26606,7 +27287,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformDistance(PyObject *SWIGUNUSED if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:GraphicsMatrix_TransformDistance",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformDistance" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_TransformDistance" "', expected argument " "1"" of type '" "wxGraphicsMatrix const *""'"); } arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1); if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_double,0))))) { @@ -26630,7 +27311,7 @@ SWIGINTERN PyObject *_wrap_GraphicsMatrix_TransformDistance(PyObject *SWIGUNUSED res3 = SWIG_AddTmpMask(ecode); } { - (arg1)->TransformDistance(arg2,arg3); + ((wxGraphicsMatrix const *)arg1)->TransformDistance(arg2,arg3); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); @@ -27092,11 +27773,11 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetCurrentPoint(PyObject *SWIGUNUSEDPARM swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetCurrentPoint" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetCurrentPoint" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); } arg1 = reinterpret_cast< wxGraphicsPath * >(argp1); { - result = (arg1)->GetCurrentPoint(); + result = ((wxGraphicsPath const *)arg1)->GetCurrentPoint(); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((new wxPoint2D(static_cast< const wxPoint2D& >(result))), SWIGTYPE_p_wxPoint2D, SWIG_POINTER_OWN | 0 ); @@ -27114,7 +27795,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_AddArc__SWIG_0(PyObject *SWIGUNUSEDPARM( wxDouble arg4 ; wxDouble arg5 ; wxDouble arg6 ; - bool arg7 ; + bool arg7 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; double val2 ; @@ -27130,7 +27811,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_AddArc__SWIG_0(PyObject *SWIGUNUSEDPARM( bool val7 ; int ecode7 = 0 ; - if ((nobjs < 7) || (nobjs > 7)) SWIG_fail; + if ((nobjs < 6) || (nobjs > 7)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_AddArc" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); @@ -27161,11 +27842,13 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_AddArc__SWIG_0(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "GraphicsPath_AddArc" "', expected argument " "6"" of type '" "wxDouble""'"); } arg6 = static_cast< wxDouble >(val6); - ecode7 = SWIG_AsVal_bool(swig_obj[6], &val7); - if (!SWIG_IsOK(ecode7)) { - SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "GraphicsPath_AddArc" "', expected argument " "7"" of type '" "bool""'"); - } - arg7 = static_cast< bool >(val7); + if (swig_obj[6]) { + ecode7 = SWIG_AsVal_bool(swig_obj[6], &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "GraphicsPath_AddArc" "', expected argument " "7"" of type '" "bool""'"); + } + arg7 = static_cast< bool >(val7); + } { (arg1)->AddArc(arg2,arg3,arg4,arg5,arg6,arg7); if (PyErr_Occurred()) SWIG_fail; @@ -27184,7 +27867,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_AddArc__SWIG_1(PyObject *SWIGUNUSEDPARM( wxDouble arg3 ; wxDouble arg4 ; wxDouble arg5 ; - bool arg6 ; + bool arg6 = (bool) true ; void *argp1 = 0 ; int res1 = 0 ; wxPoint2D temp2 ; @@ -27197,7 +27880,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_AddArc__SWIG_1(PyObject *SWIGUNUSEDPARM( bool val6 ; int ecode6 = 0 ; - if ((nobjs < 6) || (nobjs > 6)) SWIG_fail; + if ((nobjs < 5) || (nobjs > 6)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_AddArc" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); @@ -27222,11 +27905,13 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_AddArc__SWIG_1(PyObject *SWIGUNUSEDPARM( SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "GraphicsPath_AddArc" "', expected argument " "5"" of type '" "wxDouble""'"); } arg5 = static_cast< wxDouble >(val5); - ecode6 = SWIG_AsVal_bool(swig_obj[5], &val6); - if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "GraphicsPath_AddArc" "', expected argument " "6"" of type '" "bool""'"); - } - arg6 = static_cast< bool >(val6); + if (swig_obj[5]) { + ecode6 = SWIG_AsVal_bool(swig_obj[5], &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "GraphicsPath_AddArc" "', expected argument " "6"" of type '" "bool""'"); + } + arg6 = static_cast< bool >(val6); + } { (arg1)->AddArc((wxPoint2D const &)*arg2,arg3,arg4,arg5,arg6); if (PyErr_Occurred()) SWIG_fail; @@ -27244,10 +27929,28 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_AddArc(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args,"GraphicsPath_AddArc",0,7,argv))) SWIG_fail; --argc; - if (argc == 6) { + if ((argc >= 5) && (argc <= 6)) { + int _v = 0; + { + { + _v = wxPySimple_typecheck(argv[1], wxT("wxPoint2D"), 2); + } + } + if (!_v) goto check_1; + if (argc > 5) { + { + { + int res = SWIG_AsVal_bool(argv[5], NULL); + _v = SWIG_CheckState(res); + } + } + if (!_v) goto check_1; + } return _wrap_GraphicsPath_AddArc__SWIG_1(self, argc, argv); } - if (argc == 7) { +check_1: + + if ((argc >= 6) && (argc <= 7)) { return _wrap_GraphicsPath_AddArc__SWIG_0(self, argc, argv); } @@ -27686,7 +28389,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_UnGetNativePath(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsPath_UnGetNativePath",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsPath, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); } arg1 = reinterpret_cast< wxGraphicsPath * >(argp1); res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0); @@ -27694,7 +28397,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_UnGetNativePath(PyObject *SWIGUNUSEDPARM SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_UnGetNativePath" "', expected argument " "2"" of type '" "void *""'"); } { - (arg1)->UnGetNativePath(arg2); + ((wxGraphicsPath const *)arg1)->UnGetNativePath(arg2); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); @@ -27746,7 +28449,7 @@ fail: SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; - wxRect2DDouble result; + wxRect2D result; void *argp1 = 0 ; int res1 = 0 ; PyObject *swig_obj[1] ; @@ -27755,14 +28458,14 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_GetBox(PyObject *SWIGUNUSEDPARM(self), P swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetBox" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_GetBox" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); } arg1 = reinterpret_cast< wxGraphicsPath * >(argp1); { - result = (arg1)->GetBox(); + result = ((wxGraphicsPath const *)arg1)->GetBox(); 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; fail: return NULL; @@ -27774,7 +28477,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; wxDouble arg2 ; wxDouble arg3 ; - int arg4 = (int) wxWINDING_RULE ; + int arg4 = (int) wxODDEVEN_RULE ; bool result; void *argp1 = 0 ; int res1 = 0 ; @@ -27788,7 +28491,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR if ((nobjs < 3) || (nobjs > 4)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); } arg1 = reinterpret_cast< wxGraphicsPath * >(argp1); ecode2 = SWIG_AsVal_double(swig_obj[1], &val2); @@ -27809,7 +28512,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_0(PyObject *SWIGUNUSEDPAR arg4 = static_cast< int >(val4); } { - result = (bool)(arg1)->Contains(arg2,arg3,arg4); + result = (bool)((wxGraphicsPath const *)arg1)->Contains(arg2,arg3,arg4); if (PyErr_Occurred()) SWIG_fail; } { @@ -27824,30 +28527,25 @@ fail: SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxGraphicsPath *arg1 = (wxGraphicsPath *) 0 ; - wxPoint2DDouble *arg2 = 0 ; - int arg3 = (int) wxWINDING_RULE ; + wxPoint2D *arg2 = 0 ; + int arg3 = (int) wxODDEVEN_RULE ; bool result; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; + wxPoint2D temp2 ; int val3 ; int ecode3 = 0 ; if ((nobjs < 2) || (nobjs > 3)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsPath, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsPath_Contains" "', expected argument " "1"" of type '" "wxGraphicsPath const *""'"); } arg1 = reinterpret_cast< wxGraphicsPath * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_wxPoint2DDouble, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsPath_Contains" "', expected argument " "2"" of type '" "wxPoint2DDouble const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsPath_Contains" "', expected argument " "2"" of type '" "wxPoint2DDouble const &""'"); + { + arg2 = &temp2; + if ( ! wxPoint2D_helper(swig_obj[1], &arg2)) SWIG_fail; } - arg2 = reinterpret_cast< wxPoint2DDouble * >(argp2); if (swig_obj[2]) { ecode3 = SWIG_AsVal_int(swig_obj[2], &val3); if (!SWIG_IsOK(ecode3)) { @@ -27856,7 +28554,7 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains__SWIG_1(PyObject *SWIGUNUSEDPAR arg3 = static_cast< int >(val3); } { - result = (bool)(arg1)->Contains((wxPoint2DDouble const &)*arg2,arg3); + result = (bool)((wxGraphicsPath const *)arg1)->Contains((wxPoint2D const &)*arg2,arg3); if (PyErr_Occurred()) SWIG_fail; } { @@ -27877,8 +28575,9 @@ SWIGINTERN PyObject *_wrap_GraphicsPath_Contains(PyObject *self, PyObject *args) if ((argc >= 2) && (argc <= 3)) { 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 (argc > 2) { @@ -28085,6 +28784,22 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsContext_CreateMeasuringContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsContext *result = 0 ; + + if (!SWIG_Python_UnpackTuple(args,"GraphicsContext_CreateMeasuringContext",0,0,0)) SWIG_fail; + { + result = (wxGraphicsContext *)wxGraphicsContext::Create(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsContext_CreateFromNative(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; void *arg1 = (void *) 0 ; @@ -28755,6 +29470,71 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsContext_GetLogicalFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_GetLogicalFunction" "', expected argument " "1"" of type '" "wxGraphicsContext const *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + { + result = (int)((wxGraphicsContext const *)arg1)->GetLogicalFunction(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_SetLogicalFunction(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + int arg2 ; + bool result; + void *argp1 = 0 ; + int res1 = 0 ; + int val2 ; + int ecode2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "function", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsContext_SetLogicalFunction",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_SetLogicalFunction" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + ecode2 = SWIG_AsVal_int(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GraphicsContext_SetLogicalFunction" "', expected argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); + { + result = (bool)(arg1)->SetLogicalFunction(arg2); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsContext_Translate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; @@ -29322,7 +30102,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_FillPath(PyObject *SWIGUNUSEDPARM(sel PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; wxGraphicsPath *arg2 = 0 ; - int arg3 = (int) wxWINDING_RULE ; + int arg3 = (int) wxODDEVEN_RULE ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -29372,7 +30152,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawPath(PyObject *SWIGUNUSEDPARM(sel PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; wxGraphicsPath *arg2 = 0 ; - int arg3 = (int) wxWINDING_RULE ; + int arg3 = (int) wxODDEVEN_RULE ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -29424,6 +30204,8 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawText(PyObject *SWIGUNUSEDPARM(sel wxString *arg2 = 0 ; wxDouble arg3 ; wxDouble arg4 ; + wxGraphicsBrush const &arg5_defvalue = wxNullGraphicsBrush ; + wxGraphicsBrush *arg5 = (wxGraphicsBrush *) &arg5_defvalue ; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; @@ -29431,15 +30213,18 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawText(PyObject *SWIGUNUSEDPARM(sel int ecode3 = 0 ; double val4 ; int ecode4 = 0 ; + void *argp5 = 0 ; + int res5 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "str",(char *) "x",(char *) "y", NULL + (char *) "self",(char *) "str",(char *) "x",(char *) "y",(char *) "backgroundBrush", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:GraphicsContext_DrawText",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:GraphicsContext_DrawText",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_DrawText" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); @@ -29460,8 +30245,18 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawText(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "GraphicsContext_DrawText" "', expected argument " "4"" of type '" "wxDouble""'"); } arg4 = static_cast< wxDouble >(val4); + if (obj4) { + res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxGraphicsBrush, 0 | 0); + if (!SWIG_IsOK(res5)) { + SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "GraphicsContext_DrawText" "', expected argument " "5"" of type '" "wxGraphicsBrush const &""'"); + } + if (!argp5) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsContext_DrawText" "', expected argument " "5"" of type '" "wxGraphicsBrush const &""'"); + } + arg5 = reinterpret_cast< wxGraphicsBrush * >(argp5); + } { - (arg1)->DrawText((wxString const &)*arg2,arg3,arg4); + wxGraphicsContext_DrawText(arg1,(wxString const &)*arg2,arg3,arg4,(wxGraphicsBrush const &)*arg5); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); @@ -29486,6 +30281,8 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawRotatedText(PyObject *SWIGUNUSEDP wxDouble arg3 ; wxDouble arg4 ; wxDouble arg5 ; + wxGraphicsBrush const &arg6_defvalue = wxNullGraphicsBrush ; + wxGraphicsBrush *arg6 = (wxGraphicsBrush *) &arg6_defvalue ; void *argp1 = 0 ; int res1 = 0 ; bool temp2 = false ; @@ -29495,16 +30292,19 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawRotatedText(PyObject *SWIGUNUSEDP int ecode4 = 0 ; double val5 ; int ecode5 = 0 ; + void *argp6 = 0 ; + int res6 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; + PyObject * obj5 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "str",(char *) "x",(char *) "y",(char *) "angle", NULL + (char *) "self",(char *) "str",(char *) "x",(char *) "y",(char *) "angle",(char *) "backgroundBrush", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:GraphicsContext_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO|O:GraphicsContext_DrawRotatedText",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_DrawRotatedText" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); @@ -29530,8 +30330,18 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawRotatedText(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "GraphicsContext_DrawRotatedText" "', expected argument " "5"" of type '" "wxDouble""'"); } arg5 = static_cast< wxDouble >(val5); + if (obj5) { + res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_wxGraphicsBrush, 0 | 0); + if (!SWIG_IsOK(res6)) { + SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "GraphicsContext_DrawRotatedText" "', expected argument " "6"" of type '" "wxGraphicsBrush const &""'"); + } + if (!argp6) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsContext_DrawRotatedText" "', expected argument " "6"" of type '" "wxGraphicsBrush const &""'"); + } + arg6 = reinterpret_cast< wxGraphicsBrush * >(argp6); + } { - (arg1)->DrawText((wxString const &)*arg2,arg3,arg4,arg5); + wxGraphicsContext_DrawRotatedText(arg1,(wxString const &)*arg2,arg3,arg4,arg5,(wxGraphicsBrush const &)*arg6); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); @@ -30013,7 +30823,7 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_DrawLines(PyObject *SWIGUNUSEDPARM(se wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; size_t arg2 ; wxPoint2D *arg3 = (wxPoint2D *) 0 ; - int arg4 = (int) wxWINDING_RULE ; + int arg4 = (int) wxODDEVEN_RULE ; void *argp1 = 0 ; int res1 = 0 ; int val4 ; @@ -30428,6 +31238,32 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsRenderer_CreateMeasuringContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsRenderer *arg1 = (wxGraphicsRenderer *) 0 ; + wxGraphicsContext *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsRenderer, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsRenderer_CreateMeasuringContext" "', expected argument " "1"" of type '" "wxGraphicsRenderer *""'"); + } + arg1 = reinterpret_cast< wxGraphicsRenderer * >(argp1); + { + result = (wxGraphicsContext *)(arg1)->CreateMeasuringContext(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsRenderer_CreateContextFromNativeContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsRenderer *arg1 = (wxGraphicsRenderer *) 0 ; @@ -30920,19 +31756,15 @@ SWIGINTERN PyObject *GraphicsRenderer_swigregister(PyObject *SWIGUNUSEDPARM(self return SWIG_Py_Void(); } -SWIGINTERN PyObject *_wrap_new_GCDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_new_GCDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxWindowDC *arg1 = 0 ; wxGCDC *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "dc", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_GCDC",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GCDC" "', expected argument " "1"" of type '" "wxWindowDC const &""'"); } @@ -30954,6 +31786,60 @@ fail: } +SWIGINTERN PyObject *_wrap_new_GCDC__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + wxGCDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GCDC" "', expected argument " "1"" of type '" "wxWindow *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxGCDC *)new wxGCDC(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGCDC, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_GCDC(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"new_GCDC",0,1,argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v = 0; + { + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxWindowDC, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + return _wrap_new_GCDC__SWIG_0(self, argc, argv); + } +check_1: + + if (argc == 1) { + return _wrap_new_GCDC__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_GCDC'"); + return NULL; +} + + SWIGINTERN PyObject *_wrap_delete_GCDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGCDC *arg1 = (wxGCDC *) 0 ; @@ -32451,82 +33337,6 @@ fail: } -SWIGINTERN PyObject *_wrap_PenList_AddPen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxPenList *arg1 = (wxPenList *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "pen", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_AddPen",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPenList, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PenList_AddPen" "', expected argument " "1"" of type '" "wxPenList *""'"); - } - arg1 = reinterpret_cast< wxPenList * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPen, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PenList_AddPen" "', expected argument " "2"" of type '" "wxPen *""'"); - } - arg2 = reinterpret_cast< wxPen * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddPen(arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_PenList_RemovePen(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxPenList *arg1 = (wxPenList *) 0 ; - wxPen *arg2 = (wxPen *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "pen", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PenList_RemovePen",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPenList, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PenList_RemovePen" "', expected argument " "1"" of type '" "wxPenList *""'"); - } - arg1 = reinterpret_cast< wxPenList * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxPen, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PenList_RemovePen" "', expected argument " "2"" of type '" "wxPen *""'"); - } - arg2 = reinterpret_cast< wxPen * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemovePen(arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *PenList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -32582,82 +33392,6 @@ fail: } -SWIGINTERN PyObject *_wrap_BrushList_AddBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxBrush *arg2 = (wxBrush *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "brush", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_AddBrush",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBrushList, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BrushList_AddBrush" "', expected argument " "1"" of type '" "wxBrushList *""'"); - } - arg1 = reinterpret_cast< wxBrushList * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxBrush, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BrushList_AddBrush" "', expected argument " "2"" of type '" "wxBrush *""'"); - } - arg2 = reinterpret_cast< wxBrush * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddBrush(arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_BrushList_RemoveBrush(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxBrushList *arg1 = (wxBrushList *) 0 ; - wxBrush *arg2 = (wxBrush *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "brush", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BrushList_RemoveBrush",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBrushList, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BrushList_RemoveBrush" "', expected argument " "1"" of type '" "wxBrushList *""'"); - } - arg1 = reinterpret_cast< wxBrushList * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxBrush, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BrushList_RemoveBrush" "', expected argument " "2"" of type '" "wxBrush *""'"); - } - arg2 = reinterpret_cast< wxBrush * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemoveBrush(arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *BrushList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -32772,82 +33506,6 @@ fail: } -SWIGINTERN PyObject *_wrap_FontList_AddFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxFontList *arg1 = (wxFontList *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "font", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_AddFont",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontList, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontList_AddFont" "', expected argument " "1"" of type '" "wxFontList *""'"); - } - arg1 = reinterpret_cast< wxFontList * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FontList_AddFont" "', expected argument " "2"" of type '" "wxFont *""'"); - } - arg2 = reinterpret_cast< wxFont * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->AddFont(arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_FontList_RemoveFont(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxFontList *arg1 = (wxFontList *) 0 ; - wxFont *arg2 = (wxFont *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "font", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FontList_RemoveFont",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFontList, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontList_RemoveFont" "', expected argument " "1"" of type '" "wxFontList *""'"); - } - arg1 = reinterpret_cast< wxFontList * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFont, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FontList_RemoveFont" "', expected argument " "2"" of type '" "wxFont *""'"); - } - arg2 = reinterpret_cast< wxFont * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->RemoveFont(arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *FontList_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -34492,6 +35150,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP int arg5 = (int) 0 ; wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ; wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ; + int result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -34562,11 +35221,11 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButton(PyObject *SWIGUNUSEDP } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); + result = (int)(arg1)->DrawHeaderButton(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -34582,6 +35241,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButtonContents(PyObject *SWI int arg5 = (int) 0 ; wxHeaderSortIconType arg6 = (wxHeaderSortIconType) wxHDR_SORT_ICON_NONE ; wxHeaderButtonParams *arg7 = (wxHeaderButtonParams *) NULL ; + int result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; @@ -34652,11 +35312,11 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawHeaderButtonContents(PyObject *SWI } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawHeaderButtonContents(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); + result = (int)(arg1)->DrawHeaderButtonContents(arg2,*arg3,(wxRect const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_Py_Void(); + resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: return NULL; @@ -35856,8 +36516,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 ; @@ -35867,8 +36527,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 ; @@ -35902,17 +36561,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; @@ -38878,6 +39533,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"Bitmap_SetDepth", (PyCFunction) _wrap_Bitmap_SetDepth, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap_SetSize", (PyCFunction) _wrap_Bitmap_SetSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap_CopyFromCursor", (PyCFunction) _wrap_Bitmap_CopyFromCursor, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Bitmap_CopyFromBuffer", (PyCFunction) _wrap_Bitmap_CopyFromBuffer, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Bitmap_CopyFromBufferRGBA", (PyCFunction) _wrap_Bitmap_CopyFromBufferRGBA, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS, NULL}, @@ -39234,6 +39891,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_DrawRotatedTextPoint", (PyCFunction) _wrap_DC_DrawRotatedTextPoint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_Blit", (PyCFunction) _wrap_DC_Blit, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_BlitPointSize", (PyCFunction) _wrap_DC_BlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_StretchBlit", (PyCFunction) _wrap_DC_StretchBlit, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_StretchBlitPointSize", (PyCFunction) _wrap_DC_StretchBlitPointSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_GetAsBitmap", (PyCFunction) _wrap_DC_GetAsBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -39341,11 +40001,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_DCClipper", (PyCFunction)_wrap_delete_DCClipper, METH_O, NULL}, { (char *)"DCClipper_swigregister", DCClipper_swigregister, METH_VARARGS, NULL}, { (char *)"DCClipper_swiginit", DCClipper_swiginit, METH_VARARGS, NULL}, - { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL}, - { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL}, { (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ScreenDC_StartDrawingOnTop", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTop, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -39361,9 +40016,17 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PaintDC", (PyCFunction) _wrap_new_PaintDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PaintDC_swigregister", PaintDC_swigregister, METH_VARARGS, NULL}, { (char *)"PaintDC_swiginit", PaintDC_swiginit, METH_VARARGS, NULL}, + { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL}, + { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL}, { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL}, { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL}, + { (char *)"BufferedDC_SetStyle", (PyCFunction) _wrap_BufferedDC_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"BufferedDC_GetStyle", (PyCFunction)_wrap_BufferedDC_GetStyle, METH_O, NULL}, { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS, NULL}, { (char *)"BufferedDC_swiginit", BufferedDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -39420,8 +40083,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsFont_swiginit", GraphicsFont_swiginit, METH_VARARGS, NULL}, { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL}, { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsMatrix_Set", (PyCFunction) _wrap_GraphicsMatrix_Set, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsMatrix_Get", (PyCFunction)_wrap_GraphicsMatrix_Get, METH_O, NULL}, { (char *)"GraphicsMatrix_Invert", (PyCFunction)_wrap_GraphicsMatrix_Invert, METH_O, NULL}, { (char *)"GraphicsMatrix_IsEqual", (PyCFunction) _wrap_GraphicsMatrix_IsEqual, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsMatrix_IsIdentity", (PyCFunction)_wrap_GraphicsMatrix_IsIdentity, METH_O, NULL}, @@ -39454,6 +40117,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL}, { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL}, { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL}, + { (char *)"GraphicsContext_CreateMeasuringContext", (PyCFunction)_wrap_GraphicsContext_CreateMeasuringContext, METH_NOARGS, NULL}, { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_CreateFromNativeWindow", (PyCFunction) _wrap_GraphicsContext_CreateFromNativeWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_CreatePath", (PyCFunction)_wrap_GraphicsContext_CreatePath, METH_O, NULL}, @@ -39469,6 +40133,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsContext_Clip", (PyCFunction) _wrap_GraphicsContext_Clip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_ResetClip", (PyCFunction)_wrap_GraphicsContext_ResetClip, METH_O, NULL}, { (char *)"GraphicsContext_GetNativeContext", (PyCFunction)_wrap_GraphicsContext_GetNativeContext, METH_O, NULL}, + { (char *)"GraphicsContext_GetLogicalFunction", (PyCFunction)_wrap_GraphicsContext_GetLogicalFunction, METH_O, NULL}, + { (char *)"GraphicsContext_SetLogicalFunction", (PyCFunction) _wrap_GraphicsContext_SetLogicalFunction, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Translate", (PyCFunction) _wrap_GraphicsContext_Translate, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Scale", (PyCFunction) _wrap_GraphicsContext_Scale, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Rotate", (PyCFunction) _wrap_GraphicsContext_Rotate, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -39500,6 +40166,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_GraphicsRenderer", (PyCFunction)_wrap_delete_GraphicsRenderer, METH_O, NULL}, { (char *)"GraphicsRenderer_GetDefaultRenderer", (PyCFunction)_wrap_GraphicsRenderer_GetDefaultRenderer, METH_NOARGS, NULL}, { (char *)"GraphicsRenderer_CreateContext", _wrap_GraphicsRenderer_CreateContext, METH_VARARGS, NULL}, + { (char *)"GraphicsRenderer_CreateMeasuringContext", (PyCFunction)_wrap_GraphicsRenderer_CreateMeasuringContext, METH_O, NULL}, { (char *)"GraphicsRenderer_CreateContextFromNativeContext", (PyCFunction) _wrap_GraphicsRenderer_CreateContextFromNativeContext, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_CreateContextFromNativeWindow", (PyCFunction) _wrap_GraphicsRenderer_CreateContextFromNativeWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_CreatePath", (PyCFunction)_wrap_GraphicsRenderer_CreatePath, METH_O, NULL}, @@ -39510,7 +40177,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsRenderer_CreateRadialGradientBrush", (PyCFunction) _wrap_GraphicsRenderer_CreateRadialGradientBrush, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_CreateFont", (PyCFunction) _wrap_GraphicsRenderer_CreateFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_swigregister", GraphicsRenderer_swigregister, METH_VARARGS, NULL}, - { (char *)"new_GCDC", (PyCFunction) _wrap_new_GCDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_GCDC", _wrap_new_GCDC, METH_VARARGS, NULL}, { (char *)"delete_GCDC", (PyCFunction)_wrap_delete_GCDC, METH_O, NULL}, { (char *)"GCDC_GetGraphicsContext", (PyCFunction)_wrap_GCDC_GetGraphicsContext, METH_O, NULL}, { (char *)"GCDC_SetGraphicsContext", (PyCFunction) _wrap_GCDC_SetGraphicsContext, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -39557,16 +40224,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"GDIObjListBase_swigregister", GDIObjListBase_swigregister, METH_VARARGS, NULL}, { (char *)"GDIObjListBase_swiginit", GDIObjListBase_swiginit, METH_VARARGS, NULL}, { (char *)"PenList_FindOrCreatePen", (PyCFunction) _wrap_PenList_FindOrCreatePen, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PenList_AddPen", (PyCFunction) _wrap_PenList_AddPen, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PenList_RemovePen", (PyCFunction) _wrap_PenList_RemovePen, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PenList_swigregister", PenList_swigregister, METH_VARARGS, NULL}, { (char *)"BrushList_FindOrCreateBrush", (PyCFunction) _wrap_BrushList_FindOrCreateBrush, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"BrushList_AddBrush", (PyCFunction) _wrap_BrushList_AddBrush, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"BrushList_RemoveBrush", (PyCFunction) _wrap_BrushList_RemoveBrush, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"BrushList_swigregister", BrushList_swigregister, METH_VARARGS, NULL}, { (char *)"FontList_FindOrCreateFont", (PyCFunction) _wrap_FontList_FindOrCreateFont, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"FontList_AddFont", (PyCFunction) _wrap_FontList_AddFont, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"FontList_RemoveFont", (PyCFunction) _wrap_FontList_RemoveFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FontList_swigregister", FontList_swigregister, METH_VARARGS, NULL}, { (char *)"new_ColourDatabase", (PyCFunction)_wrap_new_ColourDatabase, METH_NOARGS, NULL}, { (char *)"delete_ColourDatabase", (PyCFunction)_wrap_delete_ColourDatabase, METH_O, NULL}, @@ -39731,12 +40392,21 @@ static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) { static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) { return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x)); } +static void *_p_wxBufferedDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); +} +static void *_p_wxMemoryDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) ((wxMemoryDC *) x)); +} static void *_p_wxClientDCTo_p_wxWindowDC(void *x) { return (void *)((wxWindowDC *) ((wxClientDC *) x)); } static void *_p_wxPaintDCTo_p_wxWindowDC(void *x) { return (void *)((wxWindowDC *) (wxClientDC *) ((wxPaintDC *) x)); } +static void *_p_wxBufferedPaintDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); +} static void *_p_wxPyLocaleTo_p_wxLocale(void *x) { return (void *)((wxLocale *) ((wxPyLocale *) x)); } @@ -39789,17 +40459,17 @@ static void *_p_wxScreenDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxScreenDC *) x)); } static void *_p_wxBufferedDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); + return (void *)((wxDC *) (wxWindowDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxMirrorDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxMirrorDC *) x)); } -static void *_p_wxMemoryDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxMemoryDC *) x)); -} static void *_p_wxWindowDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxWindowDC *) x)); } +static void *_p_wxMemoryDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) (wxWindowDC *) ((wxMemoryDC *) x)); +} static void *_p_wxMetaFileDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxMetaFileDC *) x)); } @@ -39810,7 +40480,7 @@ static void *_p_wxPaintDCTo_p_wxDC(void *x) { return (void *)((wxDC *) (wxWindowDC *)(wxClientDC *) ((wxPaintDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); + return (void *)((wxDC *) (wxWindowDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); } static void *_p_wxAutoBufferedPaintDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxAutoBufferedPaintDC *) x)); @@ -39842,6 +40512,9 @@ static void *_p_wxPenTo_p_wxObject(void *x) { static void *_p_wxRegionIteratorTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxRegionIterator *) x)); } +static void *_p_wxEventBlockerTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvtHandler *) ((wxEventBlocker *) x)); +} static void *_p_wxSizerItemTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxSizerItem *) x)); } @@ -39875,12 +40548,12 @@ static void *_p_wxUpdateUIEventTo_p_wxObject(void *x) { static void *_p_wxEventTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxEvent *) x)); } -static void *_p_wxFlexGridSizerTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxSizer *)(wxGridSizer *) ((wxFlexGridSizer *) x)); -} static void *_p_wxGridSizerTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxSizer *) ((wxGridSizer *) x)); } +static void *_p_wxFlexGridSizerTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxSizer *)(wxGridSizer *) ((wxFlexGridSizer *) x)); +} static void *_p_wxInitDialogEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *) ((wxInitDialogEvent *) x)); } @@ -39927,7 +40600,7 @@ static void *_p_wxFSFileTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxFSFile *) x)); } static void *_p_wxMemoryDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *) ((wxMemoryDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *) ((wxMemoryDC *) x)); } static void *_p_wxRegionTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxRegion *) x)); @@ -40034,6 +40707,9 @@ static void *_p_wxXPMHandlerTo_p_wxObject(void *x) { static void *_p_wxTIFFHandlerTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxImageHandler *) ((wxTIFFHandler *) x)); } +static void *_p_wxTGAHandlerTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxImageHandler *) ((wxTGAHandler *) x)); +} static void *_p_wxEvtHandlerTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxEvtHandler *) x)); } @@ -40044,7 +40720,7 @@ static void *_p_wxPaintDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxClientDC *) ((wxPaintDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); } static void *_p_wxAutoBufferedPaintDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *) ((wxAutoBufferedPaintDC *) x)); @@ -40055,12 +40731,12 @@ static void *_p_wxPrinterDCTo_p_wxObject(void *x) { static void *_p_wxScreenDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *) ((wxScreenDC *) x)); } -static void *_p_wxStdDialogButtonSizerTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxSizer *)(wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); -} static void *_p_wxAcceleratorTableTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxAcceleratorTable *) x)); } +static void *_p_wxStdDialogButtonSizerTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxSizer *)(wxBoxSizer *) ((wxStdDialogButtonSizer *) x)); +} static void *_p_wxImageTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxImage *) x)); } @@ -40077,7 +40753,7 @@ static void *_p_wxPaletteTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxPalette *) x)); } static void *_p_wxBufferedDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxImageListTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxImageList *) x)); @@ -40216,9 +40892,7 @@ static swig_type_info _swigt__p_wxBrush = {"_p_wxBrush", "wxBrush *", 0, 0, (voi static swig_type_info _swigt__p_wxBrushList = {"_p_wxBrushList", "wxBrushList *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxBufferedDC = {"_p_wxBufferedDC", "wxBufferedDC *", 0, 0, (void*)0, 0}; 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}; @@ -40265,6 +40939,7 @@ static swig_type_info _swigt__p_wxNativePixelData = {"_p_wxNativePixelData", "wx static swig_type_info _swigt__p_wxNativePixelData_Accessor = {"_p_wxNativePixelData_Accessor", "wxNativePixelData_Accessor *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxObject = {"_p_wxObject", "wxObject *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxLayoutConstraints = {"_p_wxLayoutConstraints", 0, 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxEventBlocker = {"_p_wxEventBlocker", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxSizerItem = {"_p_wxSizerItem", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxGBSizerItem = {"_p_wxGBSizerItem", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxScrollEvent = {"_p_wxScrollEvent", 0, 0, 0, 0, 0}; @@ -40276,8 +40951,8 @@ static swig_type_info _swigt__p_wxGridBagSizer = {"_p_wxGridBagSizer", 0, 0, 0, static swig_type_info _swigt__p_wxUpdateUIEvent = {"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMenu = {"_p_wxMenu", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxEvent = {"_p_wxEvent", 0, 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxGridSizer = {"_p_wxGridSizer", 0, 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxFlexGridSizer = {"_p_wxFlexGridSizer", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxInitDialogEvent = {"_p_wxInitDialogEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxClipboardTextEvent = {"_p_wxClipboardTextEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPaintEvent = {"_p_wxPaintEvent", 0, 0, 0, 0, 0}; @@ -40294,7 +40969,6 @@ static swig_type_info _swigt__p_wxPyEvent = {"_p_wxPyEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxShowEvent = {"_p_wxShowEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMenuItem = {"_p_wxMenuItem", 0, 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxIdleEvent = {"_p_wxIdleEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxWindowCreateEvent = {"_p_wxWindowCreateEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxQueryNewPaletteEvent = {"_p_wxQueryNewPaletteEvent", 0, 0, 0, 0, 0}; @@ -40303,7 +40977,9 @@ static swig_type_info _swigt__p_wxIconizeEvent = {"_p_wxIconizeEvent", 0, 0, 0, static swig_type_info _swigt__p_wxSizeEvent = {"_p_wxSizeEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMoveEvent = {"_p_wxMoveEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxActivateEvent = {"_p_wxActivateEvent", 0, 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxDateEvent = {"_p_wxDateEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxEvtHandler = {"_p_wxEvtHandler", 0, 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxTGAHandler = {"_p_wxTGAHandler", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxTIFFHandler = {"_p_wxTIFFHandler", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxXPMHandler = {"_p_wxXPMHandler", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxImageHandler = {"_p_wxImageHandler", 0, 0, 0, 0, 0}; @@ -40318,8 +40994,8 @@ static swig_type_info _swigt__p_wxPCXHandler = {"_p_wxPCXHandler", 0, 0, 0, 0, 0 static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxPNMHandler = {"_p_wxPNMHandler", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxMouseCaptureLostEvent = {"_p_wxMouseCaptureLostEvent", 0, 0, 0, 0, 0}; -static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxAcceleratorTable = {"_p_wxAcceleratorTable", 0, 0, 0, 0, 0}; +static swig_type_info _swigt__p_wxStdDialogButtonSizer = {"_p_wxStdDialogButtonSizer", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxScrollWinEvent = {"_p_wxScrollWinEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxWindowDestroyEvent = {"_p_wxWindowDestroyEvent", 0, 0, 0, 0, 0}; static swig_type_info _swigt__p_wxNavigationKeyEvent = {"_p_wxNavigationKeyEvent", 0, 0, 0, 0, 0}; @@ -40349,7 +41025,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_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_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_wxPrintData = {"_p_wxPrintData", "wxPrintData *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxPrinterDC = {"_p_wxPrinterDC", "wxPrinterDC *", 0, 0, (void*)0, 0}; @@ -40357,7 +41032,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_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_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_wxRegionIterator = {"_p_wxRegionIterator", "wxRegionIterator *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxRendererNative = {"_p_wxRendererNative", "wxRendererNative *", 0, 0, (void*)0, 0}; @@ -40394,12 +41069,10 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxBufferedDC, &_swigt__p_wxBufferedPaintDC, &_swigt__p_wxCURHandler, - &_swigt__p_wxChar, &_swigt__p_wxChildFocusEvent, &_swigt__p_wxClientDC, &_swigt__p_wxClipboardTextEvent, &_swigt__p_wxCloseEvent, - &_swigt__p_wxColor, &_swigt__p_wxColour, &_swigt__p_wxColourDatabase, &_swigt__p_wxCommandEvent, @@ -40422,6 +41095,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxEncodingConverter, &_swigt__p_wxEraseEvent, &_swigt__p_wxEvent, + &_swigt__p_wxEventBlocker, &_swigt__p_wxEvtHandler, &_swigt__p_wxFSFile, &_swigt__p_wxFileSystem, @@ -40498,7 +41172,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxPixelDataBase, &_swigt__p_wxPoint, &_swigt__p_wxPoint2D, - &_swigt__p_wxPoint2DDouble, &_swigt__p_wxPostScriptDC, &_swigt__p_wxPrintData, &_swigt__p_wxPrinterDC, @@ -40513,7 +41186,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxPyValidator, &_swigt__p_wxQueryNewPaletteEvent, &_swigt__p_wxRect, - &_swigt__p_wxRect2DDouble, + &_swigt__p_wxRect2D, &_swigt__p_wxRegion, &_swigt__p_wxRegionIterator, &_swigt__p_wxRendererNative, @@ -40533,6 +41206,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxStockGDI, &_swigt__p_wxString, &_swigt__p_wxSysColourChangedEvent, + &_swigt__p_wxTGAHandler, &_swigt__p_wxTIFFHandler, &_swigt__p_wxUpdateUIEvent, &_swigt__p_wxValidator, @@ -40560,9 +41234,7 @@ static swig_cast_info _swigc__p_wxBrush[] = { {&_swigt__p_wxBrush, 0, 0, 0},{0, static swig_cast_info _swigc__p_wxBrushList[] = { {&_swigt__p_wxBrushList, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBufferedDC[] = { {&_swigt__p_wxBufferedDC, 0, 0, 0}, {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxBufferedDC, 0, 0},{0, 0, 0, 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}}; @@ -40608,6 +41280,7 @@ static swig_cast_info _swigc__p_wxNativeFontInfo[] = { {&_swigt__p_wxNativeFont static swig_cast_info _swigc__p_wxNativePixelData[] = { {&_swigt__p_wxNativePixelData, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNativePixelData_Accessor[] = { {&_swigt__p_wxNativePixelData_Accessor, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxLayoutConstraints[] = {{&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxEventBlocker[] = {{&_swigt__p_wxEventBlocker, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxSizerItem[] = {{&_swigt__p_wxSizerItem, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGBSizerItem[] = {{&_swigt__p_wxGBSizerItem, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxScrollEvent[] = {{&_swigt__p_wxScrollEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -40619,8 +41292,8 @@ static swig_cast_info _swigc__p_wxGridBagSizer[] = {{&_swigt__p_wxGridBagSizer, static swig_cast_info _swigc__p_wxUpdateUIEvent[] = {{&_swigt__p_wxUpdateUIEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenu[] = {{&_swigt__p_wxMenu, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxEvent[] = {{&_swigt__p_wxEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxGridSizer[] = {{&_swigt__p_wxGridSizer, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxFlexGridSizer[] = {{&_swigt__p_wxFlexGridSizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxInitDialogEvent[] = {{&_swigt__p_wxInitDialogEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxClipboardTextEvent[] = {{&_swigt__p_wxClipboardTextEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaintEvent[] = {{&_swigt__p_wxPaintEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -40637,7 +41310,6 @@ static swig_cast_info _swigc__p_wxPyEvent[] = {{&_swigt__p_wxPyEvent, 0, 0, 0},{ static swig_cast_info _swigc__p_wxNotifyEvent[] = {{&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxShowEvent[] = {{&_swigt__p_wxShowEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMenuItem[] = {{&_swigt__p_wxMenuItem, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxIdleEvent[] = {{&_swigt__p_wxIdleEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowCreateEvent[] = {{&_swigt__p_wxWindowCreateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxQueryNewPaletteEvent[] = {{&_swigt__p_wxQueryNewPaletteEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -40646,7 +41318,9 @@ static swig_cast_info _swigc__p_wxIconizeEvent[] = {{&_swigt__p_wxIconizeEvent, static swig_cast_info _swigc__p_wxSizeEvent[] = {{&_swigt__p_wxSizeEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMoveEvent[] = {{&_swigt__p_wxMoveEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxActivateEvent[] = {{&_swigt__p_wxActivateEvent, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxDateEvent[] = {{&_swigt__p_wxDateEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxEvtHandler[] = {{&_swigt__p_wxEvtHandler, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxTGAHandler[] = {{&_swigt__p_wxTGAHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxTIFFHandler[] = {{&_swigt__p_wxTIFFHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxXPMHandler[] = {{&_swigt__p_wxXPMHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxImageHandler[] = {{&_swigt__p_wxImageHandler, 0, 0, 0},{0, 0, 0, 0}}; @@ -40661,8 +41335,8 @@ static swig_cast_info _swigc__p_wxPCXHandler[] = {{&_swigt__p_wxPCXHandler, 0, 0 static swig_cast_info _swigc__p_wxJPEGHandler[] = {{&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPNMHandler[] = {{&_swigt__p_wxPNMHandler, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxMouseCaptureLostEvent[] = {{&_swigt__p_wxMouseCaptureLostEvent, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAcceleratorTable[] = {{&_swigt__p_wxAcceleratorTable, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxStdDialogButtonSizer[] = {{&_swigt__p_wxStdDialogButtonSizer, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxScrollWinEvent[] = {{&_swigt__p_wxScrollWinEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindowDestroyEvent[] = {{&_swigt__p_wxWindowDestroyEvent, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxNavigationKeyEvent[] = {{&_swigt__p_wxNavigationKeyEvent, 0, 0, 0},{0, 0, 0, 0}}; @@ -40683,7 +41357,7 @@ static swig_cast_info _swigc__p_wxChildFocusEvent[] = {{&_swigt__p_wxChildFocusE static swig_cast_info _swigc__p_wxControlWithItems[] = {{&_swigt__p_wxControlWithItems, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPyValidator[] = {{&_swigt__p_wxPyValidator, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxValidator[] = {{&_swigt__p_wxValidator, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxRegionIterator, _p_wxRegionIteratorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPen, _p_wxPenTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGCDC, _p_wxGCDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMask, _p_wxMaskTo_p_wxObject, 0, 0}, {&_swigt__p_wxPseudoDC, _p_wxPseudoDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsPen, _p_wxGraphicsPenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFont, _p_wxFontTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxMemoryDC, _p_wxMemoryDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxDC, _p_wxDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxIcon, _p_wxIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDC, _p_wxWindowDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxGDIObject, _p_wxGDIObjectTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsObject, _p_wxGraphicsObjectTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsPath, _p_wxGraphicsPathTo_p_wxObject, 0, 0}, {&_swigt__p_wxEffects, _p_wxEffectsTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPostScriptDC, _p_wxPostScriptDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsContext, _p_wxGraphicsContextTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxAutoBufferedPaintDC, _p_wxAutoBufferedPaintDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinterDC, _p_wxPrinterDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxScreenDC, _p_wxScreenDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsBrush, _p_wxGraphicsBrushTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsRenderer, _p_wxGraphicsRendererTo_p_wxObject, 0, 0}, {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageList, _p_wxImageListTo_p_wxObject, 0, 0}, {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxGraphicsFont, _p_wxGraphicsFontTo_p_wxObject, 0, 0}, {&_swigt__p_wxMirrorDC, _p_wxMirrorDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxEncodingConverter, _p_wxEncodingConverterTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMetaFileDC, _p_wxMetaFileDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsMatrix, _p_wxGraphicsMatrixTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxObject, 0, 0}, {&_swigt__p_wxMetaFile, _p_wxMetaFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxColour, _p_wxColourTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxObject[] = { {&_swigt__p_wxLayoutConstraints, _p_wxLayoutConstraintsTo_p_wxObject, 0, 0}, {&_swigt__p_wxRegionIterator, _p_wxRegionIteratorTo_p_wxObject, 0, 0}, {&_swigt__p_wxPen, _p_wxPenTo_p_wxObject, 0, 0}, {&_swigt__p_wxEventBlocker, _p_wxEventBlockerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizerItem, _p_wxSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxGBSizerItem, _p_wxGBSizerItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollEvent, _p_wxScrollEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIndividualLayoutConstraint, _p_wxIndividualLayoutConstraintTo_p_wxObject, 0, 0}, {&_swigt__p_wxStaticBoxSizer, _p_wxStaticBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBoxSizer, _p_wxBoxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizer, _p_wxSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGCDC, _p_wxGCDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridBagSizer, _p_wxGridBagSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxUpdateUIEvent, _p_wxUpdateUIEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenu, _p_wxMenuTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvent, _p_wxEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGridSizer, _p_wxGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxFlexGridSizer, _p_wxFlexGridSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxInitDialogEvent, _p_wxInitDialogEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMask, _p_wxMaskTo_p_wxObject, 0, 0}, {&_swigt__p_wxPseudoDC, _p_wxPseudoDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxClipboardTextEvent, _p_wxClipboardTextEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintEvent, _p_wxPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNcPaintEvent, _p_wxNcPaintEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaletteChangedEvent, _p_wxPaletteChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDisplayChangedEvent, _p_wxDisplayChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureChangedEvent, _p_wxMouseCaptureChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSysColourChangedEvent, _p_wxSysColourChangedEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxControl, _p_wxControlTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsPen, _p_wxGraphicsPenTo_p_wxObject, 0, 0}, {&_swigt__p_wxFont, _p_wxFontTo_p_wxObject, 0, 0}, {&_swigt__p_wxSetCursorEvent, _p_wxSetCursorEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxFSFile, _p_wxFSFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxMemoryDC, _p_wxMemoryDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxRegion, _p_wxRegionTo_p_wxObject, 0, 0}, {&_swigt__p_wxPySizer, _p_wxPySizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxDC, _p_wxDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxIcon, _p_wxIconTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDC, _p_wxWindowDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxGDIObject, _p_wxGDIObjectTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsObject, _p_wxGraphicsObjectTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsPath, _p_wxGraphicsPathTo_p_wxObject, 0, 0}, {&_swigt__p_wxEffects, _p_wxEffectsTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyEvent, _p_wxPyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNotifyEvent, _p_wxNotifyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPostScriptDC, _p_wxPostScriptDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsContext, _p_wxGraphicsContextTo_p_wxObject, 0, 0}, {&_swigt__p_wxShowEvent, _p_wxShowEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuItem, _p_wxMenuItemTo_p_wxObject, 0, 0}, {&_swigt__p_wxIdleEvent, _p_wxIdleEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowCreateEvent, _p_wxWindowCreateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxQueryNewPaletteEvent, _p_wxQueryNewPaletteEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMaximizeEvent, _p_wxMaximizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxIconizeEvent, _p_wxIconizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxSizeEvent, _p_wxSizeEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMoveEvent, _p_wxMoveEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxActivateEvent, _p_wxActivateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDateEvent, _p_wxDateEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEvtHandler, _p_wxEvtHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTGAHandler, _p_wxTGAHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxTIFFHandler, _p_wxTIFFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxXPMHandler, _p_wxXPMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageHandler, _p_wxImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyImageHandler, _p_wxPyImageHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxBMPHandler, _p_wxBMPHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxICOHandler, _p_wxICOHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxCURHandler, _p_wxCURHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxANIHandler, _p_wxANIHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNGHandler, _p_wxPNGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxGIFHandler, _p_wxGIFHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPCXHandler, _p_wxPCXHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxJPEGHandler, _p_wxJPEGHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxPNMHandler, _p_wxPNMHandlerTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseCaptureLostEvent, _p_wxMouseCaptureLostEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxAutoBufferedPaintDC, _p_wxAutoBufferedPaintDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxPrinterDC, _p_wxPrinterDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxScreenDC, _p_wxScreenDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxAcceleratorTable, _p_wxAcceleratorTableTo_p_wxObject, 0, 0}, {&_swigt__p_wxStdDialogButtonSizer, _p_wxStdDialogButtonSizerTo_p_wxObject, 0, 0}, {&_swigt__p_wxImage, _p_wxImageTo_p_wxObject, 0, 0}, {&_swigt__p_wxScrollWinEvent, _p_wxScrollWinEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsBrush, _p_wxGraphicsBrushTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsRenderer, _p_wxGraphicsRendererTo_p_wxObject, 0, 0}, {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxPalette, _p_wxPaletteTo_p_wxObject, 0, 0}, {&_swigt__p_wxImageList, _p_wxImageListTo_p_wxObject, 0, 0}, {&_swigt__p_wxCursor, _p_wxCursorTo_p_wxObject, 0, 0}, {&_swigt__p_wxObject, 0, 0, 0}, {&_swigt__p_wxGraphicsFont, _p_wxGraphicsFontTo_p_wxObject, 0, 0}, {&_swigt__p_wxMirrorDC, _p_wxMirrorDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxEncodingConverter, _p_wxEncodingConverterTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindowDestroyEvent, _p_wxWindowDestroyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxNavigationKeyEvent, _p_wxNavigationKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxKeyEvent, _p_wxKeyEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMetaFileDC, _p_wxMetaFileDCTo_p_wxObject, 0, 0}, {&_swigt__p_wxWindow, _p_wxWindowTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxObject, 0, 0}, {&_swigt__p_wxFileSystem, _p_wxFileSystemTo_p_wxObject, 0, 0}, {&_swigt__p_wxBitmap, _p_wxBitmapTo_p_wxObject, 0, 0}, {&_swigt__p_wxGraphicsMatrix, _p_wxGraphicsMatrixTo_p_wxObject, 0, 0}, {&_swigt__p_wxContextMenuEvent, _p_wxContextMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMenuEvent, _p_wxMenuEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyApp, _p_wxPyAppTo_p_wxObject, 0, 0}, {&_swigt__p_wxCloseEvent, _p_wxCloseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxMouseEvent, _p_wxMouseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxEraseEvent, _p_wxEraseEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyCommandEvent, _p_wxPyCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxCommandEvent, _p_wxCommandEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxDropFilesEvent, _p_wxDropFilesEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxFocusEvent, _p_wxFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxChildFocusEvent, _p_wxChildFocusEventTo_p_wxObject, 0, 0}, {&_swigt__p_wxBrush, _p_wxBrushTo_p_wxObject, 0, 0}, {&_swigt__p_wxMetaFile, _p_wxMetaFileTo_p_wxObject, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxObject, 0, 0}, {&_swigt__p_wxColour, _p_wxColourTo_p_wxObject, 0, 0}, {&_swigt__p_wxPyValidator, _p_wxPyValidatorTo_p_wxObject, 0, 0}, {&_swigt__p_wxValidator, _p_wxValidatorTo_p_wxObject, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxOverlay[] = { {&_swigt__p_wxOverlay, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPaintDC[] = { {&_swigt__p_wxPaintDC, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxPalette[] = { {&_swigt__p_wxPalette, 0, 0, 0},{0, 0, 0, 0}}; @@ -40693,7 +41367,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_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_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_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}}; @@ -40701,7 +41374,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_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_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_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}}; @@ -40712,7 +41385,7 @@ static swig_cast_info _swigc__p_wxSplitterRenderParams[] = { {&_swigt__p_wxSpli static swig_cast_info _swigc__p_wxStockGDI[] = { {&_swigt__p_wxStockGDI, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxString[] = { {&_swigt__p_wxString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindowDC[] = { {&_swigt__p_wxWindowDC, 0, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxWindowDC, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindowDC[] = { {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxWindowDC, 0, 0, 0}, {&_swigt__p_wxMemoryDC, _p_wxMemoryDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxWindowDC, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_buffer, @@ -40738,12 +41411,10 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxBufferedDC, _swigc__p_wxBufferedPaintDC, _swigc__p_wxCURHandler, - _swigc__p_wxChar, _swigc__p_wxChildFocusEvent, _swigc__p_wxClientDC, _swigc__p_wxClipboardTextEvent, _swigc__p_wxCloseEvent, - _swigc__p_wxColor, _swigc__p_wxColour, _swigc__p_wxColourDatabase, _swigc__p_wxCommandEvent, @@ -40766,6 +41437,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxEncodingConverter, _swigc__p_wxEraseEvent, _swigc__p_wxEvent, + _swigc__p_wxEventBlocker, _swigc__p_wxEvtHandler, _swigc__p_wxFSFile, _swigc__p_wxFileSystem, @@ -40842,7 +41514,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxPixelDataBase, _swigc__p_wxPoint, _swigc__p_wxPoint2D, - _swigc__p_wxPoint2DDouble, _swigc__p_wxPostScriptDC, _swigc__p_wxPrintData, _swigc__p_wxPrinterDC, @@ -40857,7 +41528,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxPyValidator, _swigc__p_wxQueryNewPaletteEvent, _swigc__p_wxRect, - _swigc__p_wxRect2DDouble, + _swigc__p_wxRect2D, _swigc__p_wxRegion, _swigc__p_wxRegionIterator, _swigc__p_wxRendererNative, @@ -40877,6 +41548,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxStockGDI, _swigc__p_wxString, _swigc__p_wxSysColourChangedEvent, + _swigc__p_wxTGAHandler, _swigc__p_wxTIFFHandler, _swigc__p_wxUpdateUIEvent, _swigc__p_wxValidator, @@ -41771,6 +42443,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "PLATFORM_MAC",SWIG_From_int(static_cast< int >(wxPLATFORM_MAC))); SWIG_Python_SetConstant(d, "BUFFER_VIRTUAL_AREA",SWIG_From_int(static_cast< int >(wxBUFFER_VIRTUAL_AREA))); SWIG_Python_SetConstant(d, "BUFFER_CLIENT_AREA",SWIG_From_int(static_cast< int >(wxBUFFER_CLIENT_AREA))); + SWIG_Python_SetConstant(d, "BUFFER_USES_SHARED_BUFFER",SWIG_From_int(static_cast< int >(wxBUFFER_USES_SHARED_BUFFER))); PyDict_SetItemString(d,(char*)"cvar", SWIG_globals()); SWIG_addvarlink(SWIG_globals(),(char*)"NullGraphicsPen",NullGraphicsPen_get, NullGraphicsPen_set); SWIG_addvarlink(SWIG_globals(),(char*)"NullGraphicsBrush",NullGraphicsBrush_get, NullGraphicsBrush_set);