AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-08-26 03:09:39 +00:00
parent f1fabff5b2
commit 4cf4100fc8
26 changed files with 611 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/contrib/gizmos/gtk/gizmos.py
View File

@ -131,7 +131,7 @@ class EditableListBox(_windows.Panel):
return _gizmos.EditableListBox_GetStrings(*args, **kwargs)
def GetListCtrl(*args, **kwargs):
"""GetListCtrl(self) -> wxListCtrl"""
"""GetListCtrl(self) -> ListCtrl"""
return _gizmos.EditableListBox_GetListCtrl(*args, **kwargs)
def GetDelButton(*args, **kwargs):

15
wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
View File

File diff suppressed because one or more lines are too long

2
wxPython/contrib/gizmos/mac/gizmos.py
View File

@ -131,7 +131,7 @@ class EditableListBox(_windows.Panel):
return _gizmos.EditableListBox_GetStrings(*args, **kwargs)
def GetListCtrl(*args, **kwargs):
"""GetListCtrl(self) -> wxListCtrl"""
"""GetListCtrl(self) -> ListCtrl"""
return _gizmos.EditableListBox_GetListCtrl(*args, **kwargs)
def GetDelButton(*args, **kwargs):

15
wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
View File

File diff suppressed because one or more lines are too long

2
wxPython/contrib/gizmos/msw/gizmos.py
View File

@ -131,7 +131,7 @@ class EditableListBox(_windows.Panel):
return _gizmos.EditableListBox_GetStrings(*args, **kwargs)
def GetListCtrl(*args, **kwargs):
"""GetListCtrl(self) -> wxListCtrl"""
"""GetListCtrl(self) -> ListCtrl"""
return _gizmos.EditableListBox_GetListCtrl(*args, **kwargs)
def GetDelButton(*args, **kwargs):

15
wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
View File

File diff suppressed because one or more lines are too long

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

@ -1588,6 +1588,8 @@ class FSFile(Object):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self.thisown = 0 # It will normally be deleted by the user of the wxFileSystem
def __del__(self, destroy=_core_.delete_FSFile):
"""__del__(self)"""
try:
@ -2060,6 +2062,20 @@ class Image(Object):
"""
return _core_.Image_FindFirstUnusedColour(*args, **kwargs)
def ConvertAlphaToMask(*args, **kwargs):
"""
ConvertAlphaToMask(self, byte threshold=128) -> bool
If the image has alpha channel, this method converts it to mask. All pixels
with alpha value less than ``threshold`` are replaced with mask colour and the
alpha channel is removed. Mask colour is chosen automatically using
`FindFirstUnusedColour`.
If the image image doesn't have alpha channel, ConvertAlphaToMask does
nothing.
"""
return _core_.Image_ConvertAlphaToMask(*args, **kwargs)
def SetMaskFromImage(*args, **kwargs):
"""SetMaskFromImage(self, Image mask, byte mr, byte mg, byte mb) -> bool"""
return _core_.Image_SetMaskFromImage(*args, **kwargs)

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

@ -6680,7 +6680,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -7185,7 +7185,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp2)
@ -7531,7 +7531,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -7657,7 +7657,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -8046,7 +8046,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args,
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -9465,6 +9465,40 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg
}
static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
byte arg2 = (byte) 128 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "threshold", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_ConvertAlphaToMask",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj1) {
arg2 = (byte) SWIG_AsUnsignedChar(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->ConvertAlphaToMask(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_Image_SetMaskFromImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
@ -40236,6 +40270,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Image_GetAlpha", (PyCFunction) _wrap_Image_GetAlpha, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS },

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

@ -780,7 +780,7 @@ class FileHistory(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxFileHistory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(self, int maxFiles=9) -> FileHistory"""
"""__init__(self, int maxFiles=9, int idBase=ID_FILE1) -> FileHistory"""
newobj = _misc_.new_FileHistory(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@ -2455,6 +2455,7 @@ ART_FRAME_ICON = cvar.ART_FRAME_ICON
ART_CMN_DIALOG = cvar.ART_CMN_DIALOG
ART_HELP_BROWSER = cvar.ART_HELP_BROWSER
ART_MESSAGE_BOX = cvar.ART_MESSAGE_BOX
ART_BUTTON = cvar.ART_BUTTON
ART_OTHER = cvar.ART_OTHER
ART_ADD_BOOKMARK = cvar.ART_ADD_BOOKMARK
ART_DEL_BOOKMARK = cvar.ART_DEL_BOOKMARK

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

@ -1021,6 +1021,7 @@ PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){
static const wxString wxPyART_CMN_DIALOG(wxART_CMN_DIALOG);
static const wxString wxPyART_HELP_BROWSER(wxART_HELP_BROWSER);
static const wxString wxPyART_MESSAGE_BOX(wxART_MESSAGE_BOX);
static const wxString wxPyART_BUTTON(wxART_BUTTON);
static const wxString wxPyART_OTHER(wxART_OTHER);
static const wxString wxPyART_ADD_BOOKMARK(wxART_ADD_BOOKMARK);
static const wxString wxPyART_DEL_BOOKMARK(wxART_DEL_BOOKMARK);
@ -5597,20 +5598,26 @@ static PyObject * StopWatch_swigregister(PyObject *self, PyObject *args) {
static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 = (int) 9 ;
int arg2 = (int) wxID_FILE1 ;
wxFileHistory *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "maxFiles", NULL
(char *) "maxFiles",(char *) "idBase", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FileHistory",kwnames,&obj0)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FileHistory",kwnames,&obj0,&obj1)) goto fail;
if (obj0) {
arg1 = (int) SWIG_AsInt(obj0);
if (PyErr_Occurred()) SWIG_fail;
}
if (obj1) {
arg2 = (int) SWIG_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxFileHistory *)new wxFileHistory(arg1);
result = (wxFileHistory *)new wxFileHistory(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@ -13791,6 +13798,26 @@ static PyObject *_wrap_ART_MESSAGE_BOX_get() {
}
static int _wrap_ART_BUTTON_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable ART_BUTTON is read-only.");
return 1;
}
static PyObject *_wrap_ART_BUTTON_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyART_BUTTON)->c_str(), (&wxPyART_BUTTON)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyART_BUTTON)->c_str(), (&wxPyART_BUTTON)->Len());
#endif
}
return pyobj;
}
static int _wrap_ART_OTHER_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable ART_OTHER is read-only.");
return 1;
@ -29906,6 +29933,7 @@ SWIGEXPORT(void) SWIG_init(void) {
SWIG_addvarlink(SWIG_globals,(char*)"ART_CMN_DIALOG",_wrap_ART_CMN_DIALOG_get, _wrap_ART_CMN_DIALOG_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_HELP_BROWSER",_wrap_ART_HELP_BROWSER_get, _wrap_ART_HELP_BROWSER_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_MESSAGE_BOX",_wrap_ART_MESSAGE_BOX_get, _wrap_ART_MESSAGE_BOX_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_BUTTON",_wrap_ART_BUTTON_get, _wrap_ART_BUTTON_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_OTHER",_wrap_ART_OTHER_get, _wrap_ART_OTHER_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_ADD_BOOKMARK",_wrap_ART_ADD_BOOKMARK_get, _wrap_ART_ADD_BOOKMARK_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_DEL_BOOKMARK",_wrap_ART_DEL_BOOKMARK_get, _wrap_ART_DEL_BOOKMARK_set);

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

@ -1631,6 +1631,18 @@ class Grid(_windows.ScrolledWindow):
"""CanDragGridSize(self) -> bool"""
return _grid.Grid_CanDragGridSize(*args, **kwargs)
def EnableDragCell(*args, **kwargs):
"""EnableDragCell(self, bool enable=True)"""
return _grid.Grid_EnableDragCell(*args, **kwargs)
def DisableDragCell(*args, **kwargs):
"""DisableDragCell(self)"""
return _grid.Grid_DisableDragCell(*args, **kwargs)
def CanDragCell(*args, **kwargs):
"""CanDragCell(self) -> bool"""
return _grid.Grid_CanDragCell(*args, **kwargs)
def SetAttr(*args, **kwargs):
"""SetAttr(self, int row, int col, GridCellAttr attr)"""
return _grid.Grid_SetAttr(*args, **kwargs)
@ -2285,6 +2297,7 @@ wxEVT_GRID_SELECT_CELL = _grid.wxEVT_GRID_SELECT_CELL
wxEVT_GRID_EDITOR_SHOWN = _grid.wxEVT_GRID_EDITOR_SHOWN
wxEVT_GRID_EDITOR_HIDDEN = _grid.wxEVT_GRID_EDITOR_HIDDEN
wxEVT_GRID_EDITOR_CREATED = _grid.wxEVT_GRID_EDITOR_CREATED
wxEVT_GRID_CELL_BEGIN_DRAG = _grid.wxEVT_GRID_CELL_BEGIN_DRAG
EVT_GRID_CELL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_CLICK )
EVT_GRID_CELL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_CLICK )
EVT_GRID_CELL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_DCLICK )
@ -2301,6 +2314,7 @@ EVT_GRID_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL )
EVT_GRID_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN )
EVT_GRID_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN )
EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
EVT_GRID_CELL_BEGIN_DRAG = wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG )
# The same as above but with the ability to specify an identifier
@ -2320,5 +2334,7 @@ EVT_GRID_CMD_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL,
EVT_GRID_CMD_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN, 1 )
EVT_GRID_CMD_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN, 1 )
EVT_GRID_CMD_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED, 1 )
EVT_GRID_CMD_CELL_BEGIN_DRAG = wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG, 1 )

88
wxPython/src/gtk/grid_wrap.cpp
View File

@ -11251,6 +11251,90 @@ static PyObject *_wrap_Grid_CanDragGridSize(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_Grid_EnableDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
bool arg2 = (bool) True ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "enable", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Grid_EnableDragCell",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj1) {
arg2 = (bool) SWIG_AsBool(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->EnableDragCell(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_DisableDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_DisableDragCell",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->DisableDragCell();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_CanDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
bool result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_CanDragCell",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->CanDragCell();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
@ -15953,6 +16037,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Grid_EnableDragGridSize", (PyCFunction) _wrap_Grid_EnableDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_DisableDragGridSize", (PyCFunction) _wrap_Grid_DisableDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_CanDragGridSize", (PyCFunction) _wrap_Grid_CanDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_EnableDragCell", (PyCFunction) _wrap_Grid_EnableDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_DisableDragCell", (PyCFunction) _wrap_Grid_DisableDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_CanDragCell", (PyCFunction) _wrap_Grid_CanDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetAttr", (PyCFunction) _wrap_Grid_SetAttr, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetRowAttr", (PyCFunction) _wrap_Grid_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetColAttr", (PyCFunction) _wrap_Grid_SetColAttr, METH_VARARGS | METH_KEYWORDS },
@ -17326,6 +17413,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_SHOWN", PyInt_FromLong(wxEVT_GRID_EDITOR_SHOWN));
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_HIDDEN", PyInt_FromLong(wxEVT_GRID_EDITOR_HIDDEN));
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_CREATED", PyInt_FromLong(wxEVT_GRID_EDITOR_CREATED));
PyDict_SetItemString(d, "wxEVT_GRID_CELL_BEGIN_DRAG", PyInt_FromLong(wxEVT_GRID_CELL_BEGIN_DRAG));
}

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

@ -1588,6 +1588,8 @@ class FSFile(Object):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self.thisown = 0 # It will normally be deleted by the user of the wxFileSystem
def __del__(self, destroy=_core_.delete_FSFile):
"""__del__(self)"""
try:
@ -2060,6 +2062,20 @@ class Image(Object):
"""
return _core_.Image_FindFirstUnusedColour(*args, **kwargs)
def ConvertAlphaToMask(*args, **kwargs):
"""
ConvertAlphaToMask(self, byte threshold=128) -> bool
If the image has alpha channel, this method converts it to mask. All pixels
with alpha value less than ``threshold`` are replaced with mask colour and the
alpha channel is removed. Mask colour is chosen automatically using
`FindFirstUnusedColour`.
If the image image doesn't have alpha channel, ConvertAlphaToMask does
nothing.
"""
return _core_.Image_ConvertAlphaToMask(*args, **kwargs)
def SetMaskFromImage(*args, **kwargs):
"""SetMaskFromImage(self, Image mask, byte mr, byte mg, byte mb) -> bool"""
return _core_.Image_SetMaskFromImage(*args, **kwargs)

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

@ -6680,7 +6680,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -7185,7 +7185,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp2)
@ -7531,7 +7531,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -7657,7 +7657,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -8046,7 +8046,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args,
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -9465,6 +9465,40 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg
}
static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
byte arg2 = (byte) 128 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "threshold", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_ConvertAlphaToMask",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj1) {
arg2 = (byte) SWIG_AsUnsignedChar(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->ConvertAlphaToMask(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_Image_SetMaskFromImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
@ -40236,6 +40270,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Image_GetAlpha", (PyCFunction) _wrap_Image_GetAlpha, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS },

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

@ -780,7 +780,7 @@ class FileHistory(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxFileHistory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(self, int maxFiles=9) -> FileHistory"""
"""__init__(self, int maxFiles=9, int idBase=ID_FILE1) -> FileHistory"""
newobj = _misc_.new_FileHistory(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@ -2455,6 +2455,7 @@ ART_FRAME_ICON = cvar.ART_FRAME_ICON
ART_CMN_DIALOG = cvar.ART_CMN_DIALOG
ART_HELP_BROWSER = cvar.ART_HELP_BROWSER
ART_MESSAGE_BOX = cvar.ART_MESSAGE_BOX
ART_BUTTON = cvar.ART_BUTTON
ART_OTHER = cvar.ART_OTHER
ART_ADD_BOOKMARK = cvar.ART_ADD_BOOKMARK
ART_DEL_BOOKMARK = cvar.ART_DEL_BOOKMARK

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

@ -1016,6 +1016,7 @@ PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){
static const wxString wxPyART_CMN_DIALOG(wxART_CMN_DIALOG);
static const wxString wxPyART_HELP_BROWSER(wxART_HELP_BROWSER);
static const wxString wxPyART_MESSAGE_BOX(wxART_MESSAGE_BOX);
static const wxString wxPyART_BUTTON(wxART_BUTTON);
static const wxString wxPyART_OTHER(wxART_OTHER);
static const wxString wxPyART_ADD_BOOKMARK(wxART_ADD_BOOKMARK);
static const wxString wxPyART_DEL_BOOKMARK(wxART_DEL_BOOKMARK);
@ -5588,20 +5589,26 @@ static PyObject * StopWatch_swigregister(PyObject *self, PyObject *args) {
static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 = (int) 9 ;
int arg2 = (int) wxID_FILE1 ;
wxFileHistory *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "maxFiles", NULL
(char *) "maxFiles",(char *) "idBase", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FileHistory",kwnames,&obj0)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FileHistory",kwnames,&obj0,&obj1)) goto fail;
if (obj0) {
arg1 = (int) SWIG_AsInt(obj0);
if (PyErr_Occurred()) SWIG_fail;
}
if (obj1) {
arg2 = (int) SWIG_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxFileHistory *)new wxFileHistory(arg1);
result = (wxFileHistory *)new wxFileHistory(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@ -13782,6 +13789,26 @@ static PyObject *_wrap_ART_MESSAGE_BOX_get() {
}
static int _wrap_ART_BUTTON_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable ART_BUTTON is read-only.");
return 1;
}
static PyObject *_wrap_ART_BUTTON_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyART_BUTTON)->c_str(), (&wxPyART_BUTTON)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyART_BUTTON)->c_str(), (&wxPyART_BUTTON)->Len());
#endif
}
return pyobj;
}
static int _wrap_ART_OTHER_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable ART_OTHER is read-only.");
return 1;
@ -29965,6 +29992,7 @@ SWIGEXPORT(void) SWIG_init(void) {
SWIG_addvarlink(SWIG_globals,(char*)"ART_CMN_DIALOG",_wrap_ART_CMN_DIALOG_get, _wrap_ART_CMN_DIALOG_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_HELP_BROWSER",_wrap_ART_HELP_BROWSER_get, _wrap_ART_HELP_BROWSER_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_MESSAGE_BOX",_wrap_ART_MESSAGE_BOX_get, _wrap_ART_MESSAGE_BOX_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_BUTTON",_wrap_ART_BUTTON_get, _wrap_ART_BUTTON_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_OTHER",_wrap_ART_OTHER_get, _wrap_ART_OTHER_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_ADD_BOOKMARK",_wrap_ART_ADD_BOOKMARK_get, _wrap_ART_ADD_BOOKMARK_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_DEL_BOOKMARK",_wrap_ART_DEL_BOOKMARK_get, _wrap_ART_DEL_BOOKMARK_set);

16
wxPython/src/mac/grid.py
View File

@ -1631,6 +1631,18 @@ class Grid(_windows.ScrolledWindow):
"""CanDragGridSize(self) -> bool"""
return _grid.Grid_CanDragGridSize(*args, **kwargs)
def EnableDragCell(*args, **kwargs):
"""EnableDragCell(self, bool enable=True)"""
return _grid.Grid_EnableDragCell(*args, **kwargs)
def DisableDragCell(*args, **kwargs):
"""DisableDragCell(self)"""
return _grid.Grid_DisableDragCell(*args, **kwargs)
def CanDragCell(*args, **kwargs):
"""CanDragCell(self) -> bool"""
return _grid.Grid_CanDragCell(*args, **kwargs)
def SetAttr(*args, **kwargs):
"""SetAttr(self, int row, int col, GridCellAttr attr)"""
return _grid.Grid_SetAttr(*args, **kwargs)
@ -2285,6 +2297,7 @@ wxEVT_GRID_SELECT_CELL = _grid.wxEVT_GRID_SELECT_CELL
wxEVT_GRID_EDITOR_SHOWN = _grid.wxEVT_GRID_EDITOR_SHOWN
wxEVT_GRID_EDITOR_HIDDEN = _grid.wxEVT_GRID_EDITOR_HIDDEN
wxEVT_GRID_EDITOR_CREATED = _grid.wxEVT_GRID_EDITOR_CREATED
wxEVT_GRID_CELL_BEGIN_DRAG = _grid.wxEVT_GRID_CELL_BEGIN_DRAG
EVT_GRID_CELL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_CLICK )
EVT_GRID_CELL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_CLICK )
EVT_GRID_CELL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_DCLICK )
@ -2301,6 +2314,7 @@ EVT_GRID_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL )
EVT_GRID_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN )
EVT_GRID_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN )
EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
EVT_GRID_CELL_BEGIN_DRAG = wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG )
# The same as above but with the ability to specify an identifier
@ -2320,5 +2334,7 @@ EVT_GRID_CMD_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL,
EVT_GRID_CMD_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN, 1 )
EVT_GRID_CMD_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN, 1 )
EVT_GRID_CMD_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED, 1 )
EVT_GRID_CMD_CELL_BEGIN_DRAG = wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG, 1 )

88
wxPython/src/mac/grid_wrap.cpp
View File

@ -11251,6 +11251,90 @@ static PyObject *_wrap_Grid_CanDragGridSize(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_Grid_EnableDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
bool arg2 = (bool) True ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "enable", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Grid_EnableDragCell",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj1) {
arg2 = (bool) SWIG_AsBool(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->EnableDragCell(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_DisableDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_DisableDragCell",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->DisableDragCell();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_CanDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
bool result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_CanDragCell",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->CanDragCell();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
@ -15953,6 +16037,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Grid_EnableDragGridSize", (PyCFunction) _wrap_Grid_EnableDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_DisableDragGridSize", (PyCFunction) _wrap_Grid_DisableDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_CanDragGridSize", (PyCFunction) _wrap_Grid_CanDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_EnableDragCell", (PyCFunction) _wrap_Grid_EnableDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_DisableDragCell", (PyCFunction) _wrap_Grid_DisableDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_CanDragCell", (PyCFunction) _wrap_Grid_CanDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetAttr", (PyCFunction) _wrap_Grid_SetAttr, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetRowAttr", (PyCFunction) _wrap_Grid_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetColAttr", (PyCFunction) _wrap_Grid_SetColAttr, METH_VARARGS | METH_KEYWORDS },
@ -17326,6 +17413,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_SHOWN", PyInt_FromLong(wxEVT_GRID_EDITOR_SHOWN));
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_HIDDEN", PyInt_FromLong(wxEVT_GRID_EDITOR_HIDDEN));
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_CREATED", PyInt_FromLong(wxEVT_GRID_EDITOR_CREATED));
PyDict_SetItemString(d, "wxEVT_GRID_CELL_BEGIN_DRAG", PyInt_FromLong(wxEVT_GRID_CELL_BEGIN_DRAG));
}

16
wxPython/src/msw/_core.py
View File

@ -1588,6 +1588,8 @@ class FSFile(Object):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self.thisown = 0 # It will normally be deleted by the user of the wxFileSystem
def __del__(self, destroy=_core_.delete_FSFile):
"""__del__(self)"""
try:
@ -2060,6 +2062,20 @@ class Image(Object):
"""
return _core_.Image_FindFirstUnusedColour(*args, **kwargs)
def ConvertAlphaToMask(*args, **kwargs):
"""
ConvertAlphaToMask(self, byte threshold=128) -> bool
If the image has alpha channel, this method converts it to mask. All pixels
with alpha value less than ``threshold`` are replaced with mask colour and the
alpha channel is removed. Mask colour is chosen automatically using
`FindFirstUnusedColour`.
If the image image doesn't have alpha channel, ConvertAlphaToMask does
nothing.
"""
return _core_.Image_ConvertAlphaToMask(*args, **kwargs)
def SetMaskFromImage(*args, **kwargs):
"""SetMaskFromImage(self, Image mask, byte mr, byte mg, byte mb) -> bool"""
return _core_.Image_SetMaskFromImage(*args, **kwargs)

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

@ -6678,7 +6678,7 @@ static PyObject *_wrap_FileSystemHandler_OpenFile(PyObject *self, PyObject *args
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -7183,7 +7183,7 @@ static PyObject *_wrap_FileSystem_OpenFile(PyObject *self, PyObject *args, PyObj
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp2)
@ -7529,7 +7529,7 @@ static PyObject *_wrap_InternetFSHandler_OpenFile(PyObject *self, PyObject *args
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -7655,7 +7655,7 @@ static PyObject *_wrap_ZipFSHandler_OpenFile(PyObject *self, PyObject *args, PyO
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -8044,7 +8044,7 @@ static PyObject *_wrap_MemoryFSHandler_OpenFile(PyObject *self, PyObject *args,
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
resultobj = wxPyMake_wxObject(result, 1);
}
{
if (temp3)
@ -9463,6 +9463,40 @@ static PyObject *_wrap_Image_FindFirstUnusedColour(PyObject *self, PyObject *arg
}
static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
byte arg2 = (byte) 128 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "threshold", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Image_ConvertAlphaToMask",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj1) {
arg2 = (byte) SWIG_AsUnsignedChar(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->ConvertAlphaToMask(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_Image_SetMaskFromImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
@ -40736,6 +40770,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Image_GetAlpha", (PyCFunction) _wrap_Image_GetAlpha, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS },

3
wxPython/src/msw/_misc.py
View File

@ -780,7 +780,7 @@ class FileHistory(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxFileHistory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(self, int maxFiles=9) -> FileHistory"""
"""__init__(self, int maxFiles=9, int idBase=ID_FILE1) -> FileHistory"""
newobj = _misc_.new_FileHistory(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
@ -2455,6 +2455,7 @@ ART_FRAME_ICON = cvar.ART_FRAME_ICON
ART_CMN_DIALOG = cvar.ART_CMN_DIALOG
ART_HELP_BROWSER = cvar.ART_HELP_BROWSER
ART_MESSAGE_BOX = cvar.ART_MESSAGE_BOX
ART_BUTTON = cvar.ART_BUTTON
ART_OTHER = cvar.ART_OTHER
ART_ADD_BOOKMARK = cvar.ART_ADD_BOOKMARK
ART_DEL_BOOKMARK = cvar.ART_DEL_BOOKMARK

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

@ -1015,6 +1015,7 @@ PyObject *wxMimeTypesManager_EnumAllFileTypes(wxMimeTypesManager *self){
static const wxString wxPyART_CMN_DIALOG(wxART_CMN_DIALOG);
static const wxString wxPyART_HELP_BROWSER(wxART_HELP_BROWSER);
static const wxString wxPyART_MESSAGE_BOX(wxART_MESSAGE_BOX);
static const wxString wxPyART_BUTTON(wxART_BUTTON);
static const wxString wxPyART_OTHER(wxART_OTHER);
static const wxString wxPyART_ADD_BOOKMARK(wxART_ADD_BOOKMARK);
static const wxString wxPyART_DEL_BOOKMARK(wxART_DEL_BOOKMARK);
@ -5586,20 +5587,26 @@ static PyObject * StopWatch_swigregister(PyObject *self, PyObject *args) {
static PyObject *_wrap_new_FileHistory(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 = (int) 9 ;
int arg2 = (int) wxID_FILE1 ;
wxFileHistory *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "maxFiles", NULL
(char *) "maxFiles",(char *) "idBase", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_FileHistory",kwnames,&obj0)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OO:new_FileHistory",kwnames,&obj0,&obj1)) goto fail;
if (obj0) {
arg1 = (int) SWIG_AsInt(obj0);
if (PyErr_Occurred()) SWIG_fail;
}
if (obj1) {
arg2 = (int) SWIG_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxFileHistory *)new wxFileHistory(arg1);
result = (wxFileHistory *)new wxFileHistory(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@ -13780,6 +13787,26 @@ static PyObject *_wrap_ART_MESSAGE_BOX_get() {
}
static int _wrap_ART_BUTTON_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable ART_BUTTON is read-only.");
return 1;
}
static PyObject *_wrap_ART_BUTTON_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyART_BUTTON)->c_str(), (&wxPyART_BUTTON)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyART_BUTTON)->c_str(), (&wxPyART_BUTTON)->Len());
#endif
}
return pyobj;
}
static int _wrap_ART_OTHER_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable ART_OTHER is read-only.");
return 1;
@ -29963,6 +29990,7 @@ SWIGEXPORT(void) SWIG_init(void) {
SWIG_addvarlink(SWIG_globals,(char*)"ART_CMN_DIALOG",_wrap_ART_CMN_DIALOG_get, _wrap_ART_CMN_DIALOG_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_HELP_BROWSER",_wrap_ART_HELP_BROWSER_get, _wrap_ART_HELP_BROWSER_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_MESSAGE_BOX",_wrap_ART_MESSAGE_BOX_get, _wrap_ART_MESSAGE_BOX_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_BUTTON",_wrap_ART_BUTTON_get, _wrap_ART_BUTTON_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_OTHER",_wrap_ART_OTHER_get, _wrap_ART_OTHER_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_ADD_BOOKMARK",_wrap_ART_ADD_BOOKMARK_get, _wrap_ART_ADD_BOOKMARK_set);
SWIG_addvarlink(SWIG_globals,(char*)"ART_DEL_BOOKMARK",_wrap_ART_DEL_BOOKMARK_get, _wrap_ART_DEL_BOOKMARK_set);

16
wxPython/src/msw/grid.py
View File

@ -1631,6 +1631,18 @@ class Grid(_windows.ScrolledWindow):
"""CanDragGridSize(self) -> bool"""
return _grid.Grid_CanDragGridSize(*args, **kwargs)
def EnableDragCell(*args, **kwargs):
"""EnableDragCell(self, bool enable=True)"""
return _grid.Grid_EnableDragCell(*args, **kwargs)
def DisableDragCell(*args, **kwargs):
"""DisableDragCell(self)"""
return _grid.Grid_DisableDragCell(*args, **kwargs)
def CanDragCell(*args, **kwargs):
"""CanDragCell(self) -> bool"""
return _grid.Grid_CanDragCell(*args, **kwargs)
def SetAttr(*args, **kwargs):
"""SetAttr(self, int row, int col, GridCellAttr attr)"""
return _grid.Grid_SetAttr(*args, **kwargs)
@ -2285,6 +2297,7 @@ wxEVT_GRID_SELECT_CELL = _grid.wxEVT_GRID_SELECT_CELL
wxEVT_GRID_EDITOR_SHOWN = _grid.wxEVT_GRID_EDITOR_SHOWN
wxEVT_GRID_EDITOR_HIDDEN = _grid.wxEVT_GRID_EDITOR_HIDDEN
wxEVT_GRID_EDITOR_CREATED = _grid.wxEVT_GRID_EDITOR_CREATED
wxEVT_GRID_CELL_BEGIN_DRAG = _grid.wxEVT_GRID_CELL_BEGIN_DRAG
EVT_GRID_CELL_LEFT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_CLICK )
EVT_GRID_CELL_RIGHT_CLICK = wx.PyEventBinder( wxEVT_GRID_CELL_RIGHT_CLICK )
EVT_GRID_CELL_LEFT_DCLICK = wx.PyEventBinder( wxEVT_GRID_CELL_LEFT_DCLICK )
@ -2301,6 +2314,7 @@ EVT_GRID_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL )
EVT_GRID_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN )
EVT_GRID_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN )
EVT_GRID_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED )
EVT_GRID_CELL_BEGIN_DRAG = wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG )
# The same as above but with the ability to specify an identifier
@ -2320,5 +2334,7 @@ EVT_GRID_CMD_SELECT_CELL = wx.PyEventBinder( wxEVT_GRID_SELECT_CELL,
EVT_GRID_CMD_EDITOR_SHOWN = wx.PyEventBinder( wxEVT_GRID_EDITOR_SHOWN, 1 )
EVT_GRID_CMD_EDITOR_HIDDEN = wx.PyEventBinder( wxEVT_GRID_EDITOR_HIDDEN, 1 )
EVT_GRID_CMD_EDITOR_CREATED = wx.PyEventBinder( wxEVT_GRID_EDITOR_CREATED, 1 )
EVT_GRID_CMD_CELL_BEGIN_DRAG = wx.PyEventBinder( wxEVT_GRID_CELL_BEGIN_DRAG, 1 )

88
wxPython/src/msw/grid_wrap.cpp
View File

@ -11251,6 +11251,90 @@ static PyObject *_wrap_Grid_CanDragGridSize(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_Grid_EnableDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
bool arg2 = (bool) True ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "enable", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Grid_EnableDragCell",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj1) {
arg2 = (bool) SWIG_AsBool(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->EnableDragCell(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_DisableDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_DisableDragCell",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->DisableDragCell();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_CanDragCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
bool result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Grid_CanDragCell",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->CanDragCell();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_SetAttr(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
@ -15953,6 +16037,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Grid_EnableDragGridSize", (PyCFunction) _wrap_Grid_EnableDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_DisableDragGridSize", (PyCFunction) _wrap_Grid_DisableDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_CanDragGridSize", (PyCFunction) _wrap_Grid_CanDragGridSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_EnableDragCell", (PyCFunction) _wrap_Grid_EnableDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_DisableDragCell", (PyCFunction) _wrap_Grid_DisableDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_CanDragCell", (PyCFunction) _wrap_Grid_CanDragCell, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetAttr", (PyCFunction) _wrap_Grid_SetAttr, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetRowAttr", (PyCFunction) _wrap_Grid_SetRowAttr, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_SetColAttr", (PyCFunction) _wrap_Grid_SetColAttr, METH_VARARGS | METH_KEYWORDS },
@ -17326,6 +17413,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_SHOWN", PyInt_FromLong(wxEVT_GRID_EDITOR_SHOWN));
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_HIDDEN", PyInt_FromLong(wxEVT_GRID_EDITOR_HIDDEN));
PyDict_SetItemString(d, "wxEVT_GRID_EDITOR_CREATED", PyInt_FromLong(wxEVT_GRID_EDITOR_CREATED));
PyDict_SetItemString(d, "wxEVT_GRID_CELL_BEGIN_DRAG", PyInt_FromLong(wxEVT_GRID_CELL_BEGIN_DRAG));
}

1
wxPython/wxPython/_misc.py
View File

@ -386,6 +386,7 @@ wxART_FRAME_ICON = wx._misc.ART_FRAME_ICON
wxART_CMN_DIALOG = wx._misc.ART_CMN_DIALOG
wxART_HELP_BROWSER = wx._misc.ART_HELP_BROWSER
wxART_MESSAGE_BOX = wx._misc.ART_MESSAGE_BOX
wxART_BUTTON = wx._misc.ART_BUTTON
wxART_OTHER = wx._misc.ART_OTHER
wxART_ADD_BOOKMARK = wx._misc.ART_ADD_BOOKMARK
wxART_DEL_BOOKMARK = wx._misc.ART_DEL_BOOKMARK

1
wxPython/wxPython/grid.py
View File

@ -129,6 +129,7 @@ wxEVT_GRID_SELECT_CELL = wx.grid.wxEVT_GRID_SELECT_CELL
wxEVT_GRID_EDITOR_SHOWN = wx.grid.wxEVT_GRID_EDITOR_SHOWN
wxEVT_GRID_EDITOR_HIDDEN = wx.grid.wxEVT_GRID_EDITOR_HIDDEN
wxEVT_GRID_EDITOR_CREATED = wx.grid.wxEVT_GRID_EDITOR_CREATED
wxEVT_GRID_CELL_BEGIN_DRAG = wx.grid.wxEVT_GRID_CELL_BEGIN_DRAG
d = globals()