solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

reSWIGged

Browse source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-01-15 05:26:19 +00:00
parent 90f7e9c7f7
commit d896a793a0
10 changed files with 177 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

10
wxPython/contrib/ogl/mac/ogl_wrap.cpp
View file

@ -1256,7 +1256,7 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO
static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
wxColour *result;
wxColour result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
@ -1266,12 +1266,16 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxColour *)(arg1)->GetActualColourObject();
result = (arg1)->GetActualColourObject();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 0);
{
wxColour * resultptr;
resultptr = new wxColour((wxColour &) result);
resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
}
return resultobj;
fail:
return NULL;

30
wxPython/src/mac/controls.py
View file

@ -1532,8 +1532,36 @@ def PreSpinCtrl(*args, **kwargs):
val.thisown = 1
return val
class SpinEvent(core.NotifyEvent):
def __repr__(self):
return "<%s.%s; proxy of C++ wxSpinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -> SpinEvent"""
newobj = _controls.new_SpinEvent(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def GetPosition(*args, **kwargs):
"""GetPosition() -> int"""
return _controls.SpinEvent_GetPosition(*args, **kwargs)
def SetPosition(*args, **kwargs):
"""SetPosition(int pos)"""
return _controls.SpinEvent_SetPosition(*args, **kwargs)
class SpinEventPtr(SpinEvent):
def __init__(self, this):
self.this = this
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = SpinEvent
_controls.SpinEvent_swigregister(SpinEventPtr)
wxEVT_COMMAND_SPINCTRL_UPDATED = _controls.wxEVT_COMMAND_SPINCTRL_UPDATED
EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
EVT_SPIN_UP = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEUP, 1)
EVT_SPIN_DOWN = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEDOWN, 1)
EVT_SPIN = wx.PyEventBinder( wx.wxEVT_SCROLL_THUMBTRACK, 1)
EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
#---------------------------------------------------------------------------

162
wxPython/src/mac/controls_wrap.cpp
View file

File diff suppressed because one or more lines are too long

5
wxPython/src/mac/core.py
View file

@ -2939,10 +2939,6 @@ EVT_COMMAND_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1)
EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1)
EVT_COMMAND_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL, 1)
EVT_SPIN_UP = wx.PyEventBinder( wxEVT_SCROLL_LINEUP, 1)
EVT_SPIN_DOWN = wx.PyEventBinder( wxEVT_SCROLL_LINEDOWN, 1)
EVT_SPIN = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1)
EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1)
EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1)
EVT_CHOICE = wx.PyEventBinder( wxEVT_COMMAND_CHOICE_SELECTED, 1)
@ -4952,6 +4948,7 @@ class PyOnDemandOutputWindow:
style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE)
self.text = wx.TextCtrl(self.frame, -1, "",
style = wx.TE_MULTILINE | wx.TE_READONLY)
self.text.AppendText(st)
self.frame.SetSize((450, 300))
self.frame.Show(True)
EVT_CLOSE(self.frame, self.OnCloseWindow)

2
wxPython/src/mac/gdi.py
View file

@ -583,7 +583,7 @@ class Icon(GDIObject):
def __repr__(self):
return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(String name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
"""__init__(String name, int type, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
newobj = _gdi.new_Icon(*args, **kwargs)
self.this = newobj.this
self.thisown = 1

8
wxPython/src/mac/gdi_wrap.cpp
View file

@ -2863,17 +2863,17 @@ static PyObject * Mask_swigregister(PyObject *self, PyObject *args) {
static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxString *arg1 = 0 ;
long arg2 ;
int arg2 ;
int arg3 = (int) -1 ;
int arg4 = (int) -1 ;
wxIcon *result;
bool temp1 = False ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL
(char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
@ -2881,7 +2881,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4);
result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;

2
wxPython/src/mac/misc.py
View file

@ -4366,7 +4366,7 @@ class DropSource(object):
return "<%s.%s; proxy of C++ wxPyDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""
__init__(Window win=None, Cursor copy=wxNullCursor, Cursor move=wxNullCursor,
__init__(Window win, Cursor copy=wxNullCursor, Cursor move=wxNullCursor,
Cursor none=wxNullCursor) -> DropSource
"""
newobj = _misc.new_DropSource(*args, **kwargs)

10
wxPython/src/mac/misc_wrap.cpp
View file

@ -1042,8 +1042,6 @@ PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){
#include <wx/metafile.h>
IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback);
@ -23297,7 +23295,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject *
static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) NULL ;
wxWindow *arg1 = (wxWindow *) 0 ;
wxCursor const &arg2_defvalue = wxNullCursor ;
wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
wxCursor const &arg3_defvalue = wxNullCursor ;
@ -23313,10 +23311,8 @@ static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *
(char *) "win",(char *) "copy",(char *) "move",(char *) "none", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
if (obj0) {
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
}
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (obj1) {
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg2 == NULL) {

4
wxPython/src/mac/windows.py
View file

@ -422,10 +422,6 @@ class Dialog(TopLevelWindow):
"""CreateButtonSizer(long flags) -> Sizer"""
return _windows.Dialog_CreateButtonSizer(*args, **kwargs)
def SetModal(*args, **kwargs):
"""SetModal(bool flag)"""
return _windows.Dialog_SetModal(*args, **kwargs)
def IsModal(*args, **kwargs):
"""IsModal() -> bool"""
return _windows.Dialog_IsModal(*args, **kwargs)

29
wxPython/src/mac/windows_wrap.cpp
View file

@ -3655,34 +3655,6 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args,
}
static PyObject *_wrap_Dialog_SetModal(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxDialog *arg1 = (wxDialog *) 0 ;
bool arg2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "flag", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetModal",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
arg2 = PyInt_AsLong(obj1) ? true : false;
if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetModal(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxDialog *arg1 = (wxDialog *) 0 ;
@ -20752,7 +20724,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Dialog_GetReturnCode", (PyCFunction) _wrap_Dialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Dialog_SetModal", (PyCFunction) _wrap_Dialog_SetModal, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Dialog_IsModal", (PyCFunction) _wrap_Dialog_IsModal, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Dialog_ShowModal", (PyCFunction) _wrap_Dialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Dialog_EndModal", (PyCFunction) _wrap_Dialog_EndModal, METH_VARARGS | METH_KEYWORDS },