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

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-11 17:59:43 +00:00
parent c5d5c231b8
commit 1c0f361be2
4 changed files with 92 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5068,7 +5068,7 @@ class App(wx.PyApp):
``self.SetTopWindow(frame)``.
:see: `wx.PySimpleApp` for a simpler app class that can be used
directly.
directly.
"""
outputWindowClass = PyOnDemandOutputWindow
@@ -8658,6 +8658,10 @@ class Sizer(Object):
"""Remove(self, PyObject item) -> bool"""
return _core_.Sizer_Remove(*args, **kwargs)
def Detach(*args, **kwargs):
"""Detach(self, PyObject item) -> bool"""
return _core_.Sizer_Detach(*args, **kwargs)
def _SetItemMinSize(*args, **kwargs):
"""_SetItemMinSize(self, PyObject item, Size size)"""
return _core_.Sizer__SetItemMinSize(*args, **kwargs)
@@ -8728,11 +8732,11 @@ class Sizer(Object):
return _core_.Sizer_GetMinSize(*args, **kwargs)
def GetSizeTuple(self):
return self.GetSize().asTuple()
return self.GetSize().Get()
def GetPositionTuple(self):
return self.GetPosition().asTuple()
return self.GetPosition().Get()
def GetMinSizeTuple(self):
return self.GetMinSize().asTuple()
return self.GetMinSize().Get()
def RecalcSizes(*args, **kwargs):
"""RecalcSizes(self)"""

45
wxPython/src/gtk/_core_wrap.cpp
View File

@@ -1647,6 +1647,19 @@ bool wxSizer_Remove(wxSizer *self,PyObject *item){
else
return False;
}
bool wxSizer_Detach(wxSizer *self,PyObject *item){
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
wxPyEndBlockThreads(blocked);
if ( info.window )
return self->Detach(info.window);
else if ( info.sizer )
return self->Detach(info.sizer);
else if ( info.gotPos )
return self->Detach(info.pos);
else
return False;
}
void wxSizer__SetItemMinSize(wxSizer *self,PyObject *item,wxSize const &size){
bool blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, False, True);
@@ -34715,6 +34728,37 @@ static PyObject *_wrap_Sizer_Remove(PyObject *self, PyObject *args, PyObject *kw
}
static PyObject *_wrap_Sizer_Detach(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxSizer *arg1 = (wxSizer *) 0 ;
PyObject *arg2 = (PyObject *) 0 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_Detach",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxSizer,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = obj1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)wxSizer_Detach(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Sizer__SetItemMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxSizer *arg1 = (wxSizer *) 0 ;
@@ -41206,6 +41250,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Sizer_Insert", (PyCFunction) _wrap_Sizer_Insert, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Sizer_Prepend", (PyCFunction) _wrap_Sizer_Prepend, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Sizer_Remove", (PyCFunction) _wrap_Sizer_Remove, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Sizer__SetItemMinSize", (PyCFunction) _wrap_Sizer__SetItemMinSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Sizer_AddItem", (PyCFunction) _wrap_Sizer_AddItem, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Sizer_InsertItem", (PyCFunction) _wrap_Sizer_InsertItem, METH_VARARGS | METH_KEYWORDS },

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

@@ -950,7 +950,7 @@ class Timer(_core.EvtHandler):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self._setCallbackInfo(self, Timer, 0)
self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self)
def __del__(self, destroy=_misc_.delete_Timer):
"""__del__(self)"""
@@ -966,6 +966,10 @@ class Timer(_core.EvtHandler):
"""SetOwner(self, EvtHandler owner, int id=-1)"""
return _misc_.Timer_SetOwner(*args, **kwargs)
def GetOwner(*args, **kwargs):
"""GetOwner(self) -> EvtHandler"""
return _misc_.Timer_GetOwner(*args, **kwargs)
def Start(*args, **kwargs):
"""Start(self, int milliseconds=-1, bool oneShot=False) -> bool"""
return _misc_.Timer_Start(*args, **kwargs)

34
wxPython/src/gtk/_misc_wrap.cpp
View File

@@ -656,6 +656,8 @@ IMP_PYCALLBACK_STRING_STRING(wxPyTipProvider, wxTipProvider, PreprocessTip);
//IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);
void wxPyTimer::Notify() {
bool found;
bool blocked = wxPyBeginBlockThreads();
@@ -6457,6 +6459,34 @@ static PyObject *_wrap_Timer_SetOwner(PyObject *self, PyObject *args, PyObject *
}
static PyObject *_wrap_Timer_GetOwner(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyTimer *arg1 = (wxPyTimer *) 0 ;
wxEvtHandler *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Timer_GetOwner",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyTimer,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxEvtHandler *)(arg1)->GetOwner();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Timer_Start(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyTimer *arg1 = (wxPyTimer *) 0 ;
@@ -28081,6 +28111,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"delete_Timer", (PyCFunction) _wrap_delete_Timer, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Timer__setCallbackInfo", (PyCFunction) _wrap_Timer__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Timer_SetOwner", (PyCFunction) _wrap_Timer_SetOwner, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Timer_GetOwner", (PyCFunction) _wrap_Timer_GetOwner, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Timer_Start", (PyCFunction) _wrap_Timer_Start, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Timer_Stop", (PyCFunction) _wrap_Timer_Stop, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Timer_IsRunning", (PyCFunction) _wrap_Timer_IsRunning, METH_VARARGS | METH_KEYWORDS },
@@ -29537,6 +29568,9 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"TIMER_CONTINUOUS", SWIG_FromInt((int)wxTIMER_CONTINUOUS));
PyDict_SetItemString(d,"TIMER_ONE_SHOT", SWIG_FromInt((int)wxTIMER_ONE_SHOT));
PyDict_SetItemString(d, "wxEVT_TIMER", PyInt_FromLong(wxEVT_TIMER));
wxPyPtrTypeMap_Add("wxTimer", "wxPyTimer");
PyDict_SetItemString(d,"LOG_FatalError", SWIG_FromInt((int)wxLOG_FatalError));
PyDict_SetItemString(d,"LOG_Error", SWIG_FromInt((int)wxLOG_Error));
PyDict_SetItemString(d,"LOG_Warning", SWIG_FromInt((int)wxLOG_Warning));