fixes for the wxPre* helpers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -215,7 +215,7 @@ class wxCalendarCtrl(wxCalendarCtrlPtr):
|
||||
def wxPreCalendarCtrl(*_args,**_kwargs):
|
||||
val = wxCalendarCtrlPtr(apply(calendarc.new_wxPreCalendarCtrl,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -1931,6 +1931,133 @@ static PyObject *_wrap_wxCustomDataObject_GetData(PyObject *self, PyObject *args
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static void *SwigwxURLDataObjectTowxDataObjectComposite(void *ptr) {
|
||||
wxURLDataObject *src;
|
||||
wxDataObjectComposite *dest;
|
||||
src = (wxURLDataObject *) ptr;
|
||||
dest = (wxDataObjectComposite *) src;
|
||||
return (void *) dest;
|
||||
}
|
||||
|
||||
static void *SwigwxURLDataObjectTowxDataObject(void *ptr) {
|
||||
wxURLDataObject *src;
|
||||
wxDataObject *dest;
|
||||
src = (wxURLDataObject *) ptr;
|
||||
dest = (wxDataObject *) src;
|
||||
return (void *) dest;
|
||||
}
|
||||
|
||||
#define new_wxURLDataObject() (new wxURLDataObject())
|
||||
static PyObject *_wrap_new_wxURLDataObject(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxURLDataObject * _result;
|
||||
char *_kwnames[] = { NULL };
|
||||
char _ptemp[128];
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxURLDataObject",_kwnames))
|
||||
return NULL;
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (wxURLDataObject *)new_wxURLDataObject();
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} if (_result) {
|
||||
SWIG_MakePtr(_ptemp, (char *) _result,"_wxURLDataObject_p");
|
||||
_resultobj = Py_BuildValue("s",_ptemp);
|
||||
} else {
|
||||
Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxURLDataObject_GetURL(_swigobj) (_swigobj->GetURL())
|
||||
static PyObject *_wrap_wxURLDataObject_GetURL(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxString * _result;
|
||||
wxURLDataObject * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxURLDataObject_GetURL",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxURLDataObject_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxURLDataObject_GetURL. Expected _wxURLDataObject_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = new wxString (wxURLDataObject_GetURL(_arg0));
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
}{
|
||||
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
|
||||
}
|
||||
{
|
||||
delete _result;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxURLDataObject_SetURL(_swigobj,_swigarg0) (_swigobj->SetURL(_swigarg0))
|
||||
static PyObject *_wrap_wxURLDataObject_SetURL(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxURLDataObject * _arg0;
|
||||
wxString * _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "self","url", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxURLDataObject_SetURL",_kwnames,&_argo0,&_obj1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxURLDataObject_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxURLDataObject_SetURL. Expected _wxURLDataObject_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
#if PYTHON_API_VERSION >= 1009
|
||||
char* tmpPtr; int tmpSize;
|
||||
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
|
||||
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
|
||||
return NULL;
|
||||
}
|
||||
if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
|
||||
return NULL;
|
||||
_arg1 = new wxString(tmpPtr, tmpSize);
|
||||
#else
|
||||
if (!PyString_Check(_obj1)) {
|
||||
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
|
||||
return NULL;
|
||||
}
|
||||
_arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
|
||||
#endif
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
wxURLDataObject_SetURL(_arg0,*_arg1);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
{
|
||||
if (_obj1)
|
||||
delete _arg1;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static void *SwigwxClipboardTowxObject(void *ptr) {
|
||||
wxClipboard *src;
|
||||
wxObject *dest;
|
||||
@@ -3396,6 +3523,9 @@ static PyMethodDef clip_dndcMethods[] = {
|
||||
{ "wxClipboard_Close", (PyCFunction) _wrap_wxClipboard_Close, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxClipboard_Open", (PyCFunction) _wrap_wxClipboard_Open, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxClipboard", (PyCFunction) _wrap_new_wxClipboard, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxURLDataObject_SetURL", (PyCFunction) _wrap_wxURLDataObject_SetURL, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxURLDataObject_GetURL", (PyCFunction) _wrap_wxURLDataObject_GetURL, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxURLDataObject", (PyCFunction) _wrap_new_wxURLDataObject, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxCustomDataObject_GetData", (PyCFunction) _wrap_wxCustomDataObject_GetData, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxCustomDataObject_GetSize", (PyCFunction) _wrap_wxCustomDataObject_GetSize, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxCustomDataObject_SetData", (PyCFunction) _wrap_wxCustomDataObject_SetData, METH_VARARGS | METH_KEYWORDS },
|
||||
@@ -3458,6 +3588,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPrintQuality","_size_t",0},
|
||||
{ "_wxPrintQuality","_time_t",0},
|
||||
{ "_byte","_unsigned_char",0},
|
||||
{ "_wxDataObject","_wxURLDataObject",SwigwxURLDataObjectTowxDataObject},
|
||||
{ "_wxDataObject","_wxCustomDataObject",SwigwxCustomDataObjectTowxDataObject},
|
||||
{ "_wxDataObject","_wxFileDataObject",SwigwxFileDataObjectTowxDataObject},
|
||||
{ "_wxDataObject","_wxPyBitmapDataObject",SwigwxPyBitmapDataObjectTowxDataObject},
|
||||
@@ -3562,6 +3693,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxCoord","_size_t",0},
|
||||
{ "_wxCoord","_time_t",0},
|
||||
{ "_wxCoord","_wxPrintQuality",0},
|
||||
{ "_wxDataObjectComposite","_wxURLDataObject",SwigwxURLDataObjectTowxDataObjectComposite},
|
||||
{ "_wxPyDropTarget","_wxPyFileDropTarget",SwigwxPyFileDropTargetTowxPyDropTarget},
|
||||
{ "_wxPyDropTarget","_wxPyTextDropTarget",SwigwxPyTextDropTargetTowxPyDropTarget},
|
||||
{0,0,0}};
|
||||
@@ -3601,6 +3733,7 @@ SWIGEXPORT(void) initclip_dndc() {
|
||||
PyDict_SetItemString(d,"wxDragNone", PyInt_FromLong((long) wxDragNone));
|
||||
PyDict_SetItemString(d,"wxDragCopy", PyInt_FromLong((long) wxDragCopy));
|
||||
PyDict_SetItemString(d,"wxDragMove", PyInt_FromLong((long) wxDragMove));
|
||||
PyDict_SetItemString(d,"wxDragLink", PyInt_FromLong((long) wxDragLink));
|
||||
PyDict_SetItemString(d,"wxDragCancel", PyInt_FromLong((long) wxDragCancel));
|
||||
|
||||
|
||||
|
@@ -255,6 +255,26 @@ class wxCustomDataObject(wxCustomDataObjectPtr):
|
||||
|
||||
|
||||
|
||||
class wxURLDataObjectPtr(wxDataObjectCompositePtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def GetURL(self, *_args, **_kwargs):
|
||||
val = apply(clip_dndc.wxURLDataObject_GetURL,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetURL(self, *_args, **_kwargs):
|
||||
val = apply(clip_dndc.wxURLDataObject_SetURL,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def __repr__(self):
|
||||
return "<C wxURLDataObject instance at %s>" % (self.this,)
|
||||
class wxURLDataObject(wxURLDataObjectPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(clip_dndc.new_wxURLDataObject,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
|
||||
|
||||
|
||||
|
||||
class wxClipboardPtr(wxObjectPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
@@ -503,4 +523,5 @@ wxDragError = clip_dndc.wxDragError
|
||||
wxDragNone = clip_dndc.wxDragNone
|
||||
wxDragCopy = clip_dndc.wxDragCopy
|
||||
wxDragMove = clip_dndc.wxDragMove
|
||||
wxDragLink = clip_dndc.wxDragLink
|
||||
wxDragCancel = clip_dndc.wxDragCancel
|
||||
|
@@ -462,7 +462,7 @@ class wxFindReplaceDialog(wxFindReplaceDialogPtr):
|
||||
def wxPreFindReplaceDialog(*_args,**_kwargs):
|
||||
val = wxFindReplaceDialogPtr(apply(cmndlgsc.new_wxPreFindReplaceDialog,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -40,7 +40,7 @@ class wxControl(wxControlPtr):
|
||||
def wxPreControl(*_args,**_kwargs):
|
||||
val = wxControlPtr(apply(controlsc.new_wxPreControl,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -120,7 +120,7 @@ class wxButton(wxButtonPtr):
|
||||
def wxPreButton(*_args,**_kwargs):
|
||||
val = wxButtonPtr(apply(controlsc.new_wxPreButton,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -181,7 +181,7 @@ class wxBitmapButton(wxBitmapButtonPtr):
|
||||
def wxPreBitmapButton(*_args,**_kwargs):
|
||||
val = wxBitmapButtonPtr(apply(controlsc.new_wxPreBitmapButton,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -211,7 +211,7 @@ class wxCheckBox(wxCheckBoxPtr):
|
||||
def wxPreCheckBox(*_args,**_kwargs):
|
||||
val = wxCheckBoxPtr(apply(controlsc.new_wxPreCheckBox,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -256,7 +256,7 @@ class wxChoice(wxChoicePtr):
|
||||
def wxPreChoice(*_args,**_kwargs):
|
||||
val = wxChoicePtr(apply(controlsc.new_wxPreChoice,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -322,7 +322,7 @@ class wxComboBox(wxComboBoxPtr):
|
||||
def wxPreComboBox(*_args,**_kwargs):
|
||||
val = wxComboBoxPtr(apply(controlsc.new_wxPreComboBox,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -370,7 +370,7 @@ class wxGauge(wxGaugePtr):
|
||||
def wxPreGauge(*_args,**_kwargs):
|
||||
val = wxGaugePtr(apply(controlsc.new_wxPreGauge,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -394,7 +394,7 @@ class wxStaticBox(wxStaticBoxPtr):
|
||||
def wxPreStaticBox(*_args,**_kwargs):
|
||||
val = wxStaticBoxPtr(apply(controlsc.new_wxPreStaticBox,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -418,7 +418,7 @@ class wxStaticLine(wxStaticLinePtr):
|
||||
def wxPreStaticLine(*_args,**_kwargs):
|
||||
val = wxStaticLinePtr(apply(controlsc.new_wxPreStaticLine,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -448,7 +448,7 @@ class wxStaticText(wxStaticTextPtr):
|
||||
def wxPreStaticText(*_args,**_kwargs):
|
||||
val = wxStaticTextPtr(apply(controlsc.new_wxPreStaticText,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -508,7 +508,7 @@ class wxListBox(wxListBoxPtr):
|
||||
def wxPreListBox(*_args,**_kwargs):
|
||||
val = wxListBoxPtr(apply(controlsc.new_wxPreListBox,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -544,7 +544,7 @@ class wxCheckListBox(wxCheckListBoxPtr):
|
||||
def wxPreCheckListBox(*_args,**_kwargs):
|
||||
val = wxCheckListBoxPtr(apply(controlsc.new_wxPreCheckListBox,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -736,7 +736,7 @@ class wxTextCtrl(wxTextCtrlPtr):
|
||||
def wxPreTextCtrl(*_args,**_kwargs):
|
||||
val = wxTextCtrlPtr(apply(controlsc.new_wxPreTextCtrl,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -781,7 +781,7 @@ class wxScrollBar(wxScrollBarPtr):
|
||||
def wxPreScrollBar(*_args,**_kwargs):
|
||||
val = wxScrollBarPtr(apply(controlsc.new_wxPreScrollBar,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -820,7 +820,7 @@ class wxSpinButton(wxSpinButtonPtr):
|
||||
def wxPreSpinButton(*_args,**_kwargs):
|
||||
val = wxSpinButtonPtr(apply(controlsc.new_wxPreSpinButton,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -854,7 +854,7 @@ class wxStaticBitmap(wxStaticBitmapPtr):
|
||||
def wxPreStaticBitmap(*_args,**_kwargs):
|
||||
val = wxStaticBitmapPtr(apply(controlsc.new_wxPreStaticBitmap,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -918,7 +918,7 @@ class wxRadioBox(wxRadioBoxPtr):
|
||||
def wxPreRadioBox(*_args,**_kwargs):
|
||||
val = wxRadioBoxPtr(apply(controlsc.new_wxPreRadioBox,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -948,7 +948,7 @@ class wxRadioButton(wxRadioButtonPtr):
|
||||
def wxPreRadioButton(*_args,**_kwargs):
|
||||
val = wxRadioButtonPtr(apply(controlsc.new_wxPreRadioButton,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -1029,7 +1029,7 @@ class wxSlider(wxSliderPtr):
|
||||
def wxPreSlider(*_args,**_kwargs):
|
||||
val = wxSliderPtr(apply(controlsc.new_wxPreSlider,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -1068,7 +1068,7 @@ class wxSpinCtrl(wxSpinCtrlPtr):
|
||||
def wxPreSpinCtrl(*_args,**_kwargs):
|
||||
val = wxSpinCtrlPtr(apply(controlsc.new_wxPreSpinCtrl,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -1101,7 +1101,7 @@ class wxToggleButton(wxToggleButtonPtr):
|
||||
def wxPreToggleButton(*_args,**_kwargs):
|
||||
val = wxToggleButtonPtr(apply(controlsc.new_wxPreToggleButton,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -671,7 +671,7 @@ class wxListCtrl(wxListCtrlPtr):
|
||||
def wxPreListCtrl(*_args,**_kwargs):
|
||||
val = wxListCtrlPtr(apply(controls2c.new_wxPreListCtrl,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -719,7 +719,7 @@ class wxListView(wxListViewPtr):
|
||||
def wxPreListView(*_args,**_kwargs):
|
||||
val = wxListViewPtr(apply(controls2c.new_wxPreListView,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -1104,7 +1104,7 @@ class wxTreeCtrl(wxTreeCtrlPtr):
|
||||
def wxPreTreeCtrl(*_args,**_kwargs):
|
||||
val = wxTreeCtrlPtr(apply(controls2c.new_wxPreTreeCtrl,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -69,6 +69,7 @@ class wxTopLevelWindow(wxTopLevelWindowPtr):
|
||||
def wxPreTopLevelWindow(*_args,**_kwargs):
|
||||
val = wxTopLevelWindowPtr(apply(framesc.new_wxPreTopLevelWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -132,7 +133,7 @@ class wxFrame(wxFramePtr):
|
||||
def wxPreFrame(*_args,**_kwargs):
|
||||
val = wxFramePtr(apply(framesc.new_wxPreFrame,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -183,7 +184,7 @@ class wxDialog(wxDialogPtr):
|
||||
def wxPreDialog(*_args,**_kwargs):
|
||||
val = wxDialogPtr(apply(framesc.new_wxPreDialog,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -207,7 +208,7 @@ class wxMiniFrame(wxMiniFramePtr):
|
||||
def wxPreMiniFrame(*_args,**_kwargs):
|
||||
val = wxMiniFramePtr(apply(framesc.new_wxPreMiniFrame,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -56,7 +56,6 @@ extern PyObject *SWIG_newvarlink(void);
|
||||
#define SWIG_name "gdic"
|
||||
|
||||
#include "helpers.h"
|
||||
#include <wx/metafile.h>
|
||||
#include <wx/imaglist.h>
|
||||
#ifndef __WXMSW__
|
||||
#include <wx/dcps.h>
|
||||
|
@@ -61,7 +61,7 @@ class wxMDIParentFrame(wxMDIParentFramePtr):
|
||||
def wxPreMDIParentFrame(*_args,**_kwargs):
|
||||
val = wxMDIParentFramePtr(apply(mdic.new_wxPreMDIParentFrame,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ class wxMDIChildFrame(wxMDIChildFramePtr):
|
||||
def wxPreMDIChildFrame(*_args,**_kwargs):
|
||||
val = wxMDIChildFramePtr(apply(mdic.new_wxPreMDIChildFrame,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ class wxMDIClientWindow(wxMDIClientWindowPtr):
|
||||
def wxPreMDIClientWindow(*_args,**_kwargs):
|
||||
val = wxMDIClientWindowPtr(apply(mdic.new_wxPreMDIClientWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -837,6 +837,41 @@ static void *SwigwxSizerTowxObject(void *ptr) {
|
||||
return (void *) dest;
|
||||
}
|
||||
|
||||
static void wxSizer__setOORInfo(wxSizer *self,PyObject * _self) {
|
||||
self->SetClientObject(new wxPyClientData(_self));
|
||||
}
|
||||
static PyObject *_wrap_wxSizer__setOORInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxSizer * _arg0;
|
||||
PyObject * _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "self","_self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSizer__setOORInfo",_kwnames,&_argo0,&_obj1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizer_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizer__setOORInfo. Expected _wxSizer_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
_arg1 = _obj1;
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
wxSizer__setOORInfo(_arg0,_arg1);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static void wxSizer_Destroy(wxSizer *self) { delete self; }
|
||||
static PyObject *_wrap_wxSizer_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -2912,6 +2947,7 @@ static PyMethodDef sizerscMethods[] = {
|
||||
{ "wxSizer_AddSizer", (PyCFunction) _wrap_wxSizer_AddSizer, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSizer_AddWindow", (PyCFunction) _wrap_wxSizer_AddWindow, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSizer_Destroy", (PyCFunction) _wrap_wxSizer_Destroy, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSizer__setOORInfo", (PyCFunction) _wrap_wxSizer__setOORInfo, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSizerItem_SetBorder", (PyCFunction) _wrap_wxSizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxSizerItem_SetFlag", (PyCFunction) _wrap_wxSizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS },
|
||||
|
@@ -103,6 +103,9 @@ class wxSizerPtr(wxObjectPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def _setOORInfo(self, *_args, **_kwargs):
|
||||
val = apply(sizersc.wxSizer__setOORInfo,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def Destroy(self, *_args, **_kwargs):
|
||||
val = apply(sizersc.wxSizer_Destroy,(self,) + _args, _kwargs)
|
||||
return val
|
||||
@@ -252,6 +255,7 @@ class wxPySizer(wxPySizerPtr):
|
||||
self.this = apply(sizersc.new_wxPySizer,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
self._setCallbackInfo(self, wxPySizer)
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
@@ -276,6 +280,7 @@ class wxBoxSizer(wxBoxSizerPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(sizersc.new_wxBoxSizer,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
@@ -300,6 +305,7 @@ class wxStaticBoxSizer(wxStaticBoxSizerPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(sizersc.new_wxStaticBoxSizer,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
@@ -324,6 +330,7 @@ class wxNotebookSizer(wxNotebookSizerPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(sizersc.new_wxNotebookSizer,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
@@ -369,6 +376,7 @@ class wxGridSizer(wxGridSizerPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(sizersc.new_wxGridSizer,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
@@ -402,6 +410,7 @@ class wxFlexGridSizer(wxFlexGridSizerPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(sizersc.new_wxFlexGridSizer,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
self._setOORInfo(self)
|
||||
|
||||
|
||||
|
||||
|
@@ -61,7 +61,7 @@ class wxStatusBar(wxStatusBarPtr):
|
||||
def wxPreStatusBar(*_args,**_kwargs):
|
||||
val = wxStatusBarPtr(apply(stattoolc.new_wxPreStatusBar,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -319,7 +319,7 @@ class wxToolBar(wxToolBarPtr):
|
||||
def wxPreToolBar(*_args,**_kwargs):
|
||||
val = wxToolBarPtr(apply(stattoolc.new_wxPreToolBar,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -346,7 +346,7 @@ class wxToolBarSimple(wxToolBarSimplePtr):
|
||||
def wxPreToolBarSimple(*_args,**_kwargs):
|
||||
val = wxToolBarSimplePtr(apply(stattoolc.new_wxPreToolBarSimple,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -573,7 +573,7 @@ class wxWindow(wxWindowPtr):
|
||||
def wxPreWindow(*_args,**_kwargs):
|
||||
val = wxWindowPtr(apply(windowsc.new_wxPreWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -684,7 +684,7 @@ class wxScrolledWindow(wxScrolledWindowPtr):
|
||||
def wxPreScrolledWindow(*_args,**_kwargs):
|
||||
val = wxScrolledWindowPtr(apply(windowsc.new_wxPreScrolledWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -123,7 +123,7 @@ class wxNotebook(wxNotebookPtr):
|
||||
def wxPreNotebook(*_args,**_kwargs):
|
||||
val = wxNotebookPtr(apply(windows2c.new_wxPreNotebook,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -230,7 +230,7 @@ class wxSplitterWindow(wxSplitterWindowPtr):
|
||||
def wxPreSplitterWindow(*_args,**_kwargs):
|
||||
val = wxSplitterWindowPtr(apply(windows2c.new_wxPreSplitterWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
@@ -125,7 +125,7 @@ class wxSashWindow(wxSashWindowPtr):
|
||||
def wxPreSashWindow(*_args,**_kwargs):
|
||||
val = wxSashWindowPtr(apply(windows3c.new_wxPreSashWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -236,7 +236,7 @@ class wxSashLayoutWindow(wxSashLayoutWindowPtr):
|
||||
def wxPreSashLayoutWindow(*_args,**_kwargs):
|
||||
val = wxSashLayoutWindowPtr(apply(windows3c.new_wxPreSashLayoutWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -289,7 +289,7 @@ class wxPopupWindow(wxPopupWindowPtr):
|
||||
def wxPrePopupWindow(*_args,**_kwargs):
|
||||
val = wxPopupWindowPtr(apply(windows3c.new_wxPrePopupWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
@@ -320,7 +320,7 @@ class wxPopupTransientWindow(wxPopupTransientWindowPtr):
|
||||
def wxPrePopupTransientWindow(*_args,**_kwargs):
|
||||
val = wxPopupTransientWindowPtr(apply(windows3c.new_wxPrePopupTransientWindow,_args,_kwargs))
|
||||
val.thisown = 1
|
||||
val._setOORInfo(self)
|
||||
val._setOORInfo(val)
|
||||
return val
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user