X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aff4cc5c90247c47512920644a072aad1424f712..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/src/mac/_core_wrap.cpp diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 20c825759e..8dfaadcf1d 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", type, otype); } - Py_DECREF(str); + if (str) + Py_DECREF(str); return; } } @@ -1352,120 +1353,121 @@ SWIG_Python_GetTypeList() { #define SWIGTYPE_p_wxAcceleratorEntry swig_types[11] #define SWIGTYPE_p_wxUpdateUIEvent swig_types[12] #define SWIGTYPE_p_wxEvent swig_types[13] -#define SWIGTYPE_p_wxMenu swig_types[14] -#define SWIGTYPE_p_wxGridSizer swig_types[15] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[16] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[17] -#define SWIGTYPE_p_wxItemContainer swig_types[18] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[19] -#define SWIGTYPE_p_wxPaintEvent swig_types[20] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[21] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[22] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[23] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[24] -#define SWIGTYPE_p_wxControl swig_types[25] -#define SWIGTYPE_p_wxFont swig_types[26] -#define SWIGTYPE_p_wxMenuBarBase swig_types[27] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[28] -#define SWIGTYPE_p_wxFSFile swig_types[29] -#define SWIGTYPE_p_wxCaret swig_types[30] -#define SWIGTYPE_ptrdiff_t swig_types[31] -#define SWIGTYPE_std__ptrdiff_t swig_types[32] -#define SWIGTYPE_p_wxRegion swig_types[33] -#define SWIGTYPE_p_wxPoint2D swig_types[34] -#define SWIGTYPE_p_int swig_types[35] -#define SWIGTYPE_p_wxSize swig_types[36] -#define SWIGTYPE_p_wxDC swig_types[37] -#define SWIGTYPE_p_wxPySizer swig_types[38] -#define SWIGTYPE_p_wxVisualAttributes swig_types[39] -#define SWIGTYPE_p_wxNotifyEvent swig_types[40] -#define SWIGTYPE_p_wxPyEvent swig_types[41] -#define SWIGTYPE_p_wxPropagationDisabler swig_types[42] -#define SWIGTYPE_p_form_ops_t swig_types[43] -#define SWIGTYPE_p_wxAppTraits swig_types[44] -#define SWIGTYPE_p_wxArrayString swig_types[45] -#define SWIGTYPE_p_wxShowEvent swig_types[46] -#define SWIGTYPE_p_wxToolTip swig_types[47] -#define SWIGTYPE_p_wxMoveEvent swig_types[48] -#define SWIGTYPE_p_wxSizeEvent swig_types[49] -#define SWIGTYPE_p_wxActivateEvent swig_types[50] -#define SWIGTYPE_p_wxIconizeEvent swig_types[51] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[52] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[53] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[54] -#define SWIGTYPE_p_wxIdleEvent swig_types[55] -#define SWIGTYPE_p_wxDateEvent swig_types[56] -#define SWIGTYPE_p_wxMenuItem swig_types[57] -#define SWIGTYPE_p_wxStaticBox swig_types[58] -#define SWIGTYPE_p_long swig_types[59] -#define SWIGTYPE_p_wxDuplexMode swig_types[60] -#define SWIGTYPE_p_wxTIFFHandler swig_types[61] -#define SWIGTYPE_p_wxXPMHandler swig_types[62] -#define SWIGTYPE_p_wxPNMHandler swig_types[63] -#define SWIGTYPE_p_wxJPEGHandler swig_types[64] -#define SWIGTYPE_p_wxPCXHandler swig_types[65] -#define SWIGTYPE_p_wxGIFHandler swig_types[66] -#define SWIGTYPE_p_wxPNGHandler swig_types[67] -#define SWIGTYPE_p_wxANIHandler swig_types[68] -#define SWIGTYPE_p_wxMemoryFSHandler swig_types[69] -#define SWIGTYPE_p_wxZipFSHandler swig_types[70] -#define SWIGTYPE_p_wxInternetFSHandler swig_types[71] -#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[72] -#define SWIGTYPE_p_wxEvtHandler swig_types[73] -#define SWIGTYPE_p_wxCURHandler swig_types[74] -#define SWIGTYPE_p_wxICOHandler swig_types[75] -#define SWIGTYPE_p_wxBMPHandler swig_types[76] -#define SWIGTYPE_p_wxImageHandler swig_types[77] -#define SWIGTYPE_p_wxFileSystemHandler swig_types[78] -#define SWIGTYPE_p_wxRect swig_types[79] -#define SWIGTYPE_p_wxButton swig_types[80] -#define SWIGTYPE_p_wxGBSpan swig_types[81] -#define SWIGTYPE_p_wxPropagateOnce swig_types[82] -#define SWIGTYPE_p_wxAcceleratorTable swig_types[83] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[84] -#define SWIGTYPE_p_char swig_types[85] -#define SWIGTYPE_p_wxGBPosition swig_types[86] -#define SWIGTYPE_p_wxImage swig_types[87] -#define SWIGTYPE_p_wxFrame swig_types[88] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[89] -#define SWIGTYPE_p_wxPaperSize swig_types[90] -#define SWIGTYPE_p_wxImageHistogram swig_types[91] -#define SWIGTYPE_p_wxPoint swig_types[92] -#define SWIGTYPE_p_wxCursor swig_types[93] -#define SWIGTYPE_p_wxObject swig_types[94] -#define SWIGTYPE_p_wxInputStream swig_types[95] -#define SWIGTYPE_p_wxOutputStream swig_types[96] -#define SWIGTYPE_p_wxPyInputStream swig_types[97] -#define SWIGTYPE_p_wxDateTime swig_types[98] -#define SWIGTYPE_p_wxKeyEvent swig_types[99] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[100] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[101] -#define SWIGTYPE_p_unsigned_long swig_types[102] -#define SWIGTYPE_p_wxWindow swig_types[103] -#define SWIGTYPE_p_wxMenuBar swig_types[104] -#define SWIGTYPE_p_wxFileSystem swig_types[105] -#define SWIGTYPE_p_wxBitmap swig_types[106] -#define SWIGTYPE_unsigned_int swig_types[107] -#define SWIGTYPE_p_unsigned_int swig_types[108] -#define SWIGTYPE_p_wxMenuEvent swig_types[109] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[110] -#define SWIGTYPE_p_unsigned_char swig_types[111] -#define SWIGTYPE_p_wxEraseEvent swig_types[112] -#define SWIGTYPE_p_wxMouseEvent swig_types[113] -#define SWIGTYPE_p_wxCloseEvent swig_types[114] -#define SWIGTYPE_p_wxPyApp swig_types[115] -#define SWIGTYPE_p_wxCommandEvent swig_types[116] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[117] -#define SWIGTYPE_p_wxPyDropTarget swig_types[118] -#define SWIGTYPE_p_wxQuantize swig_types[119] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[120] +#define SWIGTYPE_p_buffer swig_types[14] +#define SWIGTYPE_p_wxMenu swig_types[15] +#define SWIGTYPE_p_wxGridSizer swig_types[16] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[17] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[18] +#define SWIGTYPE_p_wxItemContainer swig_types[19] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[20] +#define SWIGTYPE_p_wxPaintEvent swig_types[21] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[22] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[23] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[24] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[25] +#define SWIGTYPE_p_wxControl swig_types[26] +#define SWIGTYPE_p_wxFont swig_types[27] +#define SWIGTYPE_p_wxMenuBarBase swig_types[28] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[29] +#define SWIGTYPE_p_wxFSFile swig_types[30] +#define SWIGTYPE_p_wxCaret swig_types[31] +#define SWIGTYPE_ptrdiff_t swig_types[32] +#define SWIGTYPE_std__ptrdiff_t swig_types[33] +#define SWIGTYPE_p_wxRegion swig_types[34] +#define SWIGTYPE_p_wxPoint2D swig_types[35] +#define SWIGTYPE_p_int swig_types[36] +#define SWIGTYPE_p_wxSize swig_types[37] +#define SWIGTYPE_p_wxDC swig_types[38] +#define SWIGTYPE_p_wxPySizer swig_types[39] +#define SWIGTYPE_p_wxVisualAttributes swig_types[40] +#define SWIGTYPE_p_wxNotifyEvent swig_types[41] +#define SWIGTYPE_p_wxPyEvent swig_types[42] +#define SWIGTYPE_p_wxPropagationDisabler swig_types[43] +#define SWIGTYPE_p_form_ops_t swig_types[44] +#define SWIGTYPE_p_wxAppTraits swig_types[45] +#define SWIGTYPE_p_wxArrayString swig_types[46] +#define SWIGTYPE_p_wxShowEvent swig_types[47] +#define SWIGTYPE_p_wxToolTip swig_types[48] +#define SWIGTYPE_p_wxMoveEvent swig_types[49] +#define SWIGTYPE_p_wxSizeEvent swig_types[50] +#define SWIGTYPE_p_wxActivateEvent swig_types[51] +#define SWIGTYPE_p_wxIconizeEvent swig_types[52] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[53] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[54] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[55] +#define SWIGTYPE_p_wxIdleEvent swig_types[56] +#define SWIGTYPE_p_wxDateEvent swig_types[57] +#define SWIGTYPE_p_wxMenuItem swig_types[58] +#define SWIGTYPE_p_wxStaticBox swig_types[59] +#define SWIGTYPE_p_long swig_types[60] +#define SWIGTYPE_p_wxDuplexMode swig_types[61] +#define SWIGTYPE_p_wxTIFFHandler swig_types[62] +#define SWIGTYPE_p_wxXPMHandler swig_types[63] +#define SWIGTYPE_p_wxPNMHandler swig_types[64] +#define SWIGTYPE_p_wxJPEGHandler swig_types[65] +#define SWIGTYPE_p_wxPCXHandler swig_types[66] +#define SWIGTYPE_p_wxGIFHandler swig_types[67] +#define SWIGTYPE_p_wxPNGHandler swig_types[68] +#define SWIGTYPE_p_wxANIHandler swig_types[69] +#define SWIGTYPE_p_wxMemoryFSHandler swig_types[70] +#define SWIGTYPE_p_wxZipFSHandler swig_types[71] +#define SWIGTYPE_p_wxInternetFSHandler swig_types[72] +#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[73] +#define SWIGTYPE_p_wxEvtHandler swig_types[74] +#define SWIGTYPE_p_wxCURHandler swig_types[75] +#define SWIGTYPE_p_wxICOHandler swig_types[76] +#define SWIGTYPE_p_wxBMPHandler swig_types[77] +#define SWIGTYPE_p_wxImageHandler swig_types[78] +#define SWIGTYPE_p_wxFileSystemHandler swig_types[79] +#define SWIGTYPE_p_wxRect swig_types[80] +#define SWIGTYPE_p_wxButton swig_types[81] +#define SWIGTYPE_p_wxGBSpan swig_types[82] +#define SWIGTYPE_p_wxPropagateOnce swig_types[83] +#define SWIGTYPE_p_wxAcceleratorTable swig_types[84] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[85] +#define SWIGTYPE_p_char swig_types[86] +#define SWIGTYPE_p_wxGBPosition swig_types[87] +#define SWIGTYPE_p_wxImage swig_types[88] +#define SWIGTYPE_p_wxFrame swig_types[89] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[90] +#define SWIGTYPE_p_wxPaperSize swig_types[91] +#define SWIGTYPE_p_wxImageHistogram swig_types[92] +#define SWIGTYPE_p_wxPoint swig_types[93] +#define SWIGTYPE_p_wxCursor swig_types[94] +#define SWIGTYPE_p_wxObject swig_types[95] +#define SWIGTYPE_p_wxInputStream swig_types[96] +#define SWIGTYPE_p_wxOutputStream swig_types[97] +#define SWIGTYPE_p_wxPyInputStream swig_types[98] +#define SWIGTYPE_p_wxDateTime swig_types[99] +#define SWIGTYPE_p_wxKeyEvent swig_types[100] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[101] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[102] +#define SWIGTYPE_p_unsigned_long swig_types[103] +#define SWIGTYPE_p_wxWindow swig_types[104] +#define SWIGTYPE_p_wxMenuBar swig_types[105] +#define SWIGTYPE_p_wxFileSystem swig_types[106] +#define SWIGTYPE_p_wxBitmap swig_types[107] +#define SWIGTYPE_unsigned_int swig_types[108] +#define SWIGTYPE_p_unsigned_int swig_types[109] +#define SWIGTYPE_p_wxMenuEvent swig_types[110] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[111] +#define SWIGTYPE_p_unsigned_char swig_types[112] +#define SWIGTYPE_p_wxEraseEvent swig_types[113] +#define SWIGTYPE_p_wxMouseEvent swig_types[114] +#define SWIGTYPE_p_wxCloseEvent swig_types[115] +#define SWIGTYPE_p_wxPyApp swig_types[116] +#define SWIGTYPE_p_wxCommandEvent swig_types[117] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[118] +#define SWIGTYPE_p_wxPyDropTarget swig_types[119] +#define SWIGTYPE_p_wxQuantize swig_types[120] #define SWIGTYPE_p_wxFocusEvent swig_types[121] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[122] -#define SWIGTYPE_p_wxControlWithItems swig_types[123] -#define SWIGTYPE_p_wxColour swig_types[124] -#define SWIGTYPE_p_wxValidator swig_types[125] -#define SWIGTYPE_p_wxPyValidator swig_types[126] -static swig_type_info *swig_types[128]; +#define SWIGTYPE_p_wxChildFocusEvent swig_types[122] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[123] +#define SWIGTYPE_p_wxControlWithItems swig_types[124] +#define SWIGTYPE_p_wxColour swig_types[125] +#define SWIGTYPE_p_wxValidator swig_types[126] +#define SWIGTYPE_p_wxPyValidator swig_types[127] +static swig_type_info *swig_types[129]; /* -------- TYPES TABLE (END) -------- */ @@ -1787,7 +1789,7 @@ SWIG_Check_int(PyObject* obj) } static PyObject *wxSize_Get(wxSize *self){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); @@ -1839,7 +1841,7 @@ static void wxRealPoint_Set(wxRealPoint *self,double x,double y){ self->y = y; } static PyObject *wxRealPoint_Get(wxRealPoint *self){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x)); PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y)); @@ -1872,7 +1874,7 @@ static void wxPoint_Set(wxPoint *self,long x,long y){ self->y = y; } static PyObject *wxPoint_Get(wxPoint *self){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); @@ -1886,7 +1888,7 @@ static void wxRect_Set(wxRect *self,int x=0,int y=0,int width=0,int height=0){ self->height = height; } static PyObject *wxRect_Get(wxRect *self){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(4); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); @@ -1906,7 +1908,7 @@ static PyObject *wxRect_Get(wxRect *self){ dest = reg1.GetBox(); if (dest != wxRect(0,0,0,0)) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxRect* newRect = new wxRect(dest); obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true); wxPyEndBlockThreads(blocked); @@ -1949,7 +1951,7 @@ static void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){ self->m_y = y; } static PyObject *wxPoint2D_Get(wxPoint2D *self){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x)); PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y)); @@ -2211,7 +2213,7 @@ static wxString FileSystem_URLToFileName(wxString const &url){ return; } - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); void* ptr = (void*)PyString_AsString(data); size_t size = PyString_Size(data); wxPyEndBlockThreads(blocked); @@ -2301,93 +2303,138 @@ SWIG_Check_unsigned_SS_char(PyObject* obj) /*@@*/ -static wxImage *new_wxImage(int width=0,int height=0,bool clear=true){ - if (width > 0 && height > 0) - return new wxImage(width, height, clear); - else - return new wxImage; + +SWIGINTERNSHORT unsigned long +SWIG_As_unsigned_SS_long(PyObject* obj) +{ + unsigned long v; + if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) { + /* + this is needed to make valgrind/purify happier. + */ + memset((void*)&v, 0, sizeof(unsigned long)); + } + return v; +} + + +SWIGINTERNSHORT int +SWIG_Check_unsigned_SS_long(PyObject* obj) +{ + return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0); +} + +static unsigned long wxImageHistogram_GetCount(wxImageHistogram *self,unsigned long key){ + wxImageHistogramEntry e = (*self)[key]; + return e.value; } -static wxImage *new_wxImage(wxBitmap const &bitmap){ - return new wxImage(bitmap.ConvertToImage()); +static unsigned long wxImageHistogram_GetCountRGB(wxImageHistogram *self,byte r,byte g,byte b){ + unsigned long key = wxImageHistogram::MakeKey(r, g, b); + wxImageHistogramEntry e = (*self)[key]; + return e.value; } -static wxImage *new_wxImage(int width,int height,unsigned char *data){ - // Copy the source data so the wxImage can clean it up later - unsigned char* copy = (unsigned char*)malloc(width*height*3); - if (copy == NULL) { - PyErr_NoMemory(); - return NULL; +static unsigned long wxImageHistogram_GetCountColour(wxImageHistogram *self,wxColour const &colour){ + unsigned long key = wxImageHistogram::MakeKey(colour.Red(), + colour.Green(), + colour.Blue()); + wxImageHistogramEntry e = (*self)[key]; + return e.value; + } + + typedef unsigned char* buffer; + +static wxImage *new_wxImage(int width=0,int height=0,bool clear=true){ + if (width > 0 && height > 0) + return new wxImage(width, height, clear); + else + return new wxImage; } - memcpy(copy, data, width*height*3); - return new wxImage(width, height, copy, false); - } -static wxImage *new_wxImage(int width,int height,unsigned char *data,unsigned char *alpha){ - // Copy the source data so the wxImage can clean it up later - unsigned char* dcopy = (unsigned char*)malloc(width*height*3); - if (dcopy == NULL) { - PyErr_NoMemory(); - return NULL; +static wxImage *new_wxImage(wxBitmap const &bitmap){ + return new wxImage(bitmap.ConvertToImage()); } - memcpy(dcopy, data, width*height*3); - unsigned char* acopy = (unsigned char*)malloc(width*height); - if (acopy == NULL) { - PyErr_NoMemory(); - return NULL; +static wxImage *new_wxImage(int width,int height,buffer data,int DATASIZE){ + if (DATASIZE != width*height*3) { + wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size."); + return NULL; + } + + // Copy the source data so the wxImage can clean it up later + buffer copy = (buffer)malloc(DATASIZE); + if (copy == NULL) { + wxPyBLOCK_THREADS(PyErr_NoMemory()); + return NULL; + } + memcpy(copy, data, DATASIZE); + return new wxImage(width, height, copy, false); } - memcpy(acopy, alpha, width*height); +static wxImage *new_wxImage(int width,int height,buffer data,int DATASIZE,buffer alpha,int ALPHASIZE){ + if (DATASIZE != width*height*3) { + wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size."); + return NULL; + } + if (ALPHASIZE != width*height) { + wxPyErr_SetString(PyExc_ValueError, "Invalid alpha buffer size."); + return NULL; + } + + // Copy the source data so the wxImage can clean it up later + buffer dcopy = (buffer)malloc(DATASIZE); + if (dcopy == NULL) { + wxPyBLOCK_THREADS(PyErr_NoMemory()); + return NULL; + } + memcpy(dcopy, data, DATASIZE); - return new wxImage(width, height, dcopy, acopy, false); - } + buffer acopy = (buffer)malloc(ALPHASIZE); + if (acopy == NULL) { + wxPyBLOCK_THREADS(PyErr_NoMemory()); + return NULL; + } + memcpy(acopy, alpha, ALPHASIZE); + + return new wxImage(width, height, dcopy, acopy, false); + } static wxSize wxImage_GetSize(wxImage *self){ wxSize size(self->GetWidth(), self->GetHeight()); return size; } static PyObject *wxImage_GetData(wxImage *self){ - unsigned char* data = self->GetData(); + buffer data = self->GetData(); int len = self->GetWidth() * self->GetHeight() * 3; PyObject* rv; wxPyBLOCK_THREADS( rv = PyString_FromStringAndSize((char*)data, len)); return rv; } -static void wxImage_SetData(wxImage *self,PyObject *data){ - unsigned char* dataPtr; - - if (! PyString_Check(data)) { - wxPyBLOCK_THREADS(PyErr_SetString(PyExc_TypeError, - "Expected string object")); - return /* NULL */ ; - } - - size_t len = self->GetWidth() * self->GetHeight() * 3; - dataPtr = (unsigned char*) malloc(len); - wxPyBLOCK_THREADS( memcpy(dataPtr, PyString_AsString(data), len) ); - self->SetData(dataPtr); - // wxImage takes ownership of dataPtr... +static void wxImage_SetData(wxImage *self,buffer data,int DATASIZE){ + if (DATASIZE != self->GetWidth() * self->GetHeight() * 3) { + wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size."); + return; + } + buffer copy = (buffer)malloc(DATASIZE); + if (copy == NULL) { + wxPyBLOCK_THREADS(PyErr_NoMemory()); + return; + } + memcpy(copy, data, DATASIZE); + self->SetData(copy, false); + // wxImage takes ownership of copy... } static PyObject *wxImage_GetDataBuffer(wxImage *self){ - unsigned char* data = self->GetData(); + buffer data = self->GetData(); int len = self->GetWidth() * self->GetHeight() * 3; PyObject* rv; wxPyBLOCK_THREADS( rv = PyBuffer_FromReadWriteMemory(data, len) ); return rv; } -static void wxImage_SetDataBuffer(wxImage *self,PyObject *data){ - unsigned char* buffer; - int size; - - bool blocked = wxPyBeginBlockThreads(); - if (!PyArg_Parse(data, "t#", &buffer, &size)) - goto done; - - if (size != self->GetWidth() * self->GetHeight() * 3) { - PyErr_SetString(PyExc_TypeError, "Incorrect buffer size"); - goto done; +static void wxImage_SetDataBuffer(wxImage *self,buffer data,int DATASIZE){ + if (DATASIZE != self->GetWidth() * self->GetHeight() * 3) { + wxPyErr_SetString(PyExc_ValueError, "Invalid data buffer size."); + return; } - self->SetData(buffer); - done: - wxPyEndBlockThreads(blocked); + self->SetData(data, true); } static PyObject *wxImage_GetAlphaData(wxImage *self){ - unsigned char* data = self->GetAlpha(); + buffer data = self->GetAlpha(); if (! data) { RETURN_NONE(); } else { @@ -2397,69 +2444,39 @@ static PyObject *wxImage_GetAlphaData(wxImage *self){ return rv; } } -static void wxImage_SetAlphaData(wxImage *self,PyObject *data){ - unsigned char* dataPtr; - - if (! PyString_Check(data)) { - PyErr_SetString(PyExc_TypeError, "Expected string object"); - return /* NULL */ ; +static void wxImage_SetAlphaData(wxImage *self,buffer alpha,int ALPHASIZE){ + if (ALPHASIZE != self->GetWidth() * self->GetHeight()) { + wxPyErr_SetString(PyExc_ValueError, "Invalid alpha buffer size."); + return; } - - size_t len = self->GetWidth() * self->GetHeight(); - dataPtr = (unsigned char*) malloc(len); - wxPyBLOCK_THREADS( memcpy(dataPtr, PyString_AsString(data), len) ); - self->SetAlpha(dataPtr); - // wxImage takes ownership of dataPtr... + buffer acopy = (buffer)malloc(ALPHASIZE); + if (acopy == NULL) { + wxPyBLOCK_THREADS(PyErr_NoMemory()); + return; + } + memcpy(acopy, alpha, ALPHASIZE); + self->SetAlpha(acopy, false); + // wxImage takes ownership of acopy... } static PyObject *wxImage_GetAlphaBuffer(wxImage *self){ - unsigned char* data = self->GetAlpha(); + buffer data = self->GetAlpha(); int len = self->GetWidth() * self->GetHeight(); PyObject* rv; wxPyBLOCK_THREADS( rv = PyBuffer_FromReadWriteMemory(data, len) ); return rv; } -static void wxImage_SetAlphaBuffer(wxImage *self,PyObject *data){ - unsigned char* buffer; - int size; - - bool blocked = wxPyBeginBlockThreads(); - if (!PyArg_Parse(data, "t#", &buffer, &size)) - goto done; - - if (size != self->GetWidth() * self->GetHeight()) { - PyErr_SetString(PyExc_TypeError, "Incorrect buffer size"); - goto done; +static void wxImage_SetAlphaBuffer(wxImage *self,buffer alpha,int ALPHASIZE){ + if (ALPHASIZE != self->GetWidth() * self->GetHeight()) { + wxPyErr_SetString(PyExc_ValueError, "Invalid alpha buffer size."); + return; } - self->SetAlpha(buffer); - done: - wxPyEndBlockThreads(blocked); + self->SetAlpha(alpha, true); } - -SWIGINTERNSHORT unsigned long -SWIG_As_unsigned_SS_long(PyObject* obj) -{ - unsigned long v; - if (!SWIG_AsVal_unsigned_SS_long(obj, &v)) { - /* - this is needed to make valgrind/purify happier. - */ - memset((void*)&v, 0, sizeof(unsigned long)); - } - return v; -} - - -SWIGINTERNSHORT int -SWIG_Check_unsigned_SS_long(PyObject* obj) -{ - return SWIG_AsVal_unsigned_SS_long(obj, (unsigned long*)0); -} - static wxBitmap wxImage_ConvertToBitmap(wxImage *self,int depth=-1){ wxBitmap bitmap(*self, depth); return bitmap; } -static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,unsigned char red,unsigned char green,unsigned char blue){ +static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,byte red,byte green,byte blue){ wxImage mono = self->ConvertToMono( red, green, blue ); wxBitmap bitmap( mono, 1 ); return bitmap; @@ -2595,16 +2612,19 @@ static void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){ static PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){ int count = self->GetNumberOfFiles(); wxString* files = self->GetFiles(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* list = PyList_New(count); if (!list) { PyErr_SetString(PyExc_MemoryError, "Can't allocate list of files!"); + wxPyEndBlockThreads(blocked); return NULL; } for (int i=0; iAssociateHandle((WXWidget)handle); } +static void wxWindow_DragAcceptFiles(wxWindow *self,bool accept){} wxWindow* wxFindWindowById( long id, const wxWindow *parent = NULL ) { return wxWindow::FindWindowById(id, parent); @@ -2750,6 +2771,11 @@ wxWindow* wxFindWindowByLabel( const wxString& label, } + PyObject* GetTopLevelWindows() { + return wxPy_ConvertList(&wxTopLevelWindows); + } + + IMP_PYCALLBACK_BOOL_WXWIN(wxPyValidator, wxValidator, Validate); IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferToWindow); IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferFromWindow); @@ -2810,7 +2836,7 @@ static void wxItemContainer_SetClientData(wxItemContainer *self,int n,PyObject * static wxSizerItem *new_wxSizerItem(wxWindow *window,int proportion,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); data = new wxPyUserData(userData); wxPyEndBlockThreads(blocked); } @@ -2819,7 +2845,7 @@ static wxSizerItem *new_wxSizerItem(wxWindow *window,int proportion,int flag,int static wxSizerItem *new_wxSizerItem(int width,int height,int proportion,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); data = new wxPyUserData(userData); wxPyEndBlockThreads(blocked); } @@ -2828,7 +2854,7 @@ static wxSizerItem *new_wxSizerItem(int width,int height,int proportion,int flag static wxSizerItem *new_wxSizerItem(wxSizer *sizer,int proportion,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); data = new wxPyUserData(userData); wxPyEndBlockThreads(blocked); } @@ -2987,7 +3013,7 @@ static void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){ static wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); @@ -3007,7 +3033,7 @@ static wxSizerItem *wxSizer_Add(wxSizer *self,PyObject *item,int proportion=0,in static wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); @@ -3027,7 +3053,7 @@ static wxSizerItem *wxSizer_Insert(wxSizer *self,int before,PyObject *item,int p static wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion=0,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); @@ -3045,7 +3071,7 @@ static wxSizerItem *wxSizer_Prepend(wxSizer *self,PyObject *item,int proportion= return NULL; } static bool wxSizer_Remove(wxSizer *self,PyObject *item){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) @@ -3058,7 +3084,7 @@ static bool wxSizer_Remove(wxSizer *self,PyObject *item){ return false; } static bool wxSizer_Detach(wxSizer *self,PyObject *item){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) @@ -3071,7 +3097,7 @@ static bool wxSizer_Detach(wxSizer *self,PyObject *item){ return false; } static wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) @@ -3084,7 +3110,7 @@ static wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){ return NULL; } static void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize const &size){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) @@ -3099,7 +3125,7 @@ static PyObject *wxSizer_GetChildren(wxSizer *self){ return wxPy_ConvertList(&list); } static bool wxSizer_Show(wxSizer *self,PyObject *item,bool show=true,bool recursive=false){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) @@ -3112,7 +3138,7 @@ static bool wxSizer_Show(wxSizer *self,PyObject *item,bool show=true,bool recurs return false; } static bool wxSizer_IsShown(wxSizer *self,PyObject *item){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false); wxPyEndBlockThreads(blocked); if ( info.window ) @@ -3157,7 +3183,7 @@ static void wxGBPosition_Set(wxGBPosition *self,int row=0,int col=0){ self->SetCol(col); } static PyObject *wxGBPosition_Get(wxGBPosition *self){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol())); @@ -3169,7 +3195,7 @@ static void wxGBSpan_Set(wxGBSpan *self,int rowspan=1,int colspan=1){ self->SetColspan(colspan); } static PyObject *wxGBSpan_Get(wxGBSpan *self){ - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan())); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetColspan())); @@ -3179,7 +3205,7 @@ static PyObject *wxGBSpan_Get(wxGBSpan *self){ static wxGBSizerItem *new_wxGBSizerItem(wxWindow *window,wxGBPosition const &pos,wxGBSpan const &span,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); data = new wxPyUserData(userData); wxPyEndBlockThreads(blocked); } @@ -3188,7 +3214,7 @@ static wxGBSizerItem *new_wxGBSizerItem(wxWindow *window,wxGBPosition const &pos static wxGBSizerItem *new_wxGBSizerItem(wxSizer *sizer,wxGBPosition const &pos,wxGBSpan const &span,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); data = new wxPyUserData(userData); wxPyEndBlockThreads(blocked); } @@ -3197,7 +3223,7 @@ static wxGBSizerItem *new_wxGBSizerItem(wxSizer *sizer,wxGBPosition const &pos,w static wxGBSizerItem *new_wxGBSizerItem(int width,int height,wxGBPosition const &pos,wxGBSpan const &span,int flag,int border,PyObject *userData=NULL){ wxPyUserData* data = NULL; if ( userData ) { - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); data = new wxPyUserData(userData); wxPyEndBlockThreads(blocked); } @@ -3211,7 +3237,7 @@ static wxGBPosition wxGBSizerItem_GetEndPos(wxGBSizerItem *self){ static wxGBSizerItem *wxGridBagSizer_Add(wxGridBagSizer *self,PyObject *item,wxGBPosition const &pos,wxGBSpan const &span=wxDefaultSpan,int flag=0,int border=0,PyObject *userData=NULL){ wxPyUserData* data = NULL; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); if ( userData && (info.window || info.sizer || info.gotSize) ) data = new wxPyUserData(userData); @@ -10221,9 +10247,9 @@ static PyObject *_wrap_new_ImageHistogram(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - unsigned char arg1 ; - unsigned char arg2 ; - unsigned char arg3 ; + byte arg1 ; + byte arg2 ; + byte arg3 ; unsigned long result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10234,15 +10260,15 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *, PyObject *args, PyObje if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ImageHistogram_MakeKey",kwnames,&obj0,&obj1,&obj2)) goto fail; { - arg1 = (unsigned char)(SWIG_As_unsigned_SS_char(obj0)); + arg1 = (byte)(SWIG_As_unsigned_SS_char(obj0)); if (SWIG_arg_fail(1)) SWIG_fail; } { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { @@ -10264,18 +10290,18 @@ static PyObject *_wrap_ImageHistogram_MakeKey(PyObject *, PyObject *args, PyObje static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImageHistogram *arg1 = (wxImageHistogram *) 0 ; - unsigned char *arg2 = (unsigned char *) 0 ; - unsigned char *arg3 = (unsigned char *) 0 ; - unsigned char *arg4 = (unsigned char *) 0 ; - unsigned char arg5 = (unsigned char) 1 ; - unsigned char arg6 = (unsigned char) 0 ; - unsigned char arg7 = (unsigned char) 0 ; + byte *arg2 = (byte *) 0 ; + byte *arg3 = (byte *) 0 ; + byte *arg4 = (byte *) 0 ; + byte arg5 = (byte) 1 ; + byte arg6 = (byte) 0 ; + byte arg7 = (byte) 0 ; bool result; - unsigned char temp2 ; + byte temp2 ; int res2 = 0 ; - unsigned char temp3 ; + byte temp3 ; int res3 = 0 ; - unsigned char temp4 ; + byte temp4 ; int res4 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10293,19 +10319,19 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *, PyObject if (SWIG_arg_fail(1)) SWIG_fail; if (obj1) { { - arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg5 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(5)) SWIG_fail; } } if (obj2) { { - arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg6 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(6)) SWIG_fail; } } if (obj3) { { - arg7 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg7 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(7)) SWIG_fail; } } @@ -10331,6 +10357,121 @@ static PyObject *_wrap_ImageHistogram_FindFirstUnusedColour(PyObject *, PyObject } +static PyObject *_wrap_ImageHistogram_GetCount(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImageHistogram *arg1 = (wxImageHistogram *) 0 ; + unsigned long arg2 ; + unsigned long result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "key", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHistogram_GetCount",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHistogram, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (unsigned long)(SWIG_As_unsigned_SS_long(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (unsigned long)wxImageHistogram_GetCount(arg1,arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_unsigned_SS_long((unsigned long)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_ImageHistogram_GetCountRGB(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImageHistogram *arg1 = (wxImageHistogram *) 0 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; + unsigned long result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "r",(char *) "g",(char *) "b", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ImageHistogram_GetCountRGB",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHistogram, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + { + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (unsigned long)wxImageHistogram_GetCountRGB(arg1,arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_unsigned_SS_long((unsigned long)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_ImageHistogram_GetCountColour(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImageHistogram *arg1 = (wxImageHistogram *) 0 ; + wxColour *arg2 = 0 ; + unsigned long result; + wxColour temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "colour", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:ImageHistogram_GetCountColour",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImageHistogram, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (unsigned long)wxImageHistogram_GetCountColour(arg1,(wxColour const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_unsigned_SS_long((unsigned long)(result)); + } + return resultobj; + fail: + return NULL; +} + + static PyObject * ImageHistogram_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -10694,7 +10835,8 @@ static PyObject *_wrap_new_ImageFromData(PyObject *, PyObject *args, PyObject *k PyObject *resultobj; int arg1 ; int arg2 ; - unsigned char *arg3 = (unsigned char *) 0 ; + buffer arg3 ; + int arg4 ; wxImage *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10712,11 +10854,12 @@ static PyObject *_wrap_new_ImageFromData(PyObject *, PyObject *args, PyObject *k arg2 = (int)(SWIG_As_int(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_unsigned_char, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(3)) SWIG_fail; + { + if (!PyArg_Parse(obj2, "t#", &arg3, &arg4)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxImage *)new_wxImage(arg1,arg2,arg3); + result = (wxImage *)new_wxImage(arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -10732,8 +10875,10 @@ static PyObject *_wrap_new_ImageFromDataWithAlpha(PyObject *, PyObject *args, Py PyObject *resultobj; int arg1 ; int arg2 ; - unsigned char *arg3 = (unsigned char *) 0 ; - unsigned char *arg4 = (unsigned char *) 0 ; + buffer arg3 ; + int arg4 ; + buffer arg5 ; + int arg6 ; wxImage *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -10752,13 +10897,15 @@ static PyObject *_wrap_new_ImageFromDataWithAlpha(PyObject *, PyObject *args, Py arg2 = (int)(SWIG_As_int(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } - SWIG_Python_ConvertPtr(obj2, (void **)&arg3, SWIGTYPE_p_unsigned_char, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(3)) SWIG_fail; - SWIG_Python_ConvertPtr(obj3, (void **)&arg4, SWIGTYPE_p_unsigned_char, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(4)) SWIG_fail; + { + if (!PyArg_Parse(obj2, "t#", &arg3, &arg4)) SWIG_fail; + } + { + if (!PyArg_Parse(obj3, "t#", &arg5, &arg6)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxImage *)new_wxImage(arg1,arg2,arg3,arg4); + result = (wxImage *)new_wxImage(arg1,arg2,arg3,arg4,arg5,arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -10775,14 +10922,16 @@ static PyObject *_wrap_Image_Create(PyObject *, PyObject *args, PyObject *kwargs wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; + bool arg4 = (bool) true ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "width",(char *) "height", NULL + (char *) "self",(char *) "width",(char *) "height",(char *) "clear", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Image_Create",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_Create",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -10793,9 +10942,15 @@ static PyObject *_wrap_Image_Create(PyObject *, PyObject *args, PyObject *kwargs arg3 = (int)(SWIG_As_int(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } + if (obj3) { + { + arg4 = (bool)(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->Create(arg2,arg3); + (arg1)->Create(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11029,9 +11184,9 @@ static PyObject *_wrap_Image_SetRGB(PyObject *, PyObject *args, PyObject *kwargs wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char arg4 ; - unsigned char arg5 ; - unsigned char arg6 ; + byte arg4 ; + byte arg5 ; + byte arg6 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11054,15 +11209,15 @@ static PyObject *_wrap_Image_SetRGB(PyObject *, PyObject *args, PyObject *kwargs if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { - arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); + arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); if (SWIG_arg_fail(5)) SWIG_fail; } { - arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj5)); + arg6 = (byte)(SWIG_As_unsigned_SS_char(obj5)); if (SWIG_arg_fail(6)) SWIG_fail; } { @@ -11083,9 +11238,9 @@ static PyObject *_wrap_Image_SetRGBRect(PyObject *, PyObject *args, PyObject *kw PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; wxRect *arg2 = 0 ; - unsigned char arg3 ; - unsigned char arg4 ; - unsigned char arg5 ; + byte arg3 ; + byte arg4 ; + byte arg5 ; wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11104,15 +11259,15 @@ static PyObject *_wrap_Image_SetRGBRect(PyObject *, PyObject *args, PyObject *kw if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { - arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); + arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); if (SWIG_arg_fail(5)) SWIG_fail; } { @@ -11134,7 +11289,7 @@ static PyObject *_wrap_Image_GetRed(PyObject *, PyObject *args, PyObject *kwargs wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11155,7 +11310,7 @@ static PyObject *_wrap_Image_GetRed(PyObject *, PyObject *args, PyObject *kwargs } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetRed(arg2,arg3); + result = (byte)(arg1)->GetRed(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11174,7 +11329,7 @@ static PyObject *_wrap_Image_GetGreen(PyObject *, PyObject *args, PyObject *kwar wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11195,7 +11350,7 @@ static PyObject *_wrap_Image_GetGreen(PyObject *, PyObject *args, PyObject *kwar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetGreen(arg2,arg3); + result = (byte)(arg1)->GetGreen(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11214,7 +11369,7 @@ static PyObject *_wrap_Image_GetBlue(PyObject *, PyObject *args, PyObject *kwarg wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11235,7 +11390,7 @@ static PyObject *_wrap_Image_GetBlue(PyObject *, PyObject *args, PyObject *kwarg } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetBlue(arg2,arg3); + result = (byte)(arg1)->GetBlue(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11254,7 +11409,7 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *, PyObject *args, PyObject *kwar wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char arg4 ; + byte arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11275,7 +11430,7 @@ static PyObject *_wrap_Image_SetAlpha(PyObject *, PyObject *args, PyObject *kwar if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -11297,7 +11452,7 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *, PyObject *args, PyObject *kwar wxImage *arg1 = (wxImage *) 0 ; int arg2 ; int arg3 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11318,7 +11473,7 @@ static PyObject *_wrap_Image_GetAlpha(PyObject *, PyObject *args, PyObject *kwar } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetAlpha(arg2,arg3); + result = (byte)(arg1)->GetAlpha(arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -11385,6 +11540,54 @@ static PyObject *_wrap_Image_InitAlpha(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_Image_IsTransparent(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxImage *arg1 = (wxImage *) 0 ; + int arg2 ; + int arg3 ; + byte arg4 = (byte) wxIMAGE_ALPHA_THRESHOLD ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "x",(char *) "y",(char *) "threshold", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Image_IsTransparent",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (int)(SWIG_As_int(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + arg3 = (int)(SWIG_As_int(obj2)); + if (SWIG_arg_fail(3)) SWIG_fail; + } + if (obj3) { + { + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)((wxImage const *)arg1)->IsTransparent(arg2,arg3,arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; @@ -11458,7 +11661,7 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *, PyObject *args, P static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - byte arg2 = (byte) 128 ; + byte arg2 = (byte) wxIMAGE_ALPHA_THRESHOLD ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11494,9 +11697,9 @@ static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *, PyObject *args, PyOb static PyObject *_wrap_Image_ConvertColourToAlpha(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; bool result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -11510,15 +11713,15 @@ static PyObject *_wrap_Image_ConvertColourToAlpha(PyObject *, PyObject *args, Py SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -11600,7 +11803,7 @@ static PyObject *_wrap_Image_CanRead(PyObject *, PyObject *args, PyObject *kwarg bool temp1 = false ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "name", NULL + (char *) "filename", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Image_CanRead",kwnames,&obj0)) goto fail; @@ -11642,7 +11845,7 @@ static PyObject *_wrap_Image_GetImageCount(PyObject *, PyObject *args, PyObject PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "name",(char *) "type", NULL + (char *) "filename",(char *) "type", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_GetImageCount",kwnames,&obj0,&obj1)) goto fail; @@ -12436,7 +12639,8 @@ static PyObject *_wrap_Image_GetData(PyObject *, PyObject *args, PyObject *kwarg static PyObject *_wrap_Image_SetData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - PyObject *arg2 = (PyObject *) 0 ; + buffer arg2 ; + int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -12446,10 +12650,12 @@ static PyObject *_wrap_Image_SetData(PyObject *, PyObject *args, PyObject *kwarg if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetData",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - arg2 = obj1; + { + if (!PyArg_Parse(obj1, "t#", &arg2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxImage_SetData(arg1,arg2); + wxImage_SetData(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12490,7 +12696,8 @@ static PyObject *_wrap_Image_GetDataBuffer(PyObject *, PyObject *args, PyObject static PyObject *_wrap_Image_SetDataBuffer(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - PyObject *arg2 = (PyObject *) 0 ; + buffer arg2 ; + int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -12500,10 +12707,12 @@ static PyObject *_wrap_Image_SetDataBuffer(PyObject *, PyObject *args, PyObject if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetDataBuffer",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - arg2 = obj1; + { + if (!PyArg_Parse(obj1, "t#", &arg2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxImage_SetDataBuffer(arg1,arg2); + wxImage_SetDataBuffer(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12544,20 +12753,23 @@ static PyObject *_wrap_Image_GetAlphaData(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_Image_SetAlphaData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - PyObject *arg2 = (PyObject *) 0 ; + buffer arg2 ; + int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "data", NULL + (char *) "self",(char *) "alpha", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetAlphaData",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - arg2 = obj1; + { + if (!PyArg_Parse(obj1, "t#", &arg2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxImage_SetAlphaData(arg1,arg2); + wxImage_SetAlphaData(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12598,20 +12810,23 @@ static PyObject *_wrap_Image_GetAlphaBuffer(PyObject *, PyObject *args, PyObject static PyObject *_wrap_Image_SetAlphaBuffer(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - PyObject *arg2 = (PyObject *) 0 ; + buffer arg2 ; + int arg3 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "data", NULL + (char *) "self",(char *) "alpha", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Image_SetAlphaBuffer",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - arg2 = obj1; + { + if (!PyArg_Parse(obj1, "t#", &arg2, &arg3)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxImage_SetAlphaBuffer(arg1,arg2); + wxImage_SetAlphaBuffer(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12626,9 +12841,9 @@ static PyObject *_wrap_Image_SetAlphaBuffer(PyObject *, PyObject *args, PyObject static PyObject *_wrap_Image_SetMaskColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -12641,15 +12856,15 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *, PyObject *args, PyObject SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -12669,14 +12884,14 @@ static PyObject *_wrap_Image_SetMaskColour(PyObject *, PyObject *args, PyObject static PyObject *_wrap_Image_GetOrFindMaskColour(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char *arg2 = (unsigned char *) 0 ; - unsigned char *arg3 = (unsigned char *) 0 ; - unsigned char *arg4 = (unsigned char *) 0 ; - unsigned char temp2 ; + byte *arg2 = (byte *) 0 ; + byte *arg3 = (byte *) 0 ; + byte *arg4 = (byte *) 0 ; + byte temp2 ; int res2 = 0 ; - unsigned char temp3 ; + byte temp3 ; int res3 = 0 ; - unsigned char temp4 ; + byte temp4 ; int res4 = 0 ; PyObject * obj0 = 0 ; char *kwnames[] = { @@ -12712,7 +12927,7 @@ static PyObject *_wrap_Image_GetOrFindMaskColour(PyObject *, PyObject *args, PyO static PyObject *_wrap_Image_GetMaskRed(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12723,7 +12938,7 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *, PyObject *args, PyObject *kw if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetMaskRed(); + result = (byte)(arg1)->GetMaskRed(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12740,7 +12955,7 @@ static PyObject *_wrap_Image_GetMaskRed(PyObject *, PyObject *args, PyObject *kw static PyObject *_wrap_Image_GetMaskGreen(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12751,7 +12966,7 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *, PyObject *args, PyObject * if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetMaskGreen(); + result = (byte)(arg1)->GetMaskGreen(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12768,7 +12983,7 @@ static PyObject *_wrap_Image_GetMaskGreen(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_Image_GetMaskBlue(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char result; + byte result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -12779,7 +12994,7 @@ static PyObject *_wrap_Image_GetMaskBlue(PyObject *, PyObject *args, PyObject *k if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (unsigned char)(arg1)->GetMaskBlue(); + result = (byte)(arg1)->GetMaskBlue(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12990,12 +13205,12 @@ static PyObject *_wrap_Image_Mirror(PyObject *, PyObject *args, PyObject *kwargs static PyObject *_wrap_Image_Replace(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; - unsigned char arg5 ; - unsigned char arg6 ; - unsigned char arg7 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; + byte arg5 ; + byte arg6 ; + byte arg7 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -13011,27 +13226,27 @@ static PyObject *_wrap_Image_Replace(PyObject *, PyObject *args, PyObject *kwarg SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { - arg5 = (unsigned char)(SWIG_As_unsigned_SS_char(obj4)); + arg5 = (byte)(SWIG_As_unsigned_SS_char(obj4)); if (SWIG_arg_fail(5)) SWIG_fail; } { - arg6 = (unsigned char)(SWIG_As_unsigned_SS_char(obj5)); + arg6 = (byte)(SWIG_As_unsigned_SS_char(obj5)); if (SWIG_arg_fail(6)) SWIG_fail; } { - arg7 = (unsigned char)(SWIG_As_unsigned_SS_char(obj6)); + arg7 = (byte)(SWIG_As_unsigned_SS_char(obj6)); if (SWIG_arg_fail(7)) SWIG_fail; } { @@ -13051,9 +13266,9 @@ static PyObject *_wrap_Image_Replace(PyObject *, PyObject *args, PyObject *kwarg static PyObject *_wrap_Image_ConvertToMono(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; SwigValueWrapper result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -13067,15 +13282,15 @@ static PyObject *_wrap_Image_ConvertToMono(PyObject *, PyObject *args, PyObject SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -13570,9 +13785,9 @@ static PyObject *_wrap_Image_ConvertToBitmap(PyObject *, PyObject *args, PyObjec static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxImage *arg1 = (wxImage *) 0 ; - unsigned char arg2 ; - unsigned char arg3 ; - unsigned char arg4 ; + byte arg2 ; + byte arg3 ; + byte arg4 ; wxBitmap result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -13586,15 +13801,15 @@ static PyObject *_wrap_Image_ConvertToMonoBitmap(PyObject *, PyObject *args, PyO SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxImage, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - arg2 = (unsigned char)(SWIG_As_unsigned_SS_char(obj1)); + arg2 = (byte)(SWIG_As_unsigned_SS_char(obj1)); if (SWIG_arg_fail(2)) SWIG_fail; } { - arg3 = (unsigned char)(SWIG_As_unsigned_SS_char(obj2)); + arg3 = (byte)(SWIG_As_unsigned_SS_char(obj2)); if (SWIG_arg_fail(3)) SWIG_fail; } { - arg4 = (unsigned char)(SWIG_As_unsigned_SS_char(obj3)); + arg4 = (byte)(SWIG_As_unsigned_SS_char(obj3)); if (SWIG_arg_fail(4)) SWIG_fail; } { @@ -16372,7 +16587,7 @@ static PyObject *_wrap_MouseEvent_Button(PyObject *, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "but", NULL + (char *) "self",(char *) "button", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MouseEvent_Button",kwnames,&obj0,&obj1)) goto fail; @@ -18120,7 +18335,7 @@ static PyObject *_wrap_new_KeyEvent(PyObject *, PyObject *args, PyObject *kwargs wxKeyEvent *result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "keyType", NULL + (char *) "eventType", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_KeyEvent",kwnames,&obj0)) goto fail; @@ -19563,7 +19778,7 @@ static PyObject * NcPaintEvent_swigregister(PyObject *, PyObject *args) { static PyObject *_wrap_new_EraseEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; int arg1 = (int) 0 ; - wxDC *arg2 = (wxDC *) (wxDC *) NULL ; + wxDC *arg2 = (wxDC *) NULL ; wxEraseEvent *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -20179,66 +20394,66 @@ static PyObject *_wrap_CloseEvent_Veto(PyObject *, PyObject *args, PyObject *kwa } -static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_CloseEvent_GetVeto(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCloseEvent *arg1 = (wxCloseEvent *) 0 ; - bool arg2 ; + bool result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "canVeto", NULL + (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_GetVeto",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (bool)(SWIG_As_bool(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetCanVeto(arg2); + result = (bool)((wxCloseEvent const *)arg1)->GetVeto(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - Py_INCREF(Py_None); resultobj = Py_None; + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } return resultobj; fail: return NULL; } -static PyObject *_wrap_CloseEvent_CanVeto(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_CloseEvent_SetCanVeto(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCloseEvent *arg1 = (wxCloseEvent *) 0 ; - bool result; + bool arg2 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self", NULL + (char *) "self",(char *) "canVeto", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_CanVeto",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:CloseEvent_SetCanVeto",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (bool)(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxCloseEvent const *)arg1)->CanVeto(); + (arg1)->SetCanVeto(arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - { - resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); - } + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_CloseEvent_GetVeto(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_CloseEvent_CanVeto(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCloseEvent *arg1 = (wxCloseEvent *) 0 ; bool result; @@ -20247,12 +20462,12 @@ static PyObject *_wrap_CloseEvent_GetVeto(PyObject *, PyObject *args, PyObject * (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_GetVeto",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:CloseEvent_CanVeto",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxCloseEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)((wxCloseEvent const *)arg1)->GetVeto(); + result = (bool)((wxCloseEvent const *)arg1)->CanVeto(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -22069,7 +22284,7 @@ static PyObject *_wrap_new_PyEvent(PyObject *, PyObject *args, PyObject *kwargs) PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "winid",(char *) "commandType", NULL + (char *) "winid",(char *) "eventType", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyEvent",kwnames,&obj0,&obj1)) goto fail; @@ -22124,7 +22339,7 @@ static PyObject *_wrap_delete_PyEvent(PyObject *, PyObject *args, PyObject *kwar } -static PyObject *_wrap_PyEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyEvent__SetSelf(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyEvent *arg1 = (wxPyEvent *) 0 ; PyObject *arg2 = (PyObject *) 0 ; @@ -22134,7 +22349,7 @@ static PyObject *_wrap_PyEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwa (char *) "self",(char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEvent_SetSelf",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyEvent__SetSelf",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; arg2 = obj1; @@ -22152,7 +22367,7 @@ static PyObject *_wrap_PyEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwa } -static PyObject *_wrap_PyEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyEvent__GetSelf(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyEvent *arg1 = (wxPyEvent *) 0 ; PyObject *result; @@ -22161,7 +22376,7 @@ static PyObject *_wrap_PyEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwa (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyEvent_GetSelf",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyEvent__GetSelf",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -22193,7 +22408,7 @@ static PyObject *_wrap_new_PyCommandEvent(PyObject *, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "commandType",(char *) "id", NULL + (char *) "eventType",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_PyCommandEvent",kwnames,&obj0,&obj1)) goto fail; @@ -22248,7 +22463,7 @@ static PyObject *_wrap_delete_PyCommandEvent(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyCommandEvent__SetSelf(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ; PyObject *arg2 = (PyObject *) 0 ; @@ -22258,7 +22473,7 @@ static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *, PyObject *args, PyObje (char *) "self",(char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCommandEvent_SetSelf",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:PyCommandEvent__SetSelf",kwnames,&obj0,&obj1)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCommandEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; arg2 = obj1; @@ -22276,7 +22491,7 @@ static PyObject *_wrap_PyCommandEvent_SetSelf(PyObject *, PyObject *args, PyObje } -static PyObject *_wrap_PyCommandEvent_GetSelf(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_PyCommandEvent__GetSelf(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyCommandEvent *arg1 = (wxPyCommandEvent *) 0 ; PyObject *result; @@ -22285,7 +22500,7 @@ static PyObject *_wrap_PyCommandEvent_GetSelf(PyObject *, PyObject *args, PyObje (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCommandEvent_GetSelf",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PyCommandEvent__GetSelf",kwnames,&obj0)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyCommandEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { @@ -22474,21 +22689,27 @@ static PyObject *_wrap_PyApp__setCallbackInfo(PyObject *, PyObject *args, PyObje wxPyApp *arg1 = (wxPyApp *) 0 ; PyObject *arg2 = (PyObject *) 0 ; PyObject *arg3 = (PyObject *) 0 ; + bool arg4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "self",(char *) "_class", NULL + (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:PyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPyApp, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; arg2 = obj1; arg3 = obj2; + { + arg4 = (bool)(SWIG_As_bool(obj3)); + if (SWIG_arg_fail(4)) SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->_setCallbackInfo(arg2,arg3); + (arg1)->_setCallbackInfo(arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -26323,6 +26544,38 @@ static PyObject *_wrap_Window_InvalidateBestSize(PyObject *, PyObject *args, PyO } +static PyObject *_wrap_Window_CacheBestSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "size", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_CacheBestSize",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + ((wxWindow const *)arg1)->CacheBestSize((wxSize const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_GetBestFittingSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -31521,6 +31774,37 @@ static PyObject *_wrap_Window_GetDropTarget(PyObject *, PyObject *args, PyObject } +static PyObject *_wrap_Window_DragAcceptFiles(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxWindow *arg1 = (wxWindow *) 0 ; + bool arg2 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "accept", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_DragAcceptFiles",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxWindow, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (bool)(SWIG_As_bool(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxWindow_DragAcceptFiles(arg1,arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Window_SetConstraints(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; @@ -31757,7 +32041,7 @@ static PyObject *_wrap_Window_GetSizer(PyObject *, PyObject *args, PyObject *kwa if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxSizer(result, 0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -31814,7 +32098,7 @@ static PyObject *_wrap_Window_GetContainingSizer(PyObject *, PyObject *args, PyO if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxSizer(result, 0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -32047,6 +32331,28 @@ static PyObject *_wrap_Window_FromHWND(PyObject *, PyObject *args, PyObject *kwa } +static PyObject *_wrap_GetTopLevelWindows(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + PyObject *result; + char *kwnames[] = { + NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":GetTopLevelWindows",kwnames)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (PyObject *)GetTopLevelWindows(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = result; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_Validator(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxValidator *result; @@ -35215,7 +35521,7 @@ static PyObject *_wrap_MenuBar_FindMenu(PyObject *, PyObject *args, PyObject *kw } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)((wxMenuBar const *)arg1)->FindMenu((wxString const &)*arg2); + result = (int)(arg1)->FindMenu((wxString const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -37539,15 +37845,11 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *, PyObject *args, PyO int i, len=PySequence_Length(obj1); for (i=0; iAdd(Py2wxString(str)); + arg2->Add(*s); + delete s; Py_DECREF(item); - Py_DECREF(str); } } { @@ -38613,7 +38915,8 @@ static PyObject *_wrap_SizerItem_SetRatioWH(PyObject *, PyObject *args, PyObject static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxSizerItem *arg1 = (wxSizerItem *) 0 ; - wxSize arg2 ; + wxSize *arg2 = 0 ; + wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -38624,18 +38927,12 @@ static PyObject *_wrap_SizerItem_SetRatioSize(PyObject *, PyObject *args, PyObje SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxSizerItem, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - wxSize * argp; - SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxSize, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(2)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxSize"); - } - if (SWIG_arg_fail(2)) SWIG_fail; - arg2 = *argp; + arg2 = &temp2; + if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetRatio(arg2); + (arg1)->SetRatio((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -39074,7 +39371,7 @@ static PyObject *_wrap_SizerItem_GetSizer(PyObject *, PyObject *args, PyObject * if (PyErr_Occurred()) SWIG_fail; } { - resultobj = wxPyMake_wxSizer(result, 0); + resultobj = wxPyMake_wxObject(result, 0); } return resultobj; fail: @@ -45284,6 +45581,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_ImageHistogram", (PyCFunction) _wrap_new_ImageHistogram, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHistogram_MakeKey", (PyCFunction) _wrap_ImageHistogram_MakeKey, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHistogram_FindFirstUnusedColour", (PyCFunction) _wrap_ImageHistogram_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ImageHistogram_GetCount", (PyCFunction) _wrap_ImageHistogram_GetCount, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ImageHistogram_GetCountRGB", (PyCFunction) _wrap_ImageHistogram_GetCountRGB, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ImageHistogram_GetCountColour", (PyCFunction) _wrap_ImageHistogram_GetCountColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ImageHistogram_swigregister", ImageHistogram_swigregister, METH_VARARGS, NULL}, { (char *)"new_Image", (PyCFunction) _wrap_new_Image, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_Image", (PyCFunction) _wrap_delete_Image, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45309,6 +45609,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Image_GetAlpha", (PyCFunction) _wrap_Image_GetAlpha, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Image_InitAlpha", (PyCFunction) _wrap_Image_InitAlpha, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Image_IsTransparent", (PyCFunction) _wrap_Image_IsTransparent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Image_ConvertColourToAlpha", (PyCFunction) _wrap_Image_ConvertColourToAlpha, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45605,9 +45906,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"CloseEvent_SetLoggingOff", (PyCFunction) _wrap_CloseEvent_SetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_GetLoggingOff", (PyCFunction) _wrap_CloseEvent_GetLoggingOff, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_Veto", (PyCFunction) _wrap_CloseEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"CloseEvent_GetVeto", (PyCFunction) _wrap_CloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_SetCanVeto", (PyCFunction) _wrap_CloseEvent_SetCanVeto, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_CanVeto", (PyCFunction) _wrap_CloseEvent_CanVeto, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"CloseEvent_GetVeto", (PyCFunction) _wrap_CloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CloseEvent_swigregister", CloseEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_ShowEvent", (PyCFunction) _wrap_new_ShowEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ShowEvent_SetShow", (PyCFunction) _wrap_ShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45684,13 +45985,13 @@ static PyMethodDef SwigMethods[] = { { (char *)"IdleEvent_swigregister", IdleEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyEvent", (PyCFunction) _wrap_new_PyEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_PyEvent", (PyCFunction) _wrap_delete_PyEvent, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyEvent_SetSelf", (PyCFunction) _wrap_PyEvent_SetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyEvent_GetSelf", (PyCFunction) _wrap_PyEvent_GetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyEvent__SetSelf", (PyCFunction) _wrap_PyEvent__SetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyEvent__GetSelf", (PyCFunction) _wrap_PyEvent__GetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyEvent_swigregister", PyEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_PyCommandEvent", (PyCFunction) _wrap_new_PyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_PyCommandEvent", (PyCFunction) _wrap_delete_PyCommandEvent, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyCommandEvent_SetSelf", (PyCFunction) _wrap_PyCommandEvent_SetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"PyCommandEvent_GetSelf", (PyCFunction) _wrap_PyCommandEvent_GetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyCommandEvent__SetSelf", (PyCFunction) _wrap_PyCommandEvent__SetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PyCommandEvent__GetSelf", (PyCFunction) _wrap_PyCommandEvent__GetSelf, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PyCommandEvent_swigregister", PyCommandEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_DateEvent", (PyCFunction) _wrap_new_DateEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"DateEvent_GetDate", (PyCFunction) _wrap_DateEvent_GetDate, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45826,6 +46127,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetBestSize", (PyCFunction) _wrap_Window_GetBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetBestSizeTuple", (PyCFunction) _wrap_Window_GetBestSizeTuple, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_InvalidateBestSize", (PyCFunction) _wrap_Window_InvalidateBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Window_CacheBestSize", (PyCFunction) _wrap_Window_CacheBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetBestFittingSize", (PyCFunction) _wrap_Window_GetBestFittingSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetAdjustedBestSize", (PyCFunction) _wrap_Window_GetAdjustedBestSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_Center", (PyCFunction) _wrap_Window_Center, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45981,6 +46283,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"Window_GetToolTip", (PyCFunction) _wrap_Window_GetToolTip, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_SetDropTarget", (PyCFunction) _wrap_Window_SetDropTarget, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetDropTarget", (PyCFunction) _wrap_Window_GetDropTarget, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"Window_DragAcceptFiles", (PyCFunction) _wrap_Window_DragAcceptFiles, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_SetConstraints", (PyCFunction) _wrap_Window_SetConstraints, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_GetConstraints", (PyCFunction) _wrap_Window_GetConstraints, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_SetAutoLayout", (PyCFunction) _wrap_Window_SetAutoLayout, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -45998,6 +46301,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"FindWindowByName", (PyCFunction) _wrap_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FindWindowByLabel", (PyCFunction) _wrap_FindWindowByLabel, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Window_FromHWND", (PyCFunction) _wrap_Window_FromHWND, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GetTopLevelWindows", (PyCFunction) _wrap_GetTopLevelWindows, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_Validator", (PyCFunction) _wrap_new_Validator, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Validator_Clone", (PyCFunction) _wrap_Validator_Clone, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Validator_Validate", (PyCFunction) _wrap_Validator_Validate, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -46889,6 +47193,7 @@ static swig_type_info _swigt__p_wxGridBagSizer[] = {{"_p_wxGridBagSizer", 0, "wx static swig_type_info _swigt__p_wxAcceleratorEntry[] = {{"_p_wxAcceleratorEntry", 0, "wxAcceleratorEntry *", 0, 0, 0, 0},{"_p_wxAcceleratorEntry", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxUpdateUIEvent[] = {{"_p_wxUpdateUIEvent", 0, "wxUpdateUIEvent *", 0, 0, 0, 0},{"_p_wxUpdateUIEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxEvent", 0, 0, 0, 0, 0, 0},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDateEvent", _p_wxDateEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent, 0, 0, 0, 0, 0},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_buffer[] = {{"_p_buffer", 0, "buffer *", 0, 0, 0, 0},{"_p_buffer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMenu[] = {{"_p_wxMenu", 0, "wxMenu *", 0, 0, 0, 0},{"_p_wxMenu", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxGridSizer[] = {{"_p_wxGridSizer", 0, "wxGridSizer *", 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxGridSizer, 0, 0, 0, 0, 0},{"_p_wxGridSizer", 0, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxGridSizer, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFlexGridSizer[] = {{"_p_wxFlexGridSizer", 0, "wxFlexGridSizer *", 0, 0, 0, 0},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxFlexGridSizer, 0, 0, 0, 0, 0},{"_p_wxFlexGridSizer", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -46986,7 +47291,7 @@ static swig_type_info _swigt__unsigned_int[] = {{"_unsigned_int", 0, "unsigned i static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *|time_t *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMenuEvent[] = {{"_p_wxMenuEvent", 0, "wxMenuEvent *", 0, 0, 0, 0},{"_p_wxMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxContextMenuEvent[] = {{"_p_wxContextMenuEvent", 0, "wxContextMenuEvent *", 0, 0, 0, 0},{"_p_wxContextMenuEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *|byte *", 0, 0, 0, 0},{"_p_unsigned_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxEraseEvent[] = {{"_p_wxEraseEvent", 0, "wxEraseEvent *", 0, 0, 0, 0},{"_p_wxEraseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0, 0, 0, 0},{"_p_wxMouseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxCloseEvent[] = {{"_p_wxCloseEvent", 0, "wxCloseEvent *", 0, 0, 0, 0},{"_p_wxCloseEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -46995,8 +47300,8 @@ static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wx static swig_type_info _swigt__p_wxPyCommandEvent[] = {{"_p_wxPyCommandEvent", 0, "wxPyCommandEvent *", 0, 0, 0, 0},{"_p_wxPyCommandEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxPyDropTarget[] = {{"_p_wxPyDropTarget", 0, "wxPyDropTarget *", 0, 0, 0, 0},{"_p_wxPyDropTarget", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxQuantize[] = {{"_p_wxQuantize", 0, "wxQuantize *", 0, 0, 0, 0},{"_p_wxQuantize", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -static swig_type_info _swigt__p_wxChildFocusEvent[] = {{"_p_wxChildFocusEvent", 0, "wxChildFocusEvent *", 0, 0, 0, 0},{"_p_wxChildFocusEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxFocusEvent[] = {{"_p_wxFocusEvent", 0, "wxFocusEvent *", 0, 0, 0, 0},{"_p_wxFocusEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +static swig_type_info _swigt__p_wxChildFocusEvent[] = {{"_p_wxChildFocusEvent", 0, "wxChildFocusEvent *", 0, 0, 0, 0},{"_p_wxChildFocusEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxDropFilesEvent[] = {{"_p_wxDropFilesEvent", 0, "wxDropFilesEvent *", 0, 0, 0, 0},{"_p_wxDropFilesEvent", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxControlWithItems[] = {{"_p_wxControlWithItems", 0, "wxControlWithItems *", 0, 0, 0, 0},{"_p_wxControlWithItems", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; static swig_type_info _swigt__p_wxColour[] = {{"_p_wxColour", 0, "wxColour *", 0, 0, 0, 0},{"_p_wxColour", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; @@ -47018,6 +47323,7 @@ _swigt__p_wxGridBagSizer, _swigt__p_wxAcceleratorEntry, _swigt__p_wxUpdateUIEvent, _swigt__p_wxEvent, +_swigt__p_buffer, _swigt__p_wxMenu, _swigt__p_wxGridSizer, _swigt__p_wxFlexGridSizer, @@ -47124,8 +47430,8 @@ _swigt__p_wxCommandEvent, _swigt__p_wxPyCommandEvent, _swigt__p_wxPyDropTarget, _swigt__p_wxQuantize, -_swigt__p_wxChildFocusEvent, _swigt__p_wxFocusEvent, +_swigt__p_wxChildFocusEvent, _swigt__p_wxDropFilesEvent, _swigt__p_wxControlWithItems, _swigt__p_wxColour, @@ -47526,6 +47832,12 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"NO_BORDER", SWIG_From_int((int)(wxNO_BORDER))); } + { + PyDict_SetItemString(d,"DEFAULT_CONTROL_BORDER", SWIG_From_int((int)(wxDEFAULT_CONTROL_BORDER))); + } + { + PyDict_SetItemString(d,"DEFAULT_STATUSBAR_STYLE", SWIG_From_int((int)(wxDEFAULT_STATUSBAR_STYLE))); + } { PyDict_SetItemString(d,"TAB_TRAVERSAL", SWIG_From_int((int)(wxTAB_TRAVERSAL))); } @@ -47544,21 +47856,6 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"CENTER_ON_SCREEN", SWIG_From_int((int)(wxCENTER_ON_SCREEN))); } - { - PyDict_SetItemString(d,"ED_CLIENT_MARGIN", SWIG_From_int((int)(wxED_CLIENT_MARGIN))); - } - { - PyDict_SetItemString(d,"ED_BUTTONS_BOTTOM", SWIG_From_int((int)(wxED_BUTTONS_BOTTOM))); - } - { - PyDict_SetItemString(d,"ED_BUTTONS_RIGHT", SWIG_From_int((int)(wxED_BUTTONS_RIGHT))); - } - { - PyDict_SetItemString(d,"ED_STATIC_LINE", SWIG_From_int((int)(wxED_STATIC_LINE))); - } - { - PyDict_SetItemString(d,"EXT_DIALOG_STYLE", SWIG_From_int((int)(wxEXT_DIALOG_STYLE))); - } { PyDict_SetItemString(d,"CLIP_CHILDREN", SWIG_From_int((int)(wxCLIP_CHILDREN))); } @@ -48396,6 +48693,12 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"STIPPLE", SWIG_From_int((int)(wxSTIPPLE))); } + { + PyDict_SetItemString(d,"STIPPLE_MASK", SWIG_From_int((int)(wxSTIPPLE_MASK))); + } + { + PyDict_SetItemString(d,"STIPPLE_MASK_OPAQUE", SWIG_From_int((int)(wxSTIPPLE_MASK_OPAQUE))); + } { PyDict_SetItemString(d,"BDIAGONAL_HATCH", SWIG_From_int((int)(wxBDIAGONAL_HATCH))); } @@ -48798,6 +49101,69 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"WXK_WINDOWS_MENU", SWIG_From_int((int)(WXK_WINDOWS_MENU))); } + { + PyDict_SetItemString(d,"WXK_COMMAND", SWIG_From_int((int)(WXK_COMMAND))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL1", SWIG_From_int((int)(WXK_SPECIAL1))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL2", SWIG_From_int((int)(WXK_SPECIAL2))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL3", SWIG_From_int((int)(WXK_SPECIAL3))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL4", SWIG_From_int((int)(WXK_SPECIAL4))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL5", SWIG_From_int((int)(WXK_SPECIAL5))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL6", SWIG_From_int((int)(WXK_SPECIAL6))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL7", SWIG_From_int((int)(WXK_SPECIAL7))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL8", SWIG_From_int((int)(WXK_SPECIAL8))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL9", SWIG_From_int((int)(WXK_SPECIAL9))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL10", SWIG_From_int((int)(WXK_SPECIAL10))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL11", SWIG_From_int((int)(WXK_SPECIAL11))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL12", SWIG_From_int((int)(WXK_SPECIAL12))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL13", SWIG_From_int((int)(WXK_SPECIAL13))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL14", SWIG_From_int((int)(WXK_SPECIAL14))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL15", SWIG_From_int((int)(WXK_SPECIAL15))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL16", SWIG_From_int((int)(WXK_SPECIAL16))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL17", SWIG_From_int((int)(WXK_SPECIAL17))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL18", SWIG_From_int((int)(WXK_SPECIAL18))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL19", SWIG_From_int((int)(WXK_SPECIAL19))); + } + { + PyDict_SetItemString(d,"WXK_SPECIAL20", SWIG_From_int((int)(WXK_SPECIAL20))); + } { PyDict_SetItemString(d,"PAPER_NONE", SWIG_From_int((int)(wxPAPER_NONE))); } @@ -49267,6 +49633,15 @@ SWIGEXPORT(void) SWIG_init(void) { wxPyPtrTypeMap_Add("wxFileSystemHandler", "wxPyFileSystemHandler"); + { + PyDict_SetItemString(d,"IMAGE_ALPHA_TRANSPARENT", SWIG_From_int((int)(wxIMAGE_ALPHA_TRANSPARENT))); + } + { + PyDict_SetItemString(d,"IMAGE_ALPHA_THRESHOLD", SWIG_From_int((int)(wxIMAGE_ALPHA_THRESHOLD))); + } + { + PyDict_SetItemString(d,"IMAGE_ALPHA_OPAQUE", SWIG_From_int((int)(wxIMAGE_ALPHA_OPAQUE))); + } SWIG_addvarlink(SWIG_globals,(char*)"NullImage",_wrap_NullImage_get, _wrap_NullImage_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_FILENAME",_wrap_IMAGE_OPTION_FILENAME_get, _wrap_IMAGE_OPTION_FILENAME_set); SWIG_addvarlink(SWIG_globals,(char*)"IMAGE_OPTION_BMP_FORMAT",_wrap_IMAGE_OPTION_BMP_FORMAT_get, _wrap_IMAGE_OPTION_BMP_FORMAT_set); @@ -49444,6 +49819,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_UPDATE_UI", PyInt_FromLong(wxEVT_UPDATE_UI)); PyDict_SetItemString(d, "wxEVT_SIZING", PyInt_FromLong(wxEVT_SIZING)); PyDict_SetItemString(d, "wxEVT_MOVING", PyInt_FromLong(wxEVT_MOVING)); + PyDict_SetItemString(d, "wxEVT_HIBERNATE", PyInt_FromLong(wxEVT_HIBERNATE)); PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_CLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_CLICK)); PyDict_SetItemString(d, "wxEVT_COMMAND_LEFT_DCLICK", PyInt_FromLong(wxEVT_COMMAND_LEFT_DCLICK)); PyDict_SetItemString(d, "wxEVT_COMMAND_RIGHT_CLICK", PyInt_FromLong(wxEVT_COMMAND_RIGHT_CLICK));