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

SWIGged updates for wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-02-26 04:24:28 +00:00
parent 42ac4a136f
commit df4b33919c
27 changed files with 414 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wxPython/contrib/glcanvas/gtk/glcanvas.py
View File

@@ -47,9 +47,9 @@ class wxGLContextPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,glcanvasc=glcanvasc): def __del__(self,delfunc=glcanvasc.delete_wxGLContext):
if self.thisown == 1 : if self.thisown == 1:
glcanvasc.delete_wxGLContext(self) delfunc(self)
def SetCurrent(self, *_args, **_kwargs): def SetCurrent(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs) val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
return val return val

6
wxPython/contrib/ogl/oglshapes.py
View File

@@ -49,9 +49,9 @@ class wxPseudoMetaFilePtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,oglshapesc=oglshapesc): def __del__(self,delfunc=oglshapesc.delete_wxPseudoMetaFile):
if self.thisown == 1 : if self.thisown == 1:
oglshapesc.delete_wxPseudoMetaFile(self) delfunc(self)
def Draw(self, *_args, **_kwargs): def Draw(self, *_args, **_kwargs):
val = apply(oglshapesc.wxPseudoMetaFile_Draw,(self,) + _args, _kwargs) val = apply(oglshapesc.wxPseudoMetaFile_Draw,(self,) + _args, _kwargs)
return val return val

6
wxPython/contrib/ogl/oglshapes2.py
View File

@@ -257,9 +257,9 @@ class wxArrowHeadPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,oglshapes2c=oglshapes2c): def __del__(self,delfunc=oglshapes2c.delete_wxArrowHead):
if self.thisown == 1 : if self.thisown == 1:
oglshapes2c.delete_wxArrowHead(self) delfunc(self)
def _GetType(self, *_args, **_kwargs): def _GetType(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead__GetType,(self,) + _args, _kwargs) val = apply(oglshapes2c.wxArrowHead__GetType,(self,) + _args, _kwargs)
return val return val

6
wxPython/contrib/stc/gtk/stc_.py
View File

@@ -1046,9 +1046,9 @@ class wxStyledTextEventPtr(wxCommandEventPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,stc_c=stc_c): def __del__(self,delfunc=stc_c.delete_wxStyledTextEvent):
if self.thisown == 1 : if self.thisown == 1:
stc_c.delete_wxStyledTextEvent(self) delfunc(self)
def SetPosition(self, *_args, **_kwargs): def SetPosition(self, *_args, **_kwargs):
val = apply(stc_c.wxStyledTextEvent_SetPosition,(self,) + _args, _kwargs) val = apply(stc_c.wxStyledTextEvent_SetPosition,(self,) + _args, _kwargs)
return val return val

18
wxPython/contrib/xrc/xrc.py
View File

@@ -56,9 +56,9 @@ class wxXmlResourcePtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,xrcc=xrcc): def __del__(self,delfunc=xrcc.delete_wxXmlResource):
if self.thisown == 1 : if self.thisown == 1:
xrcc.delete_wxXmlResource(self) delfunc(self)
def Load(self, *_args, **_kwargs): def Load(self, *_args, **_kwargs):
val = apply(xrcc.wxXmlResource_Load,(self,) + _args, _kwargs) val = apply(xrcc.wxXmlResource_Load,(self,) + _args, _kwargs)
return val return val
@@ -210,9 +210,9 @@ class wxXmlNodePtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,xrcc=xrcc): def __del__(self,delfunc=xrcc.delete_wxXmlNode):
if self.thisown == 1 : if self.thisown == 1:
xrcc.delete_wxXmlNode(self) delfunc(self)
def AddChild(self, *_args, **_kwargs): def AddChild(self, *_args, **_kwargs):
val = apply(xrcc.wxXmlNode_AddChild,(self,) + _args, _kwargs) val = apply(xrcc.wxXmlNode_AddChild,(self,) + _args, _kwargs)
return val return val
@@ -302,9 +302,9 @@ class wxXmlDocumentPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,xrcc=xrcc): def __del__(self,delfunc=xrcc.delete_wxXmlDocument):
if self.thisown == 1 : if self.thisown == 1:
xrcc.delete_wxXmlDocument(self) delfunc(self)
def Load(self, *_args, **_kwargs): def Load(self, *_args, **_kwargs):
val = apply(xrcc.wxXmlDocument_Load,(self,) + _args, _kwargs) val = apply(xrcc.wxXmlDocument_Load,(self,) + _args, _kwargs)
return val return val

40
wxPython/src/gtk/clip_dnd.cpp
View File

@@ -203,15 +203,17 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
class wxPyDropSource : public wxDropSource { class wxPyDropSource : public wxDropSource {
public: public:
#ifdef __WXMSW__ #ifdef __WXMSW__
wxPyDropSource(wxWindow *win = NULL, wxPyDropSource(wxWindow *win = NULL,
const wxCursor &cursorCopy = wxNullCursor, const wxCursor &copy = wxNullCursor,
const wxCursor &cursorMove = wxNullCursor, const wxCursor &move = wxNullCursor,
const wxCursor &cursorStop = wxNullCursor) const wxCursor &none = wxNullCursor)
: wxDropSource(win, cursorCopy, cursorMove, cursorStop) {} : wxDropSource(win, copy, move, none) {}
#else #else
wxPyDropSource(wxWindow *win = NULL, wxPyDropSource(wxWindow *win = NULL,
const wxIcon &go = wxNullIcon) const wxIcon& copy = wxNullIcon,
: wxDropSource(win, go) {} const wxIcon& move = wxNullIcon,
const wxIcon& none = wxNullIcon)
: wxDropSource(win, copy, move, none) {}
#endif #endif
~wxPyDropSource() { } ~wxPyDropSource() { }
@@ -2344,19 +2346,23 @@ static PyObject *_wrap_wxClipboard_UsePrimarySelection(PyObject *self, PyObject
return _resultobj; return _resultobj;
} }
#define new_wxDropSource(_swigarg0,_swigarg1) (new wxPyDropSource(_swigarg0,_swigarg1)) #define new_wxDropSource(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxPyDropSource(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_new_wxDropSource(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_new_wxDropSource(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
wxPyDropSource * _result; wxPyDropSource * _result;
wxWindow * _arg0 = (wxWindow *) NULL; wxWindow * _arg0 = (wxWindow *) NULL;
wxIcon * _arg1 = (wxIcon *) &wxNullIcon; wxIcon * _arg1 = (wxIcon *) &wxNullIcon;
wxIcon * _arg2 = (wxIcon *) &wxNullIcon;
wxIcon * _arg3 = (wxIcon *) &wxNullIcon;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
PyObject * _argo1 = 0; PyObject * _argo1 = 0;
char *_kwnames[] = { "win","go", NULL }; PyObject * _argo2 = 0;
PyObject * _argo3 = 0;
char *_kwnames[] = { "win","copy","move","none", NULL };
char _ptemp[128]; char _ptemp[128];
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OO:new_wxDropSource",_kwnames,&_argo0,&_argo1)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OOOO:new_wxDropSource",_kwnames,&_argo0,&_argo1,&_argo2,&_argo3))
return NULL; return NULL;
if (_argo0) { if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; } if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2371,9 +2377,21 @@ static PyObject *_wrap_new_wxDropSource(PyObject *self, PyObject *args, PyObject
return NULL; return NULL;
} }
} }
if (_argo2) {
if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxIcon_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxDropSource. Expected _wxIcon_p.");
return NULL;
}
}
if (_argo3) {
if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxIcon_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxDropSource. Expected _wxIcon_p.");
return NULL;
}
}
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxPyDropSource *)new_wxDropSource(_arg0,*_arg1); _result = (wxPyDropSource *)new_wxDropSource(_arg0,*_arg1,*_arg2,*_arg3);
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;

24
wxPython/src/gtk/clip_dnd.py
View File

@@ -11,9 +11,9 @@ class wxDataFormatPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,clip_dndc=clip_dndc): def __del__(self,delfunc=clip_dndc.delete_wxDataFormat):
if self.thisown == 1 : if self.thisown == 1:
clip_dndc.delete_wxDataFormat(self) delfunc(self)
def SetType(self, *_args, **_kwargs): def SetType(self, *_args, **_kwargs):
val = apply(clip_dndc.wxDataFormat_SetType,(self,) + _args, _kwargs) val = apply(clip_dndc.wxDataFormat_SetType,(self,) + _args, _kwargs)
return val return val
@@ -43,9 +43,9 @@ class wxDataObjectPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,clip_dndc=clip_dndc): def __del__(self,delfunc=clip_dndc.delete_wxDataObject):
if self.thisown == 1 : if self.thisown == 1:
clip_dndc.delete_wxDataObject(self) delfunc(self)
def GetPreferredFormat(self, *_args, **_kwargs): def GetPreferredFormat(self, *_args, **_kwargs):
val = apply(clip_dndc.wxDataObject_GetPreferredFormat,(self,) + _args, _kwargs) val = apply(clip_dndc.wxDataObject_GetPreferredFormat,(self,) + _args, _kwargs)
if val: val = wxDataFormatPtr(val) ; val.thisown = 1 if val: val = wxDataFormatPtr(val) ; val.thisown = 1
@@ -330,9 +330,9 @@ class wxDropSourcePtr :
def _setCallbackInfo(self, *_args, **_kwargs): def _setCallbackInfo(self, *_args, **_kwargs):
val = apply(clip_dndc.wxDropSource__setCallbackInfo,(self,) + _args, _kwargs) val = apply(clip_dndc.wxDropSource__setCallbackInfo,(self,) + _args, _kwargs)
return val return val
def __del__(self,clip_dndc=clip_dndc): def __del__(self,delfunc=clip_dndc.delete_wxDropSource):
if self.thisown == 1 : if self.thisown == 1:
clip_dndc.delete_wxDropSource(self) delfunc(self)
def SetData(self, *_args, **_kwargs): def SetData(self, *_args, **_kwargs):
val = apply(clip_dndc.wxDropSource_SetData,(self,) + _args, _kwargs) val = apply(clip_dndc.wxDropSource_SetData,(self,) + _args, _kwargs)
return val return val
@@ -380,9 +380,9 @@ class wxPyDropTargetPtr(wxDropTargetPtr):
def _setCallbackInfo(self, *_args, **_kwargs): def _setCallbackInfo(self, *_args, **_kwargs):
val = apply(clip_dndc.wxPyDropTarget__setCallbackInfo,(self,) + _args, _kwargs) val = apply(clip_dndc.wxPyDropTarget__setCallbackInfo,(self,) + _args, _kwargs)
return val return val
def __del__(self,clip_dndc=clip_dndc): def __del__(self,delfunc=clip_dndc.delete_wxPyDropTarget):
if self.thisown == 1 : if self.thisown == 1:
clip_dndc.delete_wxPyDropTarget(self) delfunc(self)
def GetDataObject(self, *_args, **_kwargs): def GetDataObject(self, *_args, **_kwargs):
val = apply(clip_dndc.wxPyDropTarget_GetDataObject,(self,) + _args, _kwargs) val = apply(clip_dndc.wxPyDropTarget_GetDataObject,(self,) + _args, _kwargs)
if val: val = wxDataObjectPtr(val) if val: val = wxDataObjectPtr(val)

18
wxPython/src/gtk/cmndlgs.py
View File

@@ -41,9 +41,9 @@ class wxColourDataPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,cmndlgsc=cmndlgsc): def __del__(self,delfunc=cmndlgsc.delete_wxColourData):
if self.thisown == 1 : if self.thisown == 1:
cmndlgsc.delete_wxColourData(self) delfunc(self)
def GetChooseFull(self, *_args, **_kwargs): def GetChooseFull(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs) val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs)
return val return val
@@ -271,9 +271,9 @@ class wxFontDataPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,cmndlgsc=cmndlgsc): def __del__(self,delfunc=cmndlgsc.delete_wxFontData):
if self.thisown == 1 : if self.thisown == 1:
cmndlgsc.delete_wxFontData(self) delfunc(self)
def EnableEffects(self, *_args, **_kwargs): def EnableEffects(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs) val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs)
return val return val
@@ -427,9 +427,9 @@ class wxFindReplaceDataPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,cmndlgsc=cmndlgsc): def __del__(self,delfunc=cmndlgsc.delete_wxFindReplaceData):
if self.thisown == 1 : if self.thisown == 1:
cmndlgsc.delete_wxFindReplaceData(self) delfunc(self)
def GetFindString(self, *_args, **_kwargs): def GetFindString(self, *_args, **_kwargs):
val = apply(cmndlgsc.wxFindReplaceData_GetFindString,(self,) + _args, _kwargs) val = apply(cmndlgsc.wxFindReplaceData_GetFindString,(self,) + _args, _kwargs)
return val return val

6
wxPython/src/gtk/controls.py
View File

@@ -598,9 +598,9 @@ class wxTextAttrPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,controlsc=controlsc): def __del__(self,delfunc=controlsc.delete_wxTextAttr):
if self.thisown == 1 : if self.thisown == 1:
controlsc.delete_wxTextAttr(self) delfunc(self)
def SetTextColour(self, *_args, **_kwargs): def SetTextColour(self, *_args, **_kwargs):
val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs) val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs)
return val return val

14
wxPython/src/gtk/controls2.py
View File

@@ -186,9 +186,9 @@ class wxListItemPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,controls2c=controls2c): def __del__(self,delfunc=controls2c.delete_wxListItem):
if self.thisown == 1 : if self.thisown == 1:
controls2c.delete_wxListItem(self) delfunc(self)
def Clear(self, *_args, **_kwargs): def Clear(self, *_args, **_kwargs):
val = apply(controls2c.wxListItem_Clear,(self,) + _args, _kwargs) val = apply(controls2c.wxListItem_Clear,(self,) + _args, _kwargs)
return val return val
@@ -664,7 +664,7 @@ class wxListCtrlPtr(wxControlPtr):
'''get the currently focused item or -1 if none''' '''get the currently focused item or -1 if none'''
return self.GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED) return self.GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED)
def GetFirstSelected(self, item): def GetFirstSelected(self, *args):
'''return first selected item, or -1 when none''' '''return first selected item, or -1 when none'''
return self.GetNextSelected(-1) return self.GetNextSelected(-1)
@@ -811,9 +811,9 @@ class wxTreeItemIdPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,controls2c=controls2c): def __del__(self,delfunc=controls2c.delete_wxTreeItemId):
if self.thisown == 1 : if self.thisown == 1:
controls2c.delete_wxTreeItemId(self) delfunc(self)
def IsOk(self, *_args, **_kwargs): def IsOk(self, *_args, **_kwargs):
val = apply(controls2c.wxTreeItemId_IsOk,(self,) + _args, _kwargs) val = apply(controls2c.wxTreeItemId_IsOk,(self,) + _args, _kwargs)
return val return val

18
wxPython/src/gtk/events.py
View File

@@ -10,9 +10,9 @@ class wxEventPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,eventsc=eventsc): def __del__(self,delfunc=eventsc.delete_wxEvent):
if self.thisown == 1 : if self.thisown == 1:
eventsc.delete_wxEvent(self) delfunc(self)
def GetEventObject(self, *_args, **_kwargs): def GetEventObject(self, *_args, **_kwargs):
val = apply(eventsc.wxEvent_GetEventObject,(self,) + _args, _kwargs) val = apply(eventsc.wxEvent_GetEventObject,(self,) + _args, _kwargs)
return val return val
@@ -1095,9 +1095,9 @@ class wxPyEventPtr(wxEventPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,eventsc=eventsc): def __del__(self,delfunc=eventsc.delete_wxPyEvent):
if self.thisown == 1 : if self.thisown == 1:
eventsc.delete_wxPyEvent(self) delfunc(self)
def SetSelf(self, *_args, **_kwargs): def SetSelf(self, *_args, **_kwargs):
val = apply(eventsc.wxPyEvent_SetSelf,(self,) + _args, _kwargs) val = apply(eventsc.wxPyEvent_SetSelf,(self,) + _args, _kwargs)
return val return val
@@ -1119,9 +1119,9 @@ class wxPyCommandEventPtr(wxCommandEventPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,eventsc=eventsc): def __del__(self,delfunc=eventsc.delete_wxPyCommandEvent):
if self.thisown == 1 : if self.thisown == 1:
eventsc.delete_wxPyCommandEvent(self) delfunc(self)
def SetSelf(self, *_args, **_kwargs): def SetSelf(self, *_args, **_kwargs):
val = apply(eventsc.wxPyCommandEvent_SetSelf,(self,) + _args, _kwargs) val = apply(eventsc.wxPyCommandEvent_SetSelf,(self,) + _args, _kwargs)
return val return val

171
wxPython/src/gtk/fonts.cpp
View File

@@ -3020,75 +3020,6 @@ static PyObject *_wrap_new_wxLocale(PyObject *self, PyObject *args, PyObject *kw
return _resultobj; return _resultobj;
} }
#define wxLocale_Init(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->Init(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_wxLocale_Init(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxLocale * _arg0;
wxString * _arg1;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxString * _arg3 = (wxString *) &wxPyEmptyString;
bool _arg4 = (bool ) TRUE;
bool _arg5 = (bool ) FALSE;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
int tempbool4 = (int) TRUE;
int tempbool5 = (int) FALSE;
char *_kwnames[] = { "self","szName","szShort","szLocale","bLoadDefault","bConvertEncoding", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|OOii:wxLocale_Init",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3,&tempbool4,&tempbool5))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLocale_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLocale_Init. Expected _wxLocale_p.");
return NULL;
}
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
if (_obj2)
{
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (_obj3)
{
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
_arg4 = (bool ) tempbool4;
_arg5 = (bool ) tempbool5;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxLocale_Init(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
{
if (_obj3)
delete _arg3;
}
return _resultobj;
}
#define delete_wxLocale(_swigobj) (delete _swigobj) #define delete_wxLocale(_swigobj) (delete _swigobj)
static PyObject *_wrap_delete_wxLocale(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_delete_wxLocale(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
@@ -3117,6 +3048,105 @@ static PyObject *_wrap_delete_wxLocale(PyObject *self, PyObject *args, PyObject
return _resultobj; return _resultobj;
} }
#define wxLocale_Init1(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->Init(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_wxLocale_Init1(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxLocale * _arg0;
wxString * _arg1;
wxString * _arg2 = (wxString *) &wxPyEmptyString;
wxString * _arg3 = (wxString *) &wxPyEmptyString;
bool _arg4 = (bool ) TRUE;
bool _arg5 = (bool ) FALSE;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
int tempbool4 = (int) TRUE;
int tempbool5 = (int) FALSE;
char *_kwnames[] = { "self","szName","szShort","szLocale","bLoadDefault","bConvertEncoding", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|OOii:wxLocale_Init1",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3,&tempbool4,&tempbool5))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLocale_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLocale_Init1. Expected _wxLocale_p.");
return NULL;
}
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
if (_obj2)
{
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (_obj3)
{
_arg3 = wxString_in_helper(_obj3);
if (_arg3 == NULL)
return NULL;
}
_arg4 = (bool ) tempbool4;
_arg5 = (bool ) tempbool5;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxLocale_Init1(_arg0,*_arg1,*_arg2,*_arg3,_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
{
if (_obj3)
delete _arg3;
}
return _resultobj;
}
#define wxLocale_Init2(_swigobj,_swigarg0,_swigarg1) (_swigobj->Init(_swigarg0,_swigarg1))
static PyObject *_wrap_wxLocale_Init2(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxLocale * _arg0;
int _arg1 = (int ) (wxLANGUAGE_DEFAULT);
int _arg2 = (int ) (wxLOCALE_LOAD_DEFAULT)|(wxLOCALE_CONV_ENCODING);
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","language","flags", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:wxLocale_Init2",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLocale_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLocale_Init2. Expected _wxLocale_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxLocale_Init2(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static PyObject *_wrap_wxLocale_GetSystemLanguage(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxLocale_GetSystemLanguage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
int _result; int _result;
@@ -3817,8 +3847,9 @@ static PyMethodDef fontscMethods[] = {
{ "wxLocale_GetSystemEncodingName", (PyCFunction) _wrap_wxLocale_GetSystemEncodingName, METH_VARARGS | METH_KEYWORDS }, { "wxLocale_GetSystemEncodingName", (PyCFunction) _wrap_wxLocale_GetSystemEncodingName, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_GetSystemEncoding", (PyCFunction) _wrap_wxLocale_GetSystemEncoding, METH_VARARGS | METH_KEYWORDS }, { "wxLocale_GetSystemEncoding", (PyCFunction) _wrap_wxLocale_GetSystemEncoding, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_GetSystemLanguage", (PyCFunction) _wrap_wxLocale_GetSystemLanguage, METH_VARARGS | METH_KEYWORDS }, { "wxLocale_GetSystemLanguage", (PyCFunction) _wrap_wxLocale_GetSystemLanguage, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_Init2", (PyCFunction) _wrap_wxLocale_Init2, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_Init1", (PyCFunction) _wrap_wxLocale_Init1, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxLocale", (PyCFunction) _wrap_delete_wxLocale, METH_VARARGS | METH_KEYWORDS }, { "delete_wxLocale", (PyCFunction) _wrap_delete_wxLocale, METH_VARARGS | METH_KEYWORDS },
{ "wxLocale_Init", (PyCFunction) _wrap_wxLocale_Init, METH_VARARGS | METH_KEYWORDS },
{ "new_wxLocale", (PyCFunction) _wrap_new_wxLocale, METH_VARARGS | METH_KEYWORDS }, { "new_wxLocale", (PyCFunction) _wrap_new_wxLocale, METH_VARARGS | METH_KEYWORDS },
{ "wxLanguageInfo_Description_get", (PyCFunction) _wrap_wxLanguageInfo_Description_get, METH_VARARGS | METH_KEYWORDS }, { "wxLanguageInfo_Description_get", (PyCFunction) _wrap_wxLanguageInfo_Description_get, METH_VARARGS | METH_KEYWORDS },
{ "wxLanguageInfo_Description_set", (PyCFunction) _wrap_wxLanguageInfo_Description_set, METH_VARARGS | METH_KEYWORDS }, { "wxLanguageInfo_Description_set", (PyCFunction) _wrap_wxLanguageInfo_Description_set, METH_VARARGS | METH_KEYWORDS },

45
wxPython/src/gtk/fonts.py
View File

@@ -80,9 +80,9 @@ class wxFontMapperPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,fontsc=fontsc): def __del__(self, delfunc=fontsc.delete_wxFontMapper):
if self.thisown == 1 : if self.thisown == 1:
fontsc.delete_wxFontMapper(self) delfunc(self)
def GetAltForEncoding(self, *_args, **_kwargs): def GetAltForEncoding(self, *_args, **_kwargs):
val = apply(fontsc.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs) val = apply(fontsc.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs)
return val return val
@@ -122,9 +122,9 @@ class wxFontPtr(wxObjectPtr):
val = apply(fontsc.wxFont_wxFontFromNativeInfoString,(self,) + _args, _kwargs) val = apply(fontsc.wxFont_wxFontFromNativeInfoString,(self,) + _args, _kwargs)
if val: val = wxFontPtr(val) ; val.thisown = 1 if val: val = wxFontPtr(val) ; val.thisown = 1
return val return val
def __del__(self,fontsc=fontsc): def __del__(self, delfunc=fontsc.delete_wxFont):
if self.thisown == 1 : if self.thisown == 1:
fontsc.delete_wxFont(self) delfunc(self)
def Ok(self, *_args, **_kwargs): def Ok(self, *_args, **_kwargs):
val = apply(fontsc.wxFont_Ok,(self,) + _args, _kwargs) val = apply(fontsc.wxFont_Ok,(self,) + _args, _kwargs)
return val return val
@@ -249,9 +249,9 @@ class wxFontEnumeratorPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,fontsc=fontsc): def __del__(self, delfunc=fontsc.delete_wxFontEnumerator):
if self.thisown == 1 : if self.thisown == 1:
fontsc.delete_wxFontEnumerator(self) delfunc(self)
def _setCallbackInfo(self, *_args, **_kwargs): def _setCallbackInfo(self, *_args, **_kwargs):
val = apply(fontsc.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs) val = apply(fontsc.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs)
return val return val
@@ -314,12 +314,15 @@ class wxLocalePtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def Init(self, *_args, **_kwargs): def __del__(self, delfunc=fontsc.delete_wxLocale):
val = apply(fontsc.wxLocale_Init,(self,) + _args, _kwargs) if self.thisown == 1:
delfunc(self)
def Init1(self, *_args, **_kwargs):
val = apply(fontsc.wxLocale_Init1,(self,) + _args, _kwargs)
return val
def Init2(self, *_args, **_kwargs):
val = apply(fontsc.wxLocale_Init2,(self,) + _args, _kwargs)
return val return val
def __del__(self,fontsc=fontsc):
if self.thisown == 1 :
fontsc.delete_wxLocale(self)
def IsOk(self, *_args, **_kwargs): def IsOk(self, *_args, **_kwargs):
val = apply(fontsc.wxLocale_IsOk,(self,) + _args, _kwargs) val = apply(fontsc.wxLocale_IsOk,(self,) + _args, _kwargs)
return val return val
@@ -349,6 +352,14 @@ class wxLocalePtr :
return val return val
def __repr__(self): def __repr__(self):
return "<C wxLocale instance at %s>" % (self.this,) return "<C wxLocale instance at %s>" % (self.this,)
def Init(self, *_args, **_kwargs):
if type(_args[0]) in [type(''), type(u'')]:
val = apply(self.Init1, _args, _kwargs)
else:
val = apply(self.Init2, _args, _kwargs)
return val
class wxLocale(wxLocalePtr): class wxLocale(wxLocalePtr):
def __init__(self,*_args,**_kwargs): def __init__(self,*_args,**_kwargs):
self.this = apply(fontsc.new_wxLocale,_args,_kwargs) self.this = apply(fontsc.new_wxLocale,_args,_kwargs)
@@ -361,9 +372,9 @@ class wxEncodingConverterPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,fontsc=fontsc): def __del__(self, delfunc=fontsc.delete_wxEncodingConverter):
if self.thisown == 1 : if self.thisown == 1:
fontsc.delete_wxEncodingConverter(self) delfunc(self)
def Init(self, *_args, **_kwargs): def Init(self, *_args, **_kwargs):
val = apply(fontsc.wxEncodingConverter_Init,(self,) + _args, _kwargs) val = apply(fontsc.wxEncodingConverter_Init,(self,) + _args, _kwargs)
return val return val

103
wxPython/src/gtk/gdi.py
View File

@@ -9,9 +9,9 @@ class wxGDIObjectPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxGDIObject):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxGDIObject(self) delfunc(self)
def GetVisible(self, *_args, **_kwargs): def GetVisible(self, *_args, **_kwargs):
val = apply(gdic.wxGDIObject_GetVisible,(self,) + _args, _kwargs) val = apply(gdic.wxGDIObject_GetVisible,(self,) + _args, _kwargs)
return val return val
@@ -35,9 +35,9 @@ class wxBitmapPtr(wxGDIObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxBitmap):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxBitmap(self) delfunc(self)
def GetPalette(self, *_args, **_kwargs): def GetPalette(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs) val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs)
if val: val = wxPalettePtr(val) if val: val = wxPalettePtr(val)
@@ -86,13 +86,10 @@ class wxBitmapPtr(wxGDIObjectPtr):
def __repr__(self): def __repr__(self):
return "<C wxBitmap instance at %s>" % (self.this,) return "<C wxBitmap instance at %s>" % (self.this,)
def __del__(self,gdic=gdic): def SetMaskColour(self, colour):
try: mask = wxMaskColour(self, colour)
if self.thisown == 1 : self.SetMask(mask)
gdic.delete_wxBitmap(self)
except:
pass
class wxBitmap(wxBitmapPtr): class wxBitmap(wxBitmapPtr):
def __init__(self,*_args,**_kwargs): def __init__(self,*_args,**_kwargs):
self.this = apply(gdic.new_wxBitmap,_args,_kwargs) self.this = apply(gdic.new_wxBitmap,_args,_kwargs)
@@ -122,9 +119,9 @@ class wxIconPtr(wxGDIObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxIcon):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxIcon(self) delfunc(self)
def LoadFile(self, *_args, **_kwargs): def LoadFile(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs) val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)
return val return val
@@ -154,14 +151,6 @@ class wxIconPtr(wxGDIObjectPtr):
return val return val
def __repr__(self): def __repr__(self):
return "<C wxIcon instance at %s>" % (self.this,) return "<C wxIcon instance at %s>" % (self.this,)
def __del__(self,gdic=gdic):
try:
if self.thisown == 1 :
gdic.delete_wxIcon(self)
except:
pass
class wxIcon(wxIconPtr): class wxIcon(wxIconPtr):
def __init__(self,*_args,**_kwargs): def __init__(self,*_args,**_kwargs):
self.this = apply(gdic.new_wxIcon,_args,_kwargs) self.this = apply(gdic.new_wxIcon,_args,_kwargs)
@@ -174,9 +163,9 @@ class wxIconBundlePtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxIconBundle):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxIconBundle(self) delfunc(self)
def AddIcon(self, *_args, **_kwargs): def AddIcon(self, *_args, **_kwargs):
val = apply(gdic.wxIconBundle_AddIcon,(self,) + _args, _kwargs) val = apply(gdic.wxIconBundle_AddIcon,(self,) + _args, _kwargs)
return val return val
@@ -211,9 +200,9 @@ class wxCursorPtr(wxGDIObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxCursor):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxCursor(self) delfunc(self)
def Ok(self, *_args, **_kwargs): def Ok(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs) val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs)
return val return val
@@ -230,9 +219,9 @@ class wxColourPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxColour):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxColour(self) delfunc(self)
def Red(self, *_args, **_kwargs): def Red(self, *_args, **_kwargs):
val = apply(gdic.wxColour_Red,(self,) + _args, _kwargs) val = apply(gdic.wxColour_Red,(self,) + _args, _kwargs)
return val return val
@@ -302,9 +291,9 @@ class wxPenPtr(wxGDIObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxPen):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxPen(self) delfunc(self)
def GetCap(self, *_args, **_kwargs): def GetCap(self, *_args, **_kwargs):
val = apply(gdic.wxPen_GetCap,(self,) + _args, _kwargs) val = apply(gdic.wxPen_GetCap,(self,) + _args, _kwargs)
return val return val
@@ -359,9 +348,9 @@ class wxPyPenPtr(wxPenPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxPyPen):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxPyPen(self) delfunc(self)
def SetDashes(self, *_args, **_kwargs): def SetDashes(self, *_args, **_kwargs):
val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs) val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs)
return val return val
@@ -405,9 +394,9 @@ class wxBrushPtr(wxGDIObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxBrush):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxBrush(self) delfunc(self)
def GetColour(self, *_args, **_kwargs): def GetColour(self, *_args, **_kwargs):
val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs) val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val) ; val.thisown = 1 if val: val = wxColourPtr(val) ; val.thisown = 1
@@ -471,9 +460,9 @@ class wxDCPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxDC):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxDC(self) delfunc(self)
def BeginDrawing(self, *_args, **_kwargs): def BeginDrawing(self, *_args, **_kwargs):
val = apply(gdic.wxDC_BeginDrawing,(self,) + _args, _kwargs) val = apply(gdic.wxDC_BeginDrawing,(self,) + _args, _kwargs)
return val return val
@@ -916,9 +905,9 @@ class wxPalettePtr(wxGDIObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxPalette):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxPalette(self) delfunc(self)
def GetPixel(self, *_args, **_kwargs): def GetPixel(self, *_args, **_kwargs):
val = apply(gdic.wxPalette_GetPixel,(self,) + _args, _kwargs) val = apply(gdic.wxPalette_GetPixel,(self,) + _args, _kwargs)
return val return val
@@ -942,9 +931,9 @@ class wxImageListPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxImageList):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxImageList(self) delfunc(self)
def Add(self, *_args, **_kwargs): def Add(self, *_args, **_kwargs):
val = apply(gdic.wxImageList_Add,(self,) + _args, _kwargs) val = apply(gdic.wxImageList_Add,(self,) + _args, _kwargs)
return val return val
@@ -986,9 +975,9 @@ class wxRegionPtr(wxGDIObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxRegion):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxRegion(self) delfunc(self)
def Clear(self, *_args, **_kwargs): def Clear(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs) val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
return val return val
@@ -1069,9 +1058,9 @@ class wxRegionIteratorPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gdic=gdic): def __del__(self, delfunc=gdic.delete_wxRegionIterator):
if self.thisown == 1 : if self.thisown == 1:
gdic.delete_wxRegionIterator(self) delfunc(self)
def GetX(self, *_args, **_kwargs): def GetX(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetX,(self,) + _args, _kwargs) val = apply(gdic.wxRegionIterator_GetX,(self,) + _args, _kwargs)
return val return val

12
wxPython/src/gtk/grid.py
View File

@@ -871,9 +871,9 @@ class wxGridTableMessagePtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gridc=gridc): def __del__(self, delfunc=gridc.delete_wxGridTableMessage):
if self.thisown == 1 : if self.thisown == 1:
gridc.delete_wxGridTableMessage(self) delfunc(self)
def SetTableObject(self, *_args, **_kwargs): def SetTableObject(self, *_args, **_kwargs):
val = apply(gridc.wxGridTableMessage_SetTableObject,(self,) + _args, _kwargs) val = apply(gridc.wxGridTableMessage_SetTableObject,(self,) + _args, _kwargs)
return val return val
@@ -912,9 +912,9 @@ class wxGridCellCoordsPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,gridc=gridc): def __del__(self, delfunc=gridc.delete_wxGridCellCoords):
if self.thisown == 1 : if self.thisown == 1:
gridc.delete_wxGridCellCoords(self) delfunc(self)
def GetRow(self, *_args, **_kwargs): def GetRow(self, *_args, **_kwargs):
val = apply(gridc.wxGridCellCoords_GetRow,(self,) + _args, _kwargs) val = apply(gridc.wxGridCellCoords_GetRow,(self,) + _args, _kwargs)
return val return val

7
wxPython/src/gtk/help.py
View File

@@ -65,9 +65,9 @@ class wxContextHelpPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,helpc=helpc): def __del__(self, delfunc=helpc.delete_wxContextHelp):
if self.thisown == 1 : if self.thisown == 1:
helpc.delete_wxContextHelp(self) delfunc(self)
def BeginContextHelp(self, *_args, **_kwargs): def BeginContextHelp(self, *_args, **_kwargs):
val = apply(helpc.wxContextHelp_BeginContextHelp,(self,) + _args, _kwargs) val = apply(helpc.wxContextHelp_BeginContextHelp,(self,) + _args, _kwargs)
return val return val
@@ -171,3 +171,4 @@ wxEVT_DETAILED_HELP = helpc.wxEVT_DETAILED_HELP
# Stuff these names into the wx namespace so wxPyConstructObject can find them # Stuff these names into the wx namespace so wxPyConstructObject can find them
import wx import wx
wx.wxHelpEventPtr = wxHelpEventPtr wx.wxHelpEventPtr = wxHelpEventPtr
wx.wxContextHelpButtonPtr = wxContextHelpButtonPtr

12
wxPython/src/gtk/html.py
View File

@@ -649,9 +649,9 @@ class wxHtmlDCRendererPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,htmlc=htmlc): def __del__(self,delfunc=htmlc.delete_wxHtmlDCRenderer):
if self.thisown == 1 : if self.thisown == 1:
htmlc.delete_wxHtmlDCRenderer(self) delfunc(self)
def SetDC(self, *_args, **_kwargs): def SetDC(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlDCRenderer_SetDC,(self,) + _args, _kwargs) val = apply(htmlc.wxHtmlDCRenderer_SetDC,(self,) + _args, _kwargs)
return val return val
@@ -710,9 +710,9 @@ class wxHtmlEasyPrintingPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,htmlc=htmlc): def __del__(self,delfunc=htmlc.delete_wxHtmlEasyPrinting):
if self.thisown == 1 : if self.thisown == 1:
htmlc.delete_wxHtmlEasyPrinting(self) delfunc(self)
def PreviewFile(self, *_args, **_kwargs): def PreviewFile(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlEasyPrinting_PreviewFile,(self,) + _args, _kwargs) val = apply(htmlc.wxHtmlEasyPrinting_PreviewFile,(self,) + _args, _kwargs)
return val return val

12
wxPython/src/gtk/htmlhelp.py
View File

@@ -154,9 +154,9 @@ class wxHtmlHelpDataPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,htmlhelpc=htmlhelpc): def __del__(self,delfunc=htmlhelpc.delete_wxHtmlHelpData):
if self.thisown == 1 : if self.thisown == 1:
htmlhelpc.delete_wxHtmlHelpData(self) delfunc(self)
def SetTempDir(self, *_args, **_kwargs): def SetTempDir(self, *_args, **_kwargs):
val = apply(htmlhelpc.wxHtmlHelpData_SetTempDir,(self,) + _args, _kwargs) val = apply(htmlhelpc.wxHtmlHelpData_SetTempDir,(self,) + _args, _kwargs)
return val return val
@@ -246,9 +246,9 @@ class wxHtmlHelpControllerPtr(wxEvtHandlerPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,htmlhelpc=htmlhelpc): def __del__(self,delfunc=htmlhelpc.delete_wxHtmlHelpController):
if self.thisown == 1 : if self.thisown == 1:
htmlhelpc.delete_wxHtmlHelpController(self) delfunc(self)
def SetTitleFormat(self, *_args, **_kwargs): def SetTitleFormat(self, *_args, **_kwargs):
val = apply(htmlhelpc.wxHtmlHelpController_SetTitleFormat,(self,) + _args, _kwargs) val = apply(htmlhelpc.wxHtmlHelpController_SetTitleFormat,(self,) + _args, _kwargs)
return val return val

6
wxPython/src/gtk/image.py
View File

@@ -192,9 +192,9 @@ class wxImagePtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,imagec=imagec): def __del__(self,delfunc=imagec.delete_wxImage):
if self.thisown == 1 : if self.thisown == 1:
imagec.delete_wxImage(self) delfunc(self)
def Create(self, *_args, **_kwargs): def Create(self, *_args, **_kwargs):
val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs) val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs)
return val return val

42
wxPython/src/gtk/misc.py
View File

@@ -23,9 +23,9 @@ class wxSizePtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,miscc=miscc): def __del__(self,delfunc=miscc.delete_wxSize):
if self.thisown == 1 : if self.thisown == 1:
miscc.delete_wxSize(self) delfunc(self)
def Set(self, *_args, **_kwargs): def Set(self, *_args, **_kwargs):
val = apply(miscc.wxSize_Set,(self,) + _args, _kwargs) val = apply(miscc.wxSize_Set,(self,) + _args, _kwargs)
return val return val
@@ -108,9 +108,9 @@ class wxRealPointPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,miscc=miscc): def __del__(self,delfunc=miscc.delete_wxRealPoint):
if self.thisown == 1 : if self.thisown == 1:
miscc.delete_wxRealPoint(self) delfunc(self)
def Set(self, *_args, **_kwargs): def Set(self, *_args, **_kwargs):
val = apply(miscc.wxRealPoint_Set,(self,) + _args, _kwargs) val = apply(miscc.wxRealPoint_Set,(self,) + _args, _kwargs)
return val return val
@@ -173,9 +173,9 @@ class wxPointPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,miscc=miscc): def __del__(self,delfunc=miscc.delete_wxPoint):
if self.thisown == 1 : if self.thisown == 1:
miscc.delete_wxPoint(self) delfunc(self)
def Set(self, *_args, **_kwargs): def Set(self, *_args, **_kwargs):
val = apply(miscc.wxPoint_Set,(self,) + _args, _kwargs) val = apply(miscc.wxPoint_Set,(self,) + _args, _kwargs)
return val return val
@@ -238,9 +238,9 @@ class wxRectPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,miscc=miscc): def __del__(self,delfunc=miscc.delete_wxRect):
if self.thisown == 1 : if self.thisown == 1:
miscc.delete_wxRect(self) delfunc(self)
def GetX(self, *_args, **_kwargs): def GetX(self, *_args, **_kwargs):
val = apply(miscc.wxRect_GetX,(self,) + _args, _kwargs) val = apply(miscc.wxRect_GetX,(self,) + _args, _kwargs)
return val return val
@@ -663,9 +663,9 @@ class wxAcceleratorEntryPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,miscc=miscc): def __del__(self,delfunc=miscc.delete_wxAcceleratorEntry):
if self.thisown == 1 : if self.thisown == 1:
miscc.delete_wxAcceleratorEntry(self) delfunc(self)
def Set(self, *_args, **_kwargs): def Set(self, *_args, **_kwargs):
val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs) val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs)
return val return val
@@ -692,9 +692,9 @@ class wxAcceleratorTablePtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,miscc=miscc): def __del__(self,delfunc=miscc.delete_wxAcceleratorTable):
if self.thisown == 1 : if self.thisown == 1:
miscc.delete_wxAcceleratorTable(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxAcceleratorTable instance at %s>" % (self.this,) return "<C wxAcceleratorTable instance at %s>" % (self.this,)
class wxAcceleratorTable(wxAcceleratorTablePtr): class wxAcceleratorTable(wxAcceleratorTablePtr):
@@ -709,9 +709,9 @@ class wxBusyInfoPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,miscc=miscc): def __del__(self,delfunc=miscc.delete_wxBusyInfo):
if self.thisown == 1 : if self.thisown == 1:
miscc.delete_wxBusyInfo(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxBusyInfo instance at %s>" % (self.this,) return "<C wxBusyInfo instance at %s>" % (self.this,)
class wxBusyInfo(wxBusyInfoPtr): class wxBusyInfo(wxBusyInfoPtr):

18
wxPython/src/gtk/misc2.cpp
View File

@@ -3821,8 +3821,8 @@ static PyObject *_wrap_wxDragImage_BeginDrag(PyObject *self, PyObject *args, PyO
return _resultobj; return _resultobj;
} }
#define wxDragImage_BeginDrag2(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->BeginDrag(_swigarg0,_swigarg1,_swigarg2)) #define wxDragImage_BeginDragBounded(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->BeginDrag(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxDragImage_BeginDrag2(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxDragImage_BeginDragBounded(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
bool _result; bool _result;
wxGenericDragImage * _arg0; wxGenericDragImage * _arg0;
@@ -3834,15 +3834,15 @@ static PyObject *_wrap_wxDragImage_BeginDrag2(PyObject *self, PyObject *args, Py
PyObject * _obj1 = 0; PyObject * _obj1 = 0;
PyObject * _argo2 = 0; PyObject * _argo2 = 0;
PyObject * _argo3 = 0; PyObject * _argo3 = 0;
char *_kwnames[] = { "self","hotspot","window","fullScreenRect", NULL }; char *_kwnames[] = { "self","hotspot","window","boundingWindow", NULL };
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxDragImage_BeginDrag2",_kwnames,&_argo0,&_obj1,&_argo2,&_argo3)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxDragImage_BeginDragBounded",_kwnames,&_argo0,&_obj1,&_argo2,&_argo3))
return NULL; return NULL;
if (_argo0) { if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; } if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGenericDragImage_p")) { else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGenericDragImage_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDragImage_BeginDrag2. Expected _wxGenericDragImage_p."); PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDragImage_BeginDragBounded. Expected _wxGenericDragImage_p.");
return NULL; return NULL;
} }
} }
@@ -3854,20 +3854,20 @@ static PyObject *_wrap_wxDragImage_BeginDrag2(PyObject *self, PyObject *args, Py
if (_argo2) { if (_argo2) {
if (_argo2 == Py_None) { _arg2 = NULL; } if (_argo2 == Py_None) { _arg2 = NULL; }
else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) { else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxDragImage_BeginDrag2. Expected _wxWindow_p."); PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxDragImage_BeginDragBounded. Expected _wxWindow_p.");
return NULL; return NULL;
} }
} }
if (_argo3) { if (_argo3) {
if (_argo3 == Py_None) { _arg3 = NULL; } if (_argo3 == Py_None) { _arg3 = NULL; }
else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) { else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxDragImage_BeginDrag2. Expected _wxWindow_p."); PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxDragImage_BeginDragBounded. Expected _wxWindow_p.");
return NULL; return NULL;
} }
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxDragImage_BeginDrag2(_arg0,*_arg1,_arg2,_arg3); _result = (bool )wxDragImage_BeginDragBounded(_arg0,*_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
@@ -11270,7 +11270,7 @@ static PyMethodDef misc2cMethods[] = {
{ "wxDragImage_Show", (PyCFunction) _wrap_wxDragImage_Show, METH_VARARGS | METH_KEYWORDS }, { "wxDragImage_Show", (PyCFunction) _wrap_wxDragImage_Show, METH_VARARGS | METH_KEYWORDS },
{ "wxDragImage_Move", (PyCFunction) _wrap_wxDragImage_Move, METH_VARARGS | METH_KEYWORDS }, { "wxDragImage_Move", (PyCFunction) _wrap_wxDragImage_Move, METH_VARARGS | METH_KEYWORDS },
{ "wxDragImage_EndDrag", (PyCFunction) _wrap_wxDragImage_EndDrag, METH_VARARGS | METH_KEYWORDS }, { "wxDragImage_EndDrag", (PyCFunction) _wrap_wxDragImage_EndDrag, METH_VARARGS | METH_KEYWORDS },
{ "wxDragImage_BeginDrag2", (PyCFunction) _wrap_wxDragImage_BeginDrag2, METH_VARARGS | METH_KEYWORDS }, { "wxDragImage_BeginDragBounded", (PyCFunction) _wrap_wxDragImage_BeginDragBounded, METH_VARARGS | METH_KEYWORDS },
{ "wxDragImage_BeginDrag", (PyCFunction) _wrap_wxDragImage_BeginDrag, METH_VARARGS | METH_KEYWORDS }, { "wxDragImage_BeginDrag", (PyCFunction) _wrap_wxDragImage_BeginDrag, METH_VARARGS | METH_KEYWORDS },
{ "wxDragImage_SetBackingBitmap", (PyCFunction) _wrap_wxDragImage_SetBackingBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxDragImage_SetBackingBitmap", (PyCFunction) _wrap_wxDragImage_SetBackingBitmap, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxDragImage", (PyCFunction) _wrap_delete_wxDragImage, METH_VARARGS | METH_KEYWORDS }, { "delete_wxDragImage", (PyCFunction) _wrap_delete_wxDragImage, METH_VARARGS | METH_KEYWORDS },

95
wxPython/src/gtk/misc2.py
View File

@@ -98,9 +98,9 @@ class wxCaretPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxCaret):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxCaret(self) delfunc(self)
def IsOk(self, *_args, **_kwargs): def IsOk(self, *_args, **_kwargs):
val = apply(misc2c.wxCaret_IsOk,(self,) + _args, _kwargs) val = apply(misc2c.wxCaret_IsOk,(self,) + _args, _kwargs)
return val return val
@@ -156,9 +156,9 @@ class wxBusyCursorPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxBusyCursor):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxBusyCursor(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxBusyCursor instance at %s>" % (self.this,) return "<C wxBusyCursor instance at %s>" % (self.this,)
class wxBusyCursor(wxBusyCursorPtr): class wxBusyCursor(wxBusyCursorPtr):
@@ -173,9 +173,9 @@ class wxWindowDisablerPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxWindowDisabler):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxWindowDisabler(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxWindowDisabler instance at %s>" % (self.this,) return "<C wxWindowDisabler instance at %s>" % (self.this,)
class wxWindowDisabler(wxWindowDisablerPtr): class wxWindowDisabler(wxWindowDisablerPtr):
@@ -190,9 +190,9 @@ class wxMutexGuiLockerPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxMutexGuiLocker):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxMutexGuiLocker(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxMutexGuiLocker instance at %s>" % (self.this,) return "<C wxMutexGuiLocker instance at %s>" % (self.this,)
class wxMutexGuiLocker(wxMutexGuiLockerPtr): class wxMutexGuiLocker(wxMutexGuiLockerPtr):
@@ -207,9 +207,9 @@ class wxTipProviderPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxTipProvider):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxTipProvider(self) delfunc(self)
def GetTip(self, *_args, **_kwargs): def GetTip(self, *_args, **_kwargs):
val = apply(misc2c.wxTipProvider_GetTip,(self,) + _args, _kwargs) val = apply(misc2c.wxTipProvider_GetTip,(self,) + _args, _kwargs)
return val return val
@@ -250,17 +250,17 @@ class wxDragImagePtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxDragImage):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxDragImage(self) delfunc(self)
def SetBackingBitmap(self, *_args, **_kwargs): def SetBackingBitmap(self, *_args, **_kwargs):
val = apply(misc2c.wxDragImage_SetBackingBitmap,(self,) + _args, _kwargs) val = apply(misc2c.wxDragImage_SetBackingBitmap,(self,) + _args, _kwargs)
return val return val
def BeginDrag(self, *_args, **_kwargs): def BeginDrag(self, *_args, **_kwargs):
val = apply(misc2c.wxDragImage_BeginDrag,(self,) + _args, _kwargs) val = apply(misc2c.wxDragImage_BeginDrag,(self,) + _args, _kwargs)
return val return val
def BeginDrag2(self, *_args, **_kwargs): def BeginDragBounded(self, *_args, **_kwargs):
val = apply(misc2c.wxDragImage_BeginDrag2,(self,) + _args, _kwargs) val = apply(misc2c.wxDragImage_BeginDragBounded,(self,) + _args, _kwargs)
return val return val
def EndDrag(self, *_args, **_kwargs): def EndDrag(self, *_args, **_kwargs):
val = apply(misc2c.wxDragImage_EndDrag,(self,) + _args, _kwargs) val = apply(misc2c.wxDragImage_EndDrag,(self,) + _args, _kwargs)
@@ -283,6 +283,7 @@ class wxDragImagePtr(wxObjectPtr):
return val return val
def __repr__(self): def __repr__(self):
return "<C wxDragImage instance at %s>" % (self.this,) return "<C wxDragImage instance at %s>" % (self.this,)
BeginDrag2 = BeginDragBounded
class wxDragImage(wxDragImagePtr): class wxDragImage(wxDragImagePtr):
def __init__(self,*_args,**_kwargs): def __init__(self,*_args,**_kwargs):
self.this = apply(misc2c.new_wxDragImage,_args,_kwargs) self.this = apply(misc2c.new_wxDragImage,_args,_kwargs)
@@ -315,9 +316,9 @@ class wxPyTimerPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxPyTimer):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxPyTimer(self) delfunc(self)
def GetInterval(self, *_args, **_kwargs): def GetInterval(self, *_args, **_kwargs):
val = apply(misc2c.wxPyTimer_GetInterval,(self,) + _args, _kwargs) val = apply(misc2c.wxPyTimer_GetInterval,(self,) + _args, _kwargs)
return val return val
@@ -350,9 +351,9 @@ class wxStopWatchPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxStopWatch):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxStopWatch(self) delfunc(self)
def Start(self, *_args, **_kwargs): def Start(self, *_args, **_kwargs):
val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs) val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
return val return val
@@ -504,9 +505,9 @@ class wxLogNullPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxLogNull):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxLogNull(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxLogNull instance at %s>" % (self.this,) return "<C wxLogNull instance at %s>" % (self.this,)
class wxLogNull(wxLogNullPtr): class wxLogNull(wxLogNullPtr):
@@ -631,9 +632,9 @@ class wxJoystickPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxJoystick):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxJoystick(self) delfunc(self)
def GetPosition(self, *_args, **_kwargs): def GetPosition(self, *_args, **_kwargs):
val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs) val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1 if val: val = wxPointPtr(val) ; val.thisown = 1
@@ -775,9 +776,9 @@ class wxWavePtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxWave):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxWave(self) delfunc(self)
def IsOk(self, *_args, **_kwargs): def IsOk(self, *_args, **_kwargs):
val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs) val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs)
return val return val
@@ -895,9 +896,9 @@ class wxFileTypePtr :
def Unassociate(self, *_args, **_kwargs): def Unassociate(self, *_args, **_kwargs):
val = apply(misc2c.wxFileType_Unassociate,(self,) + _args, _kwargs) val = apply(misc2c.wxFileType_Unassociate,(self,) + _args, _kwargs)
return val return val
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxFileType):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxFileType(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxFileType instance at %s>" % (self.this,) return "<C wxFileType instance at %s>" % (self.this,)
class wxFileType(wxFileTypePtr): class wxFileType(wxFileTypePtr):
@@ -945,9 +946,9 @@ class wxMimeTypesManagerPtr :
def Unassociate(self, *_args, **_kwargs): def Unassociate(self, *_args, **_kwargs):
val = apply(misc2c.wxMimeTypesManager_Unassociate,(self,) + _args, _kwargs) val = apply(misc2c.wxMimeTypesManager_Unassociate,(self,) + _args, _kwargs)
return val return val
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxMimeTypesManager):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxMimeTypesManager(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxMimeTypesManager instance at %s>" % (self.this,) return "<C wxMimeTypesManager instance at %s>" % (self.this,)
class wxMimeTypesManager(wxMimeTypesManagerPtr): class wxMimeTypesManager(wxMimeTypesManagerPtr):
@@ -980,9 +981,9 @@ class wxFileHistoryPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxFileHistory):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxFileHistory(self) delfunc(self)
def AddFileToHistory(self, *_args, **_kwargs): def AddFileToHistory(self, *_args, **_kwargs):
val = apply(misc2c.wxFileHistory_AddFileToHistory,(self,) + _args, _kwargs) val = apply(misc2c.wxFileHistory_AddFileToHistory,(self,) + _args, _kwargs)
return val return val
@@ -1091,9 +1092,9 @@ class wxSingleInstanceCheckerPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,misc2c=misc2c): def __del__(self, delfunc=misc2c.delete_wxSingleInstanceChecker):
if self.thisown == 1 : if self.thisown == 1:
misc2c.delete_wxSingleInstanceChecker(self) delfunc(self)
def Create(self, *_args, **_kwargs): def Create(self, *_args, **_kwargs):
val = apply(misc2c.wxSingleInstanceChecker_Create,(self,) + _args, _kwargs) val = apply(misc2c.wxSingleInstanceChecker_Create,(self,) + _args, _kwargs)
return val return val

24
wxPython/src/gtk/printfw.py
View File

@@ -25,9 +25,9 @@ class wxPrintDataPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,printfwc=printfwc): def __del__(self,delfunc=printfwc.delete_wxPrintData):
if self.thisown == 1 : if self.thisown == 1:
printfwc.delete_wxPrintData(self) delfunc(self)
def GetNoCopies(self, *_args, **_kwargs): def GetNoCopies(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintData_GetNoCopies,(self,) + _args, _kwargs) val = apply(printfwc.wxPrintData_GetNoCopies,(self,) + _args, _kwargs)
return val return val
@@ -187,9 +187,9 @@ class wxPageSetupDialogDataPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,printfwc=printfwc): def __del__(self,delfunc=printfwc.delete_wxPageSetupDialogData):
if self.thisown == 1 : if self.thisown == 1:
printfwc.delete_wxPageSetupDialogData(self) delfunc(self)
def EnableHelp(self, *_args, **_kwargs): def EnableHelp(self, *_args, **_kwargs):
val = apply(printfwc.wxPageSetupDialogData_EnableHelp,(self,) + _args, _kwargs) val = apply(printfwc.wxPageSetupDialogData_EnableHelp,(self,) + _args, _kwargs)
return val return val
@@ -319,9 +319,9 @@ class wxPrintDialogDataPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,printfwc=printfwc): def __del__(self,delfunc=printfwc.delete_wxPrintDialogData):
if self.thisown == 1 : if self.thisown == 1:
printfwc.delete_wxPrintDialogData(self) delfunc(self)
def EnableHelp(self, *_args, **_kwargs): def EnableHelp(self, *_args, **_kwargs):
val = apply(printfwc.wxPrintDialogData_EnableHelp,(self,) + _args, _kwargs) val = apply(printfwc.wxPrintDialogData_EnableHelp,(self,) + _args, _kwargs)
return val return val
@@ -491,9 +491,9 @@ class wxPrinterPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,printfwc=printfwc): def __del__(self,delfunc=printfwc.delete_wxPrinter):
if self.thisown == 1 : if self.thisown == 1:
printfwc.delete_wxPrinter(self) delfunc(self)
def CreateAbortWindow(self, *_args, **_kwargs): def CreateAbortWindow(self, *_args, **_kwargs):
val = apply(printfwc.wxPrinter_CreateAbortWindow,(self,) + _args, _kwargs) val = apply(printfwc.wxPrinter_CreateAbortWindow,(self,) + _args, _kwargs)
return val return val

36
wxPython/src/gtk/utils.py
View File

@@ -10,9 +10,9 @@ class wxConfigBasePtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,utilsc=utilsc): def __del__(self,delfunc=utilsc.delete_wxConfigBase):
if self.thisown == 1 : if self.thisown == 1:
utilsc.delete_wxConfigBase(self) delfunc(self)
def DeleteAll(self, *_args, **_kwargs): def DeleteAll(self, *_args, **_kwargs):
val = apply(utilsc.wxConfigBase_DeleteAll,(self,) + _args, _kwargs) val = apply(utilsc.wxConfigBase_DeleteAll,(self,) + _args, _kwargs)
return val return val
@@ -137,9 +137,9 @@ class wxConfigPtr(wxConfigBasePtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,utilsc=utilsc): def __del__(self,delfunc=utilsc.delete_wxConfig):
if self.thisown == 1 : if self.thisown == 1:
utilsc.delete_wxConfig(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxConfig instance at %s>" % (self.this,) return "<C wxConfig instance at %s>" % (self.this,)
class wxConfig(wxConfigPtr): class wxConfig(wxConfigPtr):
@@ -154,9 +154,9 @@ class wxFileConfigPtr(wxConfigBasePtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,utilsc=utilsc): def __del__(self,delfunc=utilsc.delete_wxFileConfig):
if self.thisown == 1 : if self.thisown == 1:
utilsc.delete_wxFileConfig(self) delfunc(self)
def __repr__(self): def __repr__(self):
return "<C wxFileConfig instance at %s>" % (self.this,) return "<C wxFileConfig instance at %s>" % (self.this,)
class wxFileConfig(wxFileConfigPtr): class wxFileConfig(wxFileConfigPtr):
@@ -262,9 +262,9 @@ class wxDateTimePtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,utilsc=utilsc): def __del__(self,delfunc=utilsc.delete_wxDateTime):
if self.thisown == 1 : if self.thisown == 1:
utilsc.delete_wxDateTime(self) delfunc(self)
def SetToCurrent(self, *_args, **_kwargs): def SetToCurrent(self, *_args, **_kwargs):
val = apply(utilsc.wxDateTime_SetToCurrent,(self,) + _args, _kwargs) val = apply(utilsc.wxDateTime_SetToCurrent,(self,) + _args, _kwargs)
if val: val = wxDateTimePtr(val) if val: val = wxDateTimePtr(val)
@@ -603,9 +603,9 @@ class wxTimeSpanPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,utilsc=utilsc): def __del__(self,delfunc=utilsc.delete_wxTimeSpan):
if self.thisown == 1 : if self.thisown == 1:
utilsc.delete_wxTimeSpan(self) delfunc(self)
def Add(self, *_args, **_kwargs): def Add(self, *_args, **_kwargs):
val = apply(utilsc.wxTimeSpan_Add,(self,) + _args, _kwargs) val = apply(utilsc.wxTimeSpan_Add,(self,) + _args, _kwargs)
if val: val = wxTimeSpanPtr(val) if val: val = wxTimeSpanPtr(val)
@@ -702,9 +702,9 @@ class wxDateSpanPtr :
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,utilsc=utilsc): def __del__(self,delfunc=utilsc.delete_wxDateSpan):
if self.thisown == 1 : if self.thisown == 1:
utilsc.delete_wxDateSpan(self) delfunc(self)
def SetYears(self, *_args, **_kwargs): def SetYears(self, *_args, **_kwargs):
val = apply(utilsc.wxDateSpan_SetYears,(self,) + _args, _kwargs) val = apply(utilsc.wxDateSpan_SetYears,(self,) + _args, _kwargs)
if val: val = wxDateSpanPtr(val) if val: val = wxDateSpanPtr(val)

6
wxPython/src/gtk/windows3.py
View File

@@ -246,9 +246,9 @@ class wxLayoutAlgorithmPtr(wxObjectPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,windows3c=windows3c): def __del__(self,delfunc=windows3c.delete_wxLayoutAlgorithm):
if self.thisown == 1 : if self.thisown == 1:
windows3c.delete_wxLayoutAlgorithm(self) delfunc(self)
def LayoutMDIFrame(self, *_args, **_kwargs): def LayoutMDIFrame(self, *_args, **_kwargs):
val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self,) + _args, _kwargs) val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self,) + _args, _kwargs)
return val return val

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

@@ -275,3 +275,7 @@ wxEVT_WIZARD_FINISHED = wizardc.wxEVT_WIZARD_FINISHED
# Stuff these names into the wx namespace so wxPyConstructObject can find them # Stuff these names into the wx namespace so wxPyConstructObject can find them
import wx import wx
wx.wxWizardEventPtr = wxWizardEventPtr wx.wxWizardEventPtr = wxWizardEventPtr
wx.wxWizardPagePtr = wxWizardPagePtr
wx.wxPyWizardPagePtr = wxPyWizardPagePtr
wx.wxWizardPageSimplePtr = wxWizardPageSimplePtr
wx.wxWizardPtr = wxWizardPtr

12
wxPython/src/gtk/wx.py
View File

@@ -46,9 +46,9 @@ class wxPyAppPtr(wxEvtHandlerPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this
self.thisown = 0 self.thisown = 0
def __del__(self,wxc=wxc): def __del__(self,delfunc=wxc.delete_wxPyApp):
if self.thisown == 1 : if self.thisown == 1:
wxc.delete_wxPyApp(self) delfunc(self)
def _setCallbackInfo(self, *_args, **_kwargs): def _setCallbackInfo(self, *_args, **_kwargs):
val = apply(wxc.wxPyApp__setCallbackInfo,(self,) + _args, _kwargs) val = apply(wxc.wxPyApp__setCallbackInfo,(self,) + _args, _kwargs)
return val return val
@@ -1071,6 +1071,12 @@ def EVT_WINDOW_CREATE(win, func):
def EVT_WINDOW_DESTROY(win, func): def EVT_WINDOW_DESTROY(win, func):
win.Connect(-1, -1, wxEVT_DESTROY, func) win.Connect(-1, -1, wxEVT_DESTROY, func)
def EVT_WINDOW_CREATE_ID(win, id, func):
win.Connect(id, -1, wxEVT_CREATE, func)
def EVT_WINDOW_DESTROY_ID(win, id, func):
win.Connect(id, -1, wxEVT_DESTROY, func)
def EVT_SET_CURSOR(win, func): def EVT_SET_CURSOR(win, func):
win.Connect(-1, -1, wxEVT_SET_CURSOR, func) win.Connect(-1, -1, wxEVT_SET_CURSOR, func)