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@30913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-12-09 00:21:25 +00:00
parent c9c2cf703c
commit 03e46024f9
8 changed files with 182 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wxPython/src/mac/_core.py
View File

@@ -2399,6 +2399,12 @@ def ImageFromData(*args, **kwargs):
val.thisown = 1
return val
def ImageFromDataWithAlpha(*args, **kwargs):
"""ImageFromDataWithAlpha(int width, int height, unsigned char data, unsigned char alpha) -> Image"""
val = _core_.new_ImageFromDataWithAlpha(*args, **kwargs)
val.thisown = 1
return val
def Image_CanRead(*args, **kwargs):
"""Image_CanRead(String name) -> bool"""
return _core_.Image_CanRead(*args, **kwargs)
@@ -10288,6 +10294,8 @@ class GridBagSizer(FlexGridSizer):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self._setOORInfo(self)
def Add(*args, **kwargs):
"""
Add(self, item, GBPosition pos, GBSpan span=DefaultSpan, int flag=0,

56
wxPython/src/mac/_core_wrap.cpp
View File

@@ -1256,6 +1256,23 @@ wxImage *new_wxImage(int width,int height,unsigned char *data){
memcpy(copy, data, width*height*3);
return new wxImage(width, height, copy, false);
}
wxImage *new_wxImage(int width,int height,unsigned char *data,unsigned char *alpha){
// Copy the source data so the wxImage can clean it up later
unsigned char* dcopy = (unsigned char*)malloc(width*height*3);
if (dcopy == NULL) {
PyErr_NoMemory();
return NULL;
}
memcpy(dcopy, data, width*height*3);
unsigned char* acopy = (unsigned char*)malloc(width*height);
if (acopy == NULL) {
PyErr_NoMemory();
return NULL;
}
memcpy(acopy, alpha, width*height);
return new wxImage(width, height, dcopy, acopy, false);
}
wxSize wxImage_GetSize(wxImage *self){
wxSize size(self->GetWidth(), self->GetHeight());
return size;
@@ -9278,6 +9295,44 @@ static PyObject *_wrap_new_ImageFromData(PyObject *, PyObject *args, PyObject *k
}
static PyObject *_wrap_new_ImageFromDataWithAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 ;
int arg2 ;
unsigned char *arg3 = (unsigned char *) 0 ;
unsigned char *arg4 = (unsigned char *) 0 ;
wxImage *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char *kwnames[] = {
(char *) "width",(char *) "height",(char *) "data",(char *) "alpha", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:new_ImageFromDataWithAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
arg1 = (int)SWIG_As_int(obj0);
if (PyErr_Occurred()) SWIG_fail;
arg2 = (int)SWIG_As_int(obj1);
if (PyErr_Occurred()) SWIG_fail;
if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_unsigned_char,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj3,(void **)(&arg4),SWIGTYPE_p_unsigned_char,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxImage *)new_wxImage(arg1,arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxImage, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Image_Create(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
@@ -41072,6 +41127,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_EmptyImage", (PyCFunction) _wrap_new_EmptyImage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"new_ImageFromBitmap", (PyCFunction) _wrap_new_ImageFromBitmap, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"new_ImageFromData", (PyCFunction) _wrap_new_ImageFromData, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"new_ImageFromDataWithAlpha", (PyCFunction) _wrap_new_ImageFromDataWithAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_Create", (PyCFunction) _wrap_Image_Create, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_Destroy", (PyCFunction) _wrap_Image_Destroy, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_Scale", (PyCFunction) _wrap_Image_Scale, METH_VARARGS | METH_KEYWORDS, NULL },

10
wxPython/src/mac/_misc.py
View File

@@ -1586,6 +1586,8 @@ KILL_BAD_SIGNAL = _misc_.KILL_BAD_SIGNAL
KILL_ACCESS_DENIED = _misc_.KILL_ACCESS_DENIED
KILL_NO_PROCESS = _misc_.KILL_NO_PROCESS
KILL_ERROR = _misc_.KILL_ERROR
KILL_NOCHILDREN = _misc_.KILL_NOCHILDREN
KILL_CHILDREN = _misc_.KILL_CHILDREN
SIGNONE = _misc_.SIGNONE
SIGHUP = _misc_.SIGHUP
SIGINT = _misc_.SIGINT
@@ -1607,7 +1609,7 @@ class Process(_core.EvtHandler):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def Kill(*args, **kwargs):
"""Kill(int pid, int sig=SIGTERM) -> int"""
"""Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int"""
return _misc_.Process_Kill(*args, **kwargs)
Kill = staticmethod(Kill)
@@ -1686,7 +1688,7 @@ class ProcessPtr(Process):
_misc_.Process_swigregister(ProcessPtr)
def Process_Kill(*args, **kwargs):
"""Process_Kill(int pid, int sig=SIGTERM) -> int"""
"""Process_Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int"""
return _misc_.Process_Kill(*args, **kwargs)
def Process_Exists(*args, **kwargs):
@@ -1735,6 +1737,10 @@ EXEC_MAKE_GROUP_LEADER = _misc_.EXEC_MAKE_GROUP_LEADER
def Execute(*args, **kwargs):
"""Execute(String command, int flags=EXEC_ASYNC, Process process=None) -> long"""
return _misc_.Execute(*args, **kwargs)
def Kill(*args, **kwargs):
"""Kill(long pid, int sig=SIGTERM, int rc, int flags=KILL_NOCHILDREN) -> int"""
return _misc_.Kill(*args, **kwargs)
#---------------------------------------------------------------------------
JOYSTICK1 = _misc_.JOYSTICK1

116
wxPython/src/mac/_misc_wrap.cpp
View File

@@ -235,11 +235,11 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con
#define SWIGTYPE_p_wxLogTextCtrl swig_types[24]
#define SWIGTYPE_p_wxTextCtrl swig_types[25]
#define SWIGTYPE_p_wxBusyCursor swig_types[26]
#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[27]
#define SWIGTYPE_p_wxPyTextDataObject swig_types[28]
#define SWIGTYPE_p_wxBitmapDataObject swig_types[29]
#define SWIGTYPE_p_wxTextDataObject swig_types[30]
#define SWIGTYPE_p_wxDataObject swig_types[31]
#define SWIGTYPE_p_wxPyTextDataObject swig_types[27]
#define SWIGTYPE_p_wxBitmapDataObject swig_types[28]
#define SWIGTYPE_p_wxTextDataObject swig_types[29]
#define SWIGTYPE_p_wxDataObject swig_types[30]
#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[31]
#define SWIGTYPE_p_wxFileDataObject swig_types[32]
#define SWIGTYPE_p_wxCustomDataObject swig_types[33]
#define SWIGTYPE_p_wxURLDataObject swig_types[34]
@@ -278,24 +278,25 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con
#define SWIGTYPE_p_wxOutputStream swig_types[67]
#define SWIGTYPE_p_wxDateTime swig_types[68]
#define SWIGTYPE_p_wxPyDropSource swig_types[69]
#define SWIGTYPE_p_wxWindow swig_types[70]
#define SWIGTYPE_p_wxString swig_types[71]
#define SWIGTYPE_p_wxPyProcess swig_types[72]
#define SWIGTYPE_p_wxBitmap swig_types[73]
#define SWIGTYPE_p_wxConfig swig_types[74]
#define SWIGTYPE_p_wxChar swig_types[75]
#define SWIGTYPE_p_wxBusyInfo swig_types[76]
#define SWIGTYPE_p_wxPyDropTarget swig_types[77]
#define SWIGTYPE_p_wxPyTextDropTarget swig_types[78]
#define SWIGTYPE_p_wxPyFileDropTarget swig_types[79]
#define SWIGTYPE_p_wxProcessEvent swig_types[80]
#define SWIGTYPE_p_wxPyLog swig_types[81]
#define SWIGTYPE_p_wxLogNull swig_types[82]
#define SWIGTYPE_p_wxColour swig_types[83]
#define SWIGTYPE_p_wxConfigPathChanger swig_types[84]
#define SWIGTYPE_p_wxPyTimer swig_types[85]
#define SWIGTYPE_p_wxDateSpan swig_types[86]
static swig_type_info *swig_types[88];
#define SWIGTYPE_p_wxKillError swig_types[70]
#define SWIGTYPE_p_wxWindow swig_types[71]
#define SWIGTYPE_p_wxString swig_types[72]
#define SWIGTYPE_p_wxPyProcess swig_types[73]
#define SWIGTYPE_p_wxBitmap swig_types[74]
#define SWIGTYPE_p_wxConfig swig_types[75]
#define SWIGTYPE_p_wxChar swig_types[76]
#define SWIGTYPE_p_wxBusyInfo swig_types[77]
#define SWIGTYPE_p_wxPyDropTarget swig_types[78]
#define SWIGTYPE_p_wxPyTextDropTarget swig_types[79]
#define SWIGTYPE_p_wxPyFileDropTarget swig_types[80]
#define SWIGTYPE_p_wxProcessEvent swig_types[81]
#define SWIGTYPE_p_wxPyLog swig_types[82]
#define SWIGTYPE_p_wxLogNull swig_types[83]
#define SWIGTYPE_p_wxColour swig_types[84]
#define SWIGTYPE_p_wxConfigPathChanger swig_types[85]
#define SWIGTYPE_p_wxPyTimer swig_types[86]
#define SWIGTYPE_p_wxDateSpan swig_types[87]
static swig_type_info *swig_types[89];
/* -------- TYPES TABLE (END) -------- */
@@ -9348,23 +9349,29 @@ static PyObject *_wrap_Process_Kill(PyObject *, PyObject *args, PyObject *kwargs
PyObject *resultobj;
int arg1 ;
int arg2 = (int) wxSIGTERM ;
int arg3 = (int) wxKILL_NOCHILDREN ;
int result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char *kwnames[] = {
(char *) "pid",(char *) "sig", NULL
(char *) "pid",(char *) "sig",(char *) "flags", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Process_Kill",kwnames,&obj0,&obj1)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Process_Kill",kwnames,&obj0,&obj1,&obj2)) goto fail;
arg1 = (int)SWIG_As_int(obj0);
if (PyErr_Occurred()) SWIG_fail;
if (obj1) {
arg2 = (int)SWIG_As_int(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
if (obj2) {
arg3 = (int)SWIG_As_int(obj2);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)wxPyProcess::Kill(arg1,(wxSignal )arg2);
result = (int)wxPyProcess::Kill(arg1,(wxSignal )arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@@ -10072,6 +10079,54 @@ static PyObject *_wrap_Execute(PyObject *, PyObject *args, PyObject *kwargs) {
}
static PyObject *_wrap_Kill(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
long arg1 ;
int arg2 = (int) wxSIGTERM ;
wxKillError *arg3 = (wxKillError *) 0 ;
int arg4 = (int) wxKILL_NOCHILDREN ;
int result;
wxKillError temp3 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char *kwnames[] = {
(char *) "pid",(char *) "sig",(char *) "flags", NULL
};
{
arg3 = &temp3;
}
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Kill",kwnames,&obj0,&obj1,&obj2)) goto fail;
arg1 = (long)SWIG_As_long(obj0);
if (PyErr_Occurred()) SWIG_fail;
if (obj1) {
arg2 = (int)SWIG_As_int(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
if (obj2) {
arg4 = (int)SWIG_As_int(obj2);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)wxKill(arg1,(wxSignal )arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_int((int)result);
{
PyObject* o;
o = PyInt_FromLong((long) (*arg3));
resultobj = t_output_helper(resultobj, o);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_Joystick(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 = (int) wxJOYSTICK1 ;
@@ -29383,6 +29438,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ProcessEvent_m_exitcode_get", (PyCFunction) _wrap_ProcessEvent_m_exitcode_get, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"ProcessEvent_swigregister", ProcessEvent_swigregister, METH_VARARGS, NULL },
{ (char *)"Execute", (PyCFunction) _wrap_Execute, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Kill", (PyCFunction) _wrap_Kill, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"new_Joystick", (PyCFunction) _wrap_new_Joystick, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"delete_Joystick", (PyCFunction) _wrap_delete_Joystick, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Joystick_GetPosition", (PyCFunction) _wrap_Joystick_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
@@ -30466,11 +30522,11 @@ static swig_type_info _swigt__p_wxLogStderr[] = {{"_p_wxLogStderr", 0, "wxLogStd
static swig_type_info _swigt__p_wxLogTextCtrl[] = {{"_p_wxLogTextCtrl", 0, "wxLogTextCtrl *", 0, 0, 0, 0},{"_p_wxLogTextCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0, 0, 0, 0},{"_p_wxTextCtrl", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxBusyCursor[] = {{"_p_wxBusyCursor", 0, "wxBusyCursor *", 0, 0, 0, 0},{"_p_wxBusyCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxPyTextDataObject[] = {{"_p_wxPyTextDataObject", 0, "wxPyTextDataObject *", 0, 0, 0, 0},{"_p_wxPyTextDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxBitmapDataObject[] = {{"_p_wxBitmapDataObject", 0, "wxBitmapDataObject *", 0, 0, 0, 0},{"_p_wxBitmapDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxBitmapDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxTextDataObject[] = {{"_p_wxTextDataObject", 0, "wxTextDataObject *", 0, 0, 0, 0},{"_p_wxTextDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxTextDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxDataObject[] = {{"_p_wxDataObject", 0, "wxDataObject *", 0, 0, 0, 0},{"_p_wxDataObjectSimple", _p_wxDataObjectSimpleTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyDataObjectSimple", _p_wxPyDataObjectSimpleTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxDataObjectComposite", _p_wxDataObjectCompositeTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxDataObject", 0, 0, 0, 0, 0, 0},{"_p_wxTextDataObject", _p_wxTextDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyTextDataObject", _p_wxPyTextDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxBitmapDataObject", _p_wxBitmapDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", _p_wxPyBitmapDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxFileDataObject", _p_wxFileDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxCustomDataObject", _p_wxCustomDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxMetafileDataObject", _p_wxMetafileDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{"_p_wxURLDataObject", _p_wxURLDataObjectTo_p_wxDataObject, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxPyBitmapDataObject[] = {{"_p_wxPyBitmapDataObject", 0, "wxPyBitmapDataObject *", 0, 0, 0, 0},{"_p_wxPyBitmapDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxFileDataObject[] = {{"_p_wxFileDataObject", 0, "wxFileDataObject *", 0, 0, 0, 0},{"_p_wxFileDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxCustomDataObject[] = {{"_p_wxCustomDataObject", 0, "wxCustomDataObject *", 0, 0, 0, 0},{"_p_wxCustomDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxURLDataObject[] = {{"_p_wxURLDataObject", 0, "wxURLDataObject *", 0, 0, 0, 0},{"_p_wxURLDataObject", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -30509,6 +30565,7 @@ static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0
static swig_type_info _swigt__p_wxOutputStream[] = {{"_p_wxOutputStream", 0, "wxOutputStream *", 0, 0, 0, 0},{"_p_wxOutputStream", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxDateTime[] = {{"_p_wxDateTime", 0, "wxDateTime *", 0, 0, 0, 0},{"_p_wxDateTime", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxPyDropSource[] = {{"_p_wxPyDropSource", 0, "wxPyDropSource *", 0, 0, 0, 0},{"_p_wxPyDropSource", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxKillError[] = {{"_p_wxKillError", 0, "enum wxKillError *|wxKillError *", 0, 0, 0, 0},{"_p_wxKillError", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxWindow", 0, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0, 0, 0, 0},{"_p_wxString", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxPyProcess[] = {{"_p_wxPyProcess", 0, "wxPyProcess *", 0, 0, 0, 0},{"_p_wxPyProcess", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
@@ -30555,11 +30612,11 @@ _swigt__p_wxLogStderr,
_swigt__p_wxLogTextCtrl,
_swigt__p_wxTextCtrl,
_swigt__p_wxBusyCursor,
_swigt__p_wxPyBitmapDataObject,
_swigt__p_wxPyTextDataObject,
_swigt__p_wxBitmapDataObject,
_swigt__p_wxTextDataObject,
_swigt__p_wxDataObject,
_swigt__p_wxPyBitmapDataObject,
_swigt__p_wxFileDataObject,
_swigt__p_wxCustomDataObject,
_swigt__p_wxURLDataObject,
@@ -30598,6 +30655,7 @@ _swigt__p_wxObject,
_swigt__p_wxOutputStream,
_swigt__p_wxDateTime,
_swigt__p_wxPyDropSource,
_swigt__p_wxKillError,
_swigt__p_wxWindow,
_swigt__p_wxString,
_swigt__p_wxPyProcess,
@@ -30785,6 +30843,8 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"KILL_ACCESS_DENIED", SWIG_From_int((int)wxKILL_ACCESS_DENIED));
PyDict_SetItemString(d,"KILL_NO_PROCESS", SWIG_From_int((int)wxKILL_NO_PROCESS));
PyDict_SetItemString(d,"KILL_ERROR", SWIG_From_int((int)wxKILL_ERROR));
PyDict_SetItemString(d,"KILL_NOCHILDREN", SWIG_From_int((int)wxKILL_NOCHILDREN));
PyDict_SetItemString(d,"KILL_CHILDREN", SWIG_From_int((int)wxKILL_CHILDREN));
PyDict_SetItemString(d,"SIGNONE", SWIG_From_int((int)wxSIGNONE));
PyDict_SetItemString(d,"SIGHUP", SWIG_From_int((int)wxSIGHUP));
PyDict_SetItemString(d,"SIGINT", SWIG_From_int((int)wxSIGINT));

5
wxPython/src/mac/_windows.py
View File

@@ -2581,6 +2581,7 @@ class SingleChoiceDialogPtr(SingleChoiceDialog):
self.__class__ = SingleChoiceDialog
_windows_.SingleChoiceDialog_swigregister(SingleChoiceDialogPtr)
TextEntryDialogStyle = _windows_.TextEntryDialogStyle
class TextEntryDialog(Dialog):
"""A dialog with text control, [ok] and [cancel] buttons"""
def __repr__(self):
@@ -2589,7 +2590,7 @@ class TextEntryDialog(Dialog):
"""
__init__(self, Window parent, String message, String caption=GetTextFromUserPromptStr,
String defaultValue=EmptyString,
long style=wxTextEntryDialogStyle, Point pos=DefaultPosition) -> TextEntryDialog
long style=TextEntryDialogStyle, Point pos=DefaultPosition) -> TextEntryDialog
Constructor. Use ShowModal method to show the dialog.
"""
@@ -2631,7 +2632,7 @@ class PasswordEntryDialog(TextEntryDialog):
"""
__init__(self, Window parent, String message, String caption=GetPasswordFromUserPromptStr,
String value=EmptyString,
long style=wxTextEntryDialogStyle, Point pos=DefaultPosition) -> PasswordEntryDialog
long style=TextEntryDialogStyle, Point pos=DefaultPosition) -> PasswordEntryDialog
"""
newobj = _windows_.new_PasswordEntryDialog(*args, **kwargs)
self.this = newobj.this

1
wxPython/src/mac/_windows_wrap.cpp
View File

@@ -27344,6 +27344,7 @@ SWIGEXPORT(void) SWIG_init(void) {
SWIG_addvarlink(SWIG_globals,(char*)"GetTextFromUserPromptStr",_wrap_GetTextFromUserPromptStr_get, _wrap_GetTextFromUserPromptStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"MessageBoxCaptionStr",_wrap_MessageBoxCaptionStr_get, _wrap_MessageBoxCaptionStr_set);
PyDict_SetItemString(d,"CHOICEDLG_STYLE", SWIG_From_int((int)wxCHOICEDLG_STYLE));
PyDict_SetItemString(d,"TextEntryDialogStyle", SWIG_From_int((int)wxTextEntryDialogStyle));
SWIG_addvarlink(SWIG_globals,(char*)"GetPasswordFromUserPromptStr",_wrap_GetPasswordFromUserPromptStr_get, _wrap_GetPasswordFromUserPromptStr_set);
PyDict_SetItemString(d,"FR_DOWN", SWIG_From_int((int)wxFR_DOWN));
PyDict_SetItemString(d,"FR_WHOLEWORD", SWIG_From_int((int)wxFR_WHOLEWORD));

18
wxPython/src/mac/media.py
View File

@@ -108,21 +108,21 @@ class MediaCtrl(_core.Control):
"""SetPlaybackRate(self, double dRate) -> bool"""
return _media.MediaCtrl_SetPlaybackRate(*args, **kwargs)
def SetPosition(*args, **kwargs):
"""SetPosition(self, wxLongLong where) -> bool"""
return _media.MediaCtrl_SetPosition(*args, **kwargs)
def SetMediaPosition(*args, **kwargs):
"""SetMediaPosition(self, wxLongLong where) -> bool"""
return _media.MediaCtrl_SetMediaPosition(*args, **kwargs)
def GetPosition(*args, **kwargs):
def GetMediaPosition(*args, **kwargs):
"""
GetPosition(self) -> wxLongLong
GetMediaPosition(self) -> wxLongLong
Get the window's position.
"""
return _media.MediaCtrl_GetPosition(*args, **kwargs)
return _media.MediaCtrl_GetMediaPosition(*args, **kwargs)
def GetDuration(*args, **kwargs):
"""GetDuration(self) -> wxLongLong"""
return _media.MediaCtrl_GetDuration(*args, **kwargs)
def GetMediaDuration(*args, **kwargs):
"""GetMediaDuration(self) -> wxLongLong"""
return _media.MediaCtrl_GetMediaDuration(*args, **kwargs)
class MediaCtrlPtr(MediaCtrl):

18
wxPython/src/mac/media_wrap.cpp
View File

@@ -1531,7 +1531,7 @@ static PyObject *_wrap_MediaCtrl_SetPlaybackRate(PyObject *, PyObject *args, PyO
}
static PyObject *_wrap_MediaCtrl_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_MediaCtrl_SetMediaPosition(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ;
wxLongLong arg2 ;
@@ -1542,7 +1542,7 @@ static PyObject *_wrap_MediaCtrl_SetPosition(PyObject *, PyObject *args, PyObjec
(char *) "self",(char *) "where", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MediaCtrl_SetPosition",kwnames,&obj0,&obj1)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MediaCtrl_SetMediaPosition",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMediaCtrl,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
@@ -1564,7 +1564,7 @@ static PyObject *_wrap_MediaCtrl_SetPosition(PyObject *, PyObject *args, PyObjec
}
static PyObject *_wrap_MediaCtrl_GetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_MediaCtrl_GetMediaPosition(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ;
wxLongLong result;
@@ -1573,7 +1573,7 @@ static PyObject *_wrap_MediaCtrl_GetPosition(PyObject *, PyObject *args, PyObjec
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MediaCtrl_GetPosition",kwnames,&obj0)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MediaCtrl_GetMediaPosition",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMediaCtrl,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
@@ -1592,7 +1592,7 @@ static PyObject *_wrap_MediaCtrl_GetPosition(PyObject *, PyObject *args, PyObjec
}
static PyObject *_wrap_MediaCtrl_GetDuration(PyObject *, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_MediaCtrl_GetMediaDuration(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ;
wxLongLong result;
@@ -1601,7 +1601,7 @@ static PyObject *_wrap_MediaCtrl_GetDuration(PyObject *, PyObject *args, PyObjec
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MediaCtrl_GetDuration",kwnames,&obj0)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MediaCtrl_GetMediaDuration",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxMediaCtrl,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
@@ -1645,9 +1645,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MediaCtrl_GetState", (PyCFunction) _wrap_MediaCtrl_GetState, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_GetPlaybackRate", (PyCFunction) _wrap_MediaCtrl_GetPlaybackRate, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_SetPlaybackRate", (PyCFunction) _wrap_MediaCtrl_SetPlaybackRate, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_SetPosition", (PyCFunction) _wrap_MediaCtrl_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_GetPosition", (PyCFunction) _wrap_MediaCtrl_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_GetDuration", (PyCFunction) _wrap_MediaCtrl_GetDuration, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_SetMediaPosition", (PyCFunction) _wrap_MediaCtrl_SetMediaPosition, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_GetMediaPosition", (PyCFunction) _wrap_MediaCtrl_GetMediaPosition, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_GetMediaDuration", (PyCFunction) _wrap_MediaCtrl_GetMediaDuration, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"MediaCtrl_swigregister", MediaCtrl_swigregister, METH_VARARGS, NULL },
{ NULL, NULL, 0, NULL }
};