reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -203,13 +203,13 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
|
||||
class wxPyDropSource : public wxDropSource {
|
||||
public:
|
||||
#ifdef __WXMSW__
|
||||
wxPyDropSource(wxWindow *win = NULL,
|
||||
wxPyDropSource(wxWindow *win,
|
||||
const wxCursor © = wxNullCursor,
|
||||
const wxCursor &move = wxNullCursor,
|
||||
const wxCursor &none = wxNullCursor)
|
||||
: wxDropSource(win, copy, move, none) {}
|
||||
#else
|
||||
wxPyDropSource(wxWindow *win = NULL,
|
||||
wxPyDropSource(wxWindow *win,
|
||||
const wxIcon& copy = wxNullIcon,
|
||||
const wxIcon& move = wxNullIcon,
|
||||
const wxIcon& none = wxNullIcon)
|
||||
@@ -2350,7 +2350,7 @@ static PyObject *_wrap_wxClipboard_UsePrimarySelection(PyObject *self, PyObject
|
||||
static PyObject *_wrap_new_wxDropSource(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxPyDropSource * _result;
|
||||
wxWindow * _arg0 = (wxWindow *) NULL;
|
||||
wxWindow * _arg0;
|
||||
wxIcon * _arg1 = (wxIcon *) &wxNullIcon;
|
||||
wxIcon * _arg2 = (wxIcon *) &wxNullIcon;
|
||||
wxIcon * _arg3 = (wxIcon *) &wxNullIcon;
|
||||
@@ -2362,7 +2362,7 @@ static PyObject *_wrap_new_wxDropSource(PyObject *self, PyObject *args, PyObject
|
||||
char _ptemp[128];
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OOOO:new_wxDropSource",_kwnames,&_argo0,&_argo1,&_argo2,&_argo3))
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OOO:new_wxDropSource",_kwnames,&_argo0,&_argo1,&_argo2,&_argo3))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
|
@@ -11427,6 +11427,45 @@ static PyObject *_wrap_wxSpinCtrl_SetValue(PyObject *self, PyObject *args, PyObj
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxSpinCtrl_SetValueString(_swigobj,_swigarg0) (_swigobj->SetValue(_swigarg0))
|
||||
static PyObject *_wrap_wxSpinCtrl_SetValueString(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxSpinCtrl * _arg0;
|
||||
wxString * _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "self","text", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSpinCtrl_SetValueString",_kwnames,&_argo0,&_obj1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSpinCtrl_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinCtrl_SetValueString. Expected _wxSpinCtrl_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
_arg1 = wxString_in_helper(_obj1);
|
||||
if (_arg1 == NULL)
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxSpinCtrl_SetValueString(_arg0,*_arg1);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
{
|
||||
if (_obj1)
|
||||
delete _arg1;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static void wxSpinCtrl_SetSelection(wxSpinCtrl *self,long from,long to) {
|
||||
}
|
||||
static PyObject *_wrap_wxSpinCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
@@ -11796,6 +11835,7 @@ static PyMethodDef controlscMethods[] = {
|
||||
{ "new_wxPreToggleButton", (PyCFunction) _wrap_new_wxPreToggleButton, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxToggleButton", (PyCFunction) _wrap_new_wxToggleButton, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSpinCtrl_SetSelection", (PyCFunction) _wrap_wxSpinCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSpinCtrl_SetValueString", (PyCFunction) _wrap_wxSpinCtrl_SetValueString, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSpinCtrl_SetValue", (PyCFunction) _wrap_wxSpinCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSpinCtrl_SetRange", (PyCFunction) _wrap_wxSpinCtrl_SetRange, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSpinCtrl_GetValue", (PyCFunction) _wrap_wxSpinCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
|
||||
|
@@ -1131,6 +1131,9 @@ class wxSpinCtrlPtr(wxSpinButtonPtr):
|
||||
def SetValue(self, *_args, **_kwargs):
|
||||
val = controlsc.wxSpinCtrl_SetValue(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetValueString(self, *_args, **_kwargs):
|
||||
val = controlsc.wxSpinCtrl_SetValueString(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetSelection(self, *_args, **_kwargs):
|
||||
val = controlsc.wxSpinCtrl_SetSelection(self, *_args, **_kwargs)
|
||||
return val
|
||||
|
@@ -58,13 +58,12 @@ extern PyObject *SWIG_newvarlink(void);
|
||||
#ifdef __WXMSW__
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#include <wx/listctrl.h>
|
||||
#include <wx/treectrl.h>
|
||||
#include <wx/imaglist.h>
|
||||
#include <wx/dirctrl.h>
|
||||
|
||||
#include "pytree.h"
|
||||
|
||||
#include <wx/imaglist.h>
|
||||
#include <wx/dirctrl.h>
|
||||
|
||||
|
||||
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
PyObject* o2;
|
||||
@@ -103,34 +102,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
static const wxString wxPyEmptyString(wxT(""));
|
||||
|
||||
static const long longzero = 0;
|
||||
// C++ Version of a Python aware class
|
||||
class wxPyListCtrl : public wxListCtrl {
|
||||
DECLARE_ABSTRACT_CLASS(wxPyListCtrl);
|
||||
public:
|
||||
wxPyListCtrl() : wxListCtrl() {}
|
||||
wxPyListCtrl(wxWindow* parent, wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxValidator& validator,
|
||||
const wxString& name) :
|
||||
wxListCtrl(parent, id, pos, size, style, validator, name) {}
|
||||
|
||||
bool Create(wxWindow* parent, wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxValidator& validator,
|
||||
const wxString& name) {
|
||||
return wxListCtrl::Create(parent, id, pos, size, style, validator, name);
|
||||
}
|
||||
|
||||
DEC_PYCALLBACK_STRING_LONGLONG(OnGetItemText);
|
||||
DEC_PYCALLBACK_INT_LONG(OnGetItemImage);
|
||||
DEC_PYCALLBACK_LISTATTR_LONG(OnGetItemAttr);
|
||||
|
||||
PYPRIVATE;
|
||||
};
|
||||
// See declaration in pytree.h
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxPyListCtrl, wxListCtrl);
|
||||
|
||||
@@ -155,31 +128,13 @@ IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr);
|
||||
return retval;
|
||||
}
|
||||
|
||||
// C++ version of Python aware wxTreeCtrl
|
||||
class wxPyTreeCtrl : public wxTreeCtrl {
|
||||
DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);
|
||||
public:
|
||||
wxPyTreeCtrl() : wxTreeCtrl() {}
|
||||
wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxValidator& validator,
|
||||
const wxString& name) :
|
||||
wxTreeCtrl(parent, id, pos, size, style, validator, name) {}
|
||||
// See class def in pytree.h
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxValidator& validator,
|
||||
const wxString& name) {
|
||||
return wxTreeCtrl::Create(parent, id, pos, size, style, validator, name);
|
||||
}
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
|
||||
|
||||
|
||||
int OnCompareItems(const wxTreeItemId& item1,
|
||||
const wxTreeItemId& item2) {
|
||||
int wxPyTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
|
||||
const wxTreeItemId& item2)
|
||||
{
|
||||
int rval = 0;
|
||||
bool found;
|
||||
wxPyBeginBlockThreads();
|
||||
@@ -195,10 +150,6 @@ public:
|
||||
rval = wxTreeCtrl::OnCompareItems(item1, item2);
|
||||
return rval;
|
||||
}
|
||||
PYPRIVATE;
|
||||
};
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxPyTreeCtrl, wxTreeCtrl);
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@@ -425,6 +425,7 @@ class wxListEventPtr(wxNotifyEventPtr):
|
||||
def __repr__(self):
|
||||
return "<%s.%s instance; proxy of C++ wxListEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
|
||||
GetCode = GetKeyCode
|
||||
GetPostiion = GetPoint
|
||||
class wxListEvent(wxListEventPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = controls2c.new_wxListEvent(*_args,**_kwargs)
|
||||
|
@@ -2825,6 +2825,80 @@ static PyObject *_wrap_wxHtmlCell_GetDescent(PyObject *self, PyObject *args, PyO
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxHtmlCell_GetId(_swigobj) (_swigobj->GetId())
|
||||
static PyObject *_wrap_wxHtmlCell_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxString * _result;
|
||||
wxHtmlCell * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlCell_GetId",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_GetId. Expected _wxHtmlCell_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
const wxString & _result_ref = wxHtmlCell_GetId(_arg0);
|
||||
_result = (wxString *) &_result_ref;
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
}{
|
||||
#if wxUSE_UNICODE
|
||||
_resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
|
||||
#else
|
||||
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
|
||||
#endif
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxHtmlCell_SetId(_swigobj,_swigarg0) (_swigobj->SetId(_swigarg0))
|
||||
static PyObject *_wrap_wxHtmlCell_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxHtmlCell * _arg0;
|
||||
wxString * _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "self","id", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlCell_SetId",_kwnames,&_argo0,&_obj1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlCell_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlCell_SetId. Expected _wxHtmlCell_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
_arg1 = wxString_in_helper(_obj1);
|
||||
if (_arg1 == NULL)
|
||||
return NULL;
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
wxHtmlCell_SetId(_arg0,*_arg1);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
{
|
||||
if (_obj1)
|
||||
delete _arg1;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxHtmlCell_GetLink(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetLink(_swigarg0,_swigarg1))
|
||||
static PyObject *_wrap_wxHtmlCell_GetLink(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -6660,6 +6734,8 @@ static PyMethodDef htmlcMethods[] = {
|
||||
{ "wxHtmlCell_GetParent", (PyCFunction) _wrap_wxHtmlCell_GetParent, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxHtmlCell_GetNext", (PyCFunction) _wrap_wxHtmlCell_GetNext, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxHtmlCell_GetLink", (PyCFunction) _wrap_wxHtmlCell_GetLink, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxHtmlCell_SetId", (PyCFunction) _wrap_wxHtmlCell_SetId, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxHtmlCell_GetId", (PyCFunction) _wrap_wxHtmlCell_GetId, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxHtmlCell_GetDescent", (PyCFunction) _wrap_wxHtmlCell_GetDescent, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxHtmlCell_GetHeight", (PyCFunction) _wrap_wxHtmlCell_GetHeight, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxHtmlCell_GetWidth", (PyCFunction) _wrap_wxHtmlCell_GetWidth, METH_VARARGS | METH_KEYWORDS },
|
||||
@@ -6901,6 +6977,13 @@ SWIGEXPORT(void) inithtmlc() {
|
||||
PyDict_SetItemString(d,"wxHTML_COND_ISANCHOR", PyInt_FromLong((long) wxHTML_COND_ISANCHOR));
|
||||
PyDict_SetItemString(d,"wxHTML_COND_ISIMAGEMAP", PyInt_FromLong((long) wxHTML_COND_ISIMAGEMAP));
|
||||
PyDict_SetItemString(d,"wxHTML_COND_USER", PyInt_FromLong((long) wxHTML_COND_USER));
|
||||
PyDict_SetItemString(d,"wxHTML_FONT_SIZE_1", PyInt_FromLong((long) wxHTML_FONT_SIZE_1));
|
||||
PyDict_SetItemString(d,"wxHTML_FONT_SIZE_2", PyInt_FromLong((long) wxHTML_FONT_SIZE_2));
|
||||
PyDict_SetItemString(d,"wxHTML_FONT_SIZE_3", PyInt_FromLong((long) wxHTML_FONT_SIZE_3));
|
||||
PyDict_SetItemString(d,"wxHTML_FONT_SIZE_4", PyInt_FromLong((long) wxHTML_FONT_SIZE_4));
|
||||
PyDict_SetItemString(d,"wxHTML_FONT_SIZE_5", PyInt_FromLong((long) wxHTML_FONT_SIZE_5));
|
||||
PyDict_SetItemString(d,"wxHTML_FONT_SIZE_6", PyInt_FromLong((long) wxHTML_FONT_SIZE_6));
|
||||
PyDict_SetItemString(d,"wxHTML_FONT_SIZE_7", PyInt_FromLong((long) wxHTML_FONT_SIZE_7));
|
||||
PyDict_SetItemString(d,"wxHW_SCROLLBAR_NEVER", PyInt_FromLong((long) wxHW_SCROLLBAR_NEVER));
|
||||
PyDict_SetItemString(d,"wxHW_SCROLLBAR_AUTO", PyInt_FromLong((long) wxHW_SCROLLBAR_AUTO));
|
||||
PyDict_SetItemString(d,"wxHTML_OPEN", PyInt_FromLong((long) wxHTML_OPEN));
|
||||
|
@@ -343,6 +343,12 @@ class wxHtmlCellPtr(wxObjectPtr):
|
||||
def GetDescent(self, *_args, **_kwargs):
|
||||
val = htmlc.wxHtmlCell_GetDescent(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetId(self, *_args, **_kwargs):
|
||||
val = htmlc.wxHtmlCell_GetId(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetId(self, *_args, **_kwargs):
|
||||
val = htmlc.wxHtmlCell_SetId(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetLink(self, *_args, **_kwargs):
|
||||
val = htmlc.wxHtmlCell_GetLink(self, *_args, **_kwargs)
|
||||
if val: val = wxHtmlLinkInfoPtr(val)
|
||||
@@ -801,6 +807,13 @@ wxHTML_INDENT_ALL = htmlc.wxHTML_INDENT_ALL
|
||||
wxHTML_COND_ISANCHOR = htmlc.wxHTML_COND_ISANCHOR
|
||||
wxHTML_COND_ISIMAGEMAP = htmlc.wxHTML_COND_ISIMAGEMAP
|
||||
wxHTML_COND_USER = htmlc.wxHTML_COND_USER
|
||||
wxHTML_FONT_SIZE_1 = htmlc.wxHTML_FONT_SIZE_1
|
||||
wxHTML_FONT_SIZE_2 = htmlc.wxHTML_FONT_SIZE_2
|
||||
wxHTML_FONT_SIZE_3 = htmlc.wxHTML_FONT_SIZE_3
|
||||
wxHTML_FONT_SIZE_4 = htmlc.wxHTML_FONT_SIZE_4
|
||||
wxHTML_FONT_SIZE_5 = htmlc.wxHTML_FONT_SIZE_5
|
||||
wxHTML_FONT_SIZE_6 = htmlc.wxHTML_FONT_SIZE_6
|
||||
wxHTML_FONT_SIZE_7 = htmlc.wxHTML_FONT_SIZE_7
|
||||
wxHW_SCROLLBAR_NEVER = htmlc.wxHW_SCROLLBAR_NEVER
|
||||
wxHW_SCROLLBAR_AUTO = htmlc.wxHW_SCROLLBAR_AUTO
|
||||
wxHTML_OPEN = htmlc.wxHTML_OPEN
|
||||
|
@@ -2266,7 +2266,9 @@ static PyObject *_wrap_wxImage_Paste(PyObject *self, PyObject *args, PyObject *k
|
||||
static PyObject * wxImage_GetDataBuffer(wxImage *self) {
|
||||
unsigned char* data = self->GetData();
|
||||
int len = self->GetWidth() * self->GetHeight() * 3;
|
||||
return PyBuffer_FromReadWriteMemory(data, len);
|
||||
PyObject* rv;
|
||||
wxPyBLOCK_THREADS( rv = PyBuffer_FromReadWriteMemory(data, len) );
|
||||
return rv;
|
||||
}
|
||||
static PyObject *_wrap_wxImage_GetDataBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -2300,7 +2302,9 @@ static PyObject *_wrap_wxImage_GetDataBuffer(PyObject *self, PyObject *args, PyO
|
||||
static PyObject * wxImage_GetData(wxImage *self) {
|
||||
unsigned char* data = self->GetData();
|
||||
int len = self->GetWidth() * self->GetHeight() * 3;
|
||||
return PyString_FromStringAndSize((char*)data, len);
|
||||
PyObject* rv;
|
||||
wxPyBLOCK_THREADS( rv = PyString_FromStringAndSize((char*)data, len));
|
||||
return rv;
|
||||
}
|
||||
static PyObject *_wrap_wxImage_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -2335,15 +2339,18 @@ static void wxImage_SetDataBuffer(wxImage *self,PyObject * data) {
|
||||
unsigned char* buffer;
|
||||
int size;
|
||||
|
||||
if (!PyArg_Parse(data, "w#", &buffer, &size))
|
||||
return;
|
||||
wxPyBeginBlockThreads();
|
||||
if (!PyArg_Parse(data, "t#", &buffer, &size))
|
||||
goto done;
|
||||
|
||||
if (size != self->GetWidth() * self->GetHeight() * 3) {
|
||||
PyErr_SetString(PyExc_TypeError, "Incorrect buffer size");
|
||||
return;
|
||||
goto done;
|
||||
}
|
||||
|
||||
self->SetData(buffer);
|
||||
done:
|
||||
wxPyEndBlockThreads();
|
||||
}
|
||||
static PyObject *_wrap_wxImage_SetDataBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -2387,7 +2394,7 @@ static void wxImage_SetData(wxImage *self,PyObject * data) {
|
||||
|
||||
size_t len = self->GetWidth() * self->GetHeight() * 3;
|
||||
dataPtr = (unsigned char*) malloc(len);
|
||||
memcpy(dataPtr, PyString_AsString(data), len);
|
||||
wxPyBLOCK_THREADS( memcpy(dataPtr, PyString_AsString(data), len) );
|
||||
self->SetData(dataPtr);
|
||||
// wxImage takes ownership of dataPtr...
|
||||
}
|
||||
|
@@ -56,6 +56,8 @@ extern PyObject *SWIG_newvarlink(void);
|
||||
|
||||
#include "helpers.h"
|
||||
#include "pyistream.h"
|
||||
#include "pytree.h"
|
||||
|
||||
#include <wx/resource.h>
|
||||
#include <wx/tooltip.h>
|
||||
#include <wx/caret.h>
|
||||
@@ -76,6 +78,8 @@ extern PyObject *SWIG_newvarlink(void);
|
||||
//#include <wx/spawnbrowser.h>
|
||||
|
||||
|
||||
|
||||
|
||||
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
PyObject* o2;
|
||||
PyObject* o3;
|
||||
@@ -3626,7 +3630,7 @@ static PyObject *_wrap_new_wxDragString(PyObject *self, PyObject *args, PyObject
|
||||
static PyObject *_wrap_new_wxDragTreeItem(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxGenericDragImage * _result;
|
||||
wxTreeCtrl * _arg0;
|
||||
wxPyTreeCtrl * _arg0;
|
||||
wxTreeItemId * _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _argo1 = 0;
|
||||
@@ -3637,8 +3641,8 @@ static PyObject *_wrap_new_wxDragTreeItem(PyObject *self, PyObject *args, PyObje
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:new_wxDragTreeItem",_kwnames,&_argo0,&_argo1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeCtrl_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDragTreeItem. Expected _wxTreeCtrl_p.");
|
||||
if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyTreeCtrl_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDragTreeItem. Expected _wxPyTreeCtrl_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
@@ -3668,7 +3672,7 @@ static PyObject *_wrap_new_wxDragTreeItem(PyObject *self, PyObject *args, PyObje
|
||||
static PyObject *_wrap_new_wxDragListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxGenericDragImage * _result;
|
||||
wxListCtrl * _arg0;
|
||||
wxPyListCtrl * _arg0;
|
||||
long _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "listCtrl","id", NULL };
|
||||
@@ -3678,8 +3682,8 @@ static PyObject *_wrap_new_wxDragListItem(PyObject *self, PyObject *args, PyObje
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:new_wxDragListItem",_kwnames,&_argo0,&_arg1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListCtrl_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDragListItem. Expected _wxListCtrl_p.");
|
||||
if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyListCtrl_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDragListItem. Expected _wxPyListCtrl_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user