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@25763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-02-12 01:39:33 +00:00
parent 927d7cfa70
commit db91459553
22 changed files with 1037 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1036,6 +1036,7 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args
PyObject *resultobj;
wxEditableListBox *arg1 = (wxEditableListBox *) 0 ;
wxArrayString *arg2 = 0 ;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@ -1050,6 +1051,7 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args
SWIG_fail;
}
arg2 = new wxArrayString;
temp2 = True;
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@ -1072,12 +1074,12 @@ static PyObject *_wrap_EditableListBox_SetStrings(PyObject *self, PyObject *args
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}

8
wxPython/contrib/stc/stc.py
View File

@ -2297,6 +2297,14 @@ class StyledTextCtrl(core.Control):
"""DoDropText(long x, long y, String data) -> bool"""
return _stc.StyledTextCtrl_DoDropText(*args, **kwargs)
def SetUseAntiAliasing(*args, **kwargs):
"""SetUseAntiAliasing(bool useAA)"""
return _stc.StyledTextCtrl_SetUseAntiAliasing(*args, **kwargs)
def GetUseAntiAliasing(*args, **kwargs):
"""GetUseAntiAliasing() -> bool"""
return _stc.StyledTextCtrl_GetUseAntiAliasing(*args, **kwargs)
class StyledTextCtrlPtr(StyledTextCtrl):
def __init__(self, this):

57
wxPython/contrib/stc/stc_wrap.cpp
View File

@ -11285,6 +11285,61 @@ static PyObject *_wrap_StyledTextCtrl_DoDropText(PyObject *self, PyObject *args,
}
static PyObject *_wrap_StyledTextCtrl_SetUseAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
bool arg2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "useAA", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:StyledTextCtrl_SetUseAntiAliasing",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStyledTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = (bool) SWIG_PyObj_AsBool(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetUseAntiAliasing(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_StyledTextCtrl_GetUseAntiAliasing(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxStyledTextCtrl *arg1 = (wxStyledTextCtrl *) 0 ;
bool result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StyledTextCtrl_GetUseAntiAliasing",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxStyledTextCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->GetUseAntiAliasing();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
}
static PyObject * StyledTextCtrl_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
@ -12942,6 +12997,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"StyledTextCtrl_LoadFile", (PyCFunction) _wrap_StyledTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
{ (char *)"StyledTextCtrl_DoDragOver", (PyCFunction) _wrap_StyledTextCtrl_DoDragOver, METH_VARARGS | METH_KEYWORDS },
{ (char *)"StyledTextCtrl_DoDropText", (PyCFunction) _wrap_StyledTextCtrl_DoDropText, METH_VARARGS | METH_KEYWORDS },
{ (char *)"StyledTextCtrl_SetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_SetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS },
{ (char *)"StyledTextCtrl_GetUseAntiAliasing", (PyCFunction) _wrap_StyledTextCtrl_GetUseAntiAliasing, METH_VARARGS | METH_KEYWORDS },
{ (char *)"StyledTextCtrl_swigregister", StyledTextCtrl_swigregister, METH_VARARGS },
{ (char *)"new_StyledTextEvent", (PyCFunction) _wrap_new_StyledTextEvent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"delete_StyledTextEvent", (PyCFunction) _wrap_delete_StyledTextEvent, METH_VARARGS | METH_KEYWORDS },

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

@ -2444,6 +2444,10 @@ class DC(core.Object):
"""
return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs)
def GetPartialTextExtents(*args, **kwargs):
"""GetPartialTextExtents(String text) -> wxArrayInt"""
return _gdi.DC_GetPartialTextExtents(*args, **kwargs)
def GetSize(*args, **kwargs):
"""
GetSize() -> Size

55
wxPython/src/gtk/gdi_wrap.cpp
View File

@ -656,6 +656,11 @@ wxRect wxDC_GetClippingRect(wxDC *self){
self->GetClippingBox(rect);
return rect;
}
wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){
wxArrayInt widths;
self->GetPartialTextExtents(text, widths);
return widths;
}
PyObject *wxDC__DrawPointList(wxDC *self,PyObject *pyCoords,PyObject *pyPens,PyObject *pyBrushes){
return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes);
}
@ -12730,6 +12735,55 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
}
static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
wxString *arg2 = 0 ;
wxArrayInt result;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "text", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPartialTextExtents",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = wxString_in_helper(obj1);
if (arg2 == NULL) SWIG_fail;
temp2 = True;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = wxDC_GetPartialTextExtents(arg1,(wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = PyList_New(0);
size_t idx;
for (idx = 0; idx < (&result)->GetCount(); idx += 1) {
PyObject* val = PyInt_FromLong( (&result)->Item(idx) );
PyList_Append(resultobj, val);
Py_DECREF(val);
}
}
{
if (temp2)
delete arg2;
}
return resultobj;
fail:
{
if (temp2)
delete arg2;
}
return NULL;
}
static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
@ -18036,6 +18090,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DC_GetTextExtent", (PyCFunction) _wrap_DC_GetTextExtent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetFullTextExtent", (PyCFunction) _wrap_DC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetMultiLineTextExtent", (PyCFunction) _wrap_DC_GetMultiLineTextExtent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetPartialTextExtents", (PyCFunction) _wrap_DC_GetPartialTextExtents, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetSize", (PyCFunction) _wrap_DC_GetSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetSizeTuple", (PyCFunction) _wrap_DC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetSizeMM", (PyCFunction) _wrap_DC_GetSizeMM, METH_VARARGS | METH_KEYWORDS },

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

@ -1056,6 +1056,18 @@ class HtmlWindow(windows.ScrolledWindow):
return _html.HtmlWindow_AddFilter(*args, **kwargs)
AddFilter = staticmethod(AddFilter)
def SelectWord(*args, **kwargs):
"""SelectWord(Point pos)"""
return _html.HtmlWindow_SelectWord(*args, **kwargs)
def SelectLine(*args, **kwargs):
"""SelectLine(Point pos)"""
return _html.HtmlWindow_SelectLine(*args, **kwargs)
def SelectAll(*args, **kwargs):
"""SelectAll()"""
return _html.HtmlWindow_SelectAll(*args, **kwargs)
def base_OnLinkClicked(*args, **kwargs):
"""base_OnLinkClicked(HtmlLinkInfo link)"""
return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)

89
wxPython/src/gtk/html_wrap.cpp
View File

@ -6566,6 +6566,92 @@ static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_HtmlWindow_SelectWord(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxPoint *arg2 = 0 ;
wxPoint temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "pos", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SelectWord",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectWord((wxPoint const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxPoint *arg2 = 0 ;
wxPoint temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "pos", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SelectLine",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectLine((wxPoint const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectAll",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectAll();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
@ -10217,6 +10303,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HtmlWindow_ScrollToAnchor", (PyCFunction) _wrap_HtmlWindow_ScrollToAnchor, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_HasAnchor", (PyCFunction) _wrap_HtmlWindow_HasAnchor, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_AddFilter", (PyCFunction) _wrap_HtmlWindow_AddFilter, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS },

8
wxPython/src/gtk/misc_wrap.cpp
View File

@ -23469,12 +23469,12 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___eq__",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = (int) SWIG_PyObj_AsInt(obj1);
arg2 = (wxDataFormatId) SWIG_PyObj_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxDataFormat const *)arg1)->operator ==(arg2);
result = (bool)((wxDataFormat const *)arg1)->operator ==((wxDataFormatId )arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@ -23497,12 +23497,12 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___ne__",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = (int) SWIG_PyObj_AsInt(obj1);
arg2 = (wxDataFormatId) SWIG_PyObj_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxDataFormat const *)arg1)->operator !=(arg2);
result = (bool)((wxDataFormat const *)arg1)->operator !=((wxDataFormatId )arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;

9
wxPython/src/gtk/windows.py
View File

@ -2641,6 +2641,7 @@ PRINT_MODE_NONE = _windows.PRINT_MODE_NONE
PRINT_MODE_PREVIEW = _windows.PRINT_MODE_PREVIEW
PRINT_MODE_FILE = _windows.PRINT_MODE_FILE
PRINT_MODE_PRINTER = _windows.PRINT_MODE_PRINTER
PRINT_MODE_STREAM = _windows.PRINT_MODE_STREAM
class PrintData(core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@ -2820,6 +2821,14 @@ class PrintData(core.Object):
"""SetPrintMode(int printMode)"""
return _windows.PrintData_SetPrintMode(*args, **kwargs)
def GetOutputStream(*args, **kwargs):
"""GetOutputStream() -> OutputStream"""
return _windows.PrintData_GetOutputStream(*args, **kwargs)
def SetOutputStream(*args, **kwargs):
"""SetOutputStream(OutputStream outputstream)"""
return _windows.PrintData_SetOutputStream(*args, **kwargs)
def __nonzero__(self): return self.Ok()
class PrintDataPtr(PrintData):

120
wxPython/src/gtk/windows_wrap.cpp
View File

File diff suppressed because one or more lines are too long

10
wxPython/src/msw/controls.py
View File

@ -4210,14 +4210,22 @@ class TreeCtrl(core.Control):
"""Unselect()"""
return _controls.TreeCtrl_Unselect(*args, **kwargs)
def UnselectItem(*args, **kwargs):
"""UnselectItem(TreeItemId item)"""
return _controls.TreeCtrl_UnselectItem(*args, **kwargs)
def UnselectAll(*args, **kwargs):
"""UnselectAll()"""
return _controls.TreeCtrl_UnselectAll(*args, **kwargs)
def SelectItem(*args, **kwargs):
"""SelectItem(TreeItemId item)"""
"""SelectItem(TreeItemId item, bool select=True)"""
return _controls.TreeCtrl_SelectItem(*args, **kwargs)
def ToggleItemSelection(*args, **kwargs):
"""ToggleItemSelection(TreeItemId item)"""
return _controls.TreeCtrl_ToggleItemSelection(*args, **kwargs)
def EnsureVisible(*args, **kwargs):
"""EnsureVisible(TreeItemId item)"""
return _controls.TreeCtrl_EnsureVisible(*args, **kwargs)

152
wxPython/src/msw/controls_wrap.cpp
View File

@ -2271,6 +2271,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
wxChoice *result;
wxPoint temp3 ;
wxSize temp4 ;
bool temp5 = False ;
bool temp8 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -2309,6 +2310,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
SWIG_fail;
}
arg5 = new wxArrayString;
temp5 = True;
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
@ -2351,7 +2353,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxChoice, 1);
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@ -2360,7 +2362,7 @@ static PyObject *_wrap_new_Choice(PyObject *self, PyObject *args, PyObject *kwar
return resultobj;
fail:
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@ -2411,6 +2413,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
bool result;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp9 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -2451,6 +2454,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@ -2493,7 +2497,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@ -2502,7 +2506,7 @@ static PyObject *_wrap_Choice_Create(PyObject *self, PyObject *args, PyObject *k
return resultobj;
fail:
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@ -2733,6 +2737,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
bool temp3 = False ;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp9 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -2779,6 +2784,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@ -2825,7 +2831,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
delete arg3;
}
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@ -2838,7 +2844,7 @@ static PyObject *_wrap_new_ComboBox(PyObject *self, PyObject *args, PyObject *kw
delete arg3;
}
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@ -2892,6 +2898,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
bool temp4 = False ;
wxPoint temp5 ;
wxSize temp6 ;
bool temp7 = False ;
bool temp10 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -2940,6 +2947,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
SWIG_fail;
}
arg7 = new wxArrayString;
temp7 = True;
int i, len=PySequence_Length(obj6);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj6, i);
@ -2986,7 +2994,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
delete arg4;
}
{
if (arg7) delete arg7;
if (temp7) delete arg7;
}
{
if (temp10)
@ -2999,7 +3007,7 @@ static PyObject *_wrap_ComboBox_Create(PyObject *self, PyObject *args, PyObject
delete arg4;
}
{
if (arg7) delete arg7;
if (temp7) delete arg7;
}
{
if (temp10)
@ -4996,6 +5004,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
wxListBox *result;
wxPoint temp3 ;
wxSize temp4 ;
bool temp5 = False ;
bool temp8 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -5034,6 +5043,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
SWIG_fail;
}
arg5 = new wxArrayString;
temp5 = True;
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
@ -5076,7 +5086,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxListBox, 1);
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@ -5085,7 +5095,7 @@ static PyObject *_wrap_new_ListBox(PyObject *self, PyObject *args, PyObject *kwa
return resultobj;
fail:
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@ -5136,6 +5146,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
bool result;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp9 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -5176,6 +5187,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@ -5218,7 +5230,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@ -5227,7 +5239,7 @@ static PyObject *_wrap_ListBox_Create(PyObject *self, PyObject *args, PyObject *
return resultobj;
fail:
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@ -5293,6 +5305,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj
wxListBox *arg1 = (wxListBox *) 0 ;
wxArrayString *arg2 = 0 ;
int arg3 ;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@ -5308,6 +5321,7 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj
SWIG_fail;
}
arg2 = new wxArrayString;
temp2 = True;
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@ -5334,12 +5348,12 @@ static PyObject *_wrap_ListBox_InsertItems(PyObject *self, PyObject *args, PyObj
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}
@ -5349,6 +5363,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa
PyObject *resultobj;
wxListBox *arg1 = (wxListBox *) 0 ;
wxArrayString *arg2 = 0 ;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@ -5363,6 +5378,7 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa
SWIG_fail;
}
arg2 = new wxArrayString;
temp2 = True;
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@ -5385,12 +5401,12 @@ static PyObject *_wrap_ListBox_Set(PyObject *self, PyObject *args, PyObject *kwa
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}
@ -5821,6 +5837,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
wxCheckListBox *result;
wxPoint temp3 ;
wxSize temp4 ;
bool temp5 = False ;
bool temp8 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -5859,6 +5876,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
SWIG_fail;
}
arg5 = new wxArrayString;
temp5 = True;
int i, len=PySequence_Length(obj4);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj4, i);
@ -5901,7 +5919,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxCheckListBox, 1);
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@ -5910,7 +5928,7 @@ static PyObject *_wrap_new_CheckListBox(PyObject *self, PyObject *args, PyObject
return resultobj;
fail:
{
if (arg5) delete arg5;
if (temp5) delete arg5;
}
{
if (temp8)
@ -5961,6 +5979,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
bool result;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp9 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -6001,6 +6020,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@ -6043,7 +6063,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@ -6052,7 +6072,7 @@ static PyObject *_wrap_CheckListBox_Create(PyObject *self, PyObject *args, PyObj
return resultobj;
fail:
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp9)
@ -6569,6 +6589,7 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject
PyObject *resultobj;
wxTextAttr *arg1 = (wxTextAttr *) 0 ;
wxArrayInt *arg2 = 0 ;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@ -6583,6 +6604,7 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject
SWIG_fail;
}
arg2 = new wxArrayInt;
temp2 = True;
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@ -6601,12 +6623,12 @@ static PyObject *_wrap_TextAttr_SetTabs(PyObject *self, PyObject *args, PyObject
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}
@ -10773,6 +10795,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
bool temp3 = False ;
wxPoint temp4 ;
wxSize temp5 ;
bool temp6 = False ;
bool temp10 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -10818,6 +10841,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
SWIG_fail;
}
arg6 = new wxArrayString;
temp6 = True;
int i, len=PySequence_Length(obj5);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj5, i);
@ -10870,7 +10894,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
delete arg3;
}
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp10)
@ -10883,7 +10907,7 @@ static PyObject *_wrap_new_RadioBox(PyObject *self, PyObject *args, PyObject *kw
delete arg3;
}
{
if (arg6) delete arg6;
if (temp6) delete arg6;
}
{
if (temp10)
@ -10937,6 +10961,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
bool temp4 = False ;
wxPoint temp5 ;
wxSize temp6 ;
bool temp7 = False ;
bool temp11 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@ -10984,6 +11009,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
SWIG_fail;
}
arg7 = new wxArrayString;
temp7 = True;
int i, len=PySequence_Length(obj6);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj6, i);
@ -11036,7 +11062,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
delete arg4;
}
{
if (arg7) delete arg7;
if (temp7) delete arg7;
}
{
if (temp11)
@ -11049,7 +11075,7 @@ static PyObject *_wrap_RadioBox_Create(PyObject *self, PyObject *args, PyObject
delete arg4;
}
{
if (arg7) delete arg7;
if (temp7) delete arg7;
}
{
if (temp11)
@ -25967,6 +25993,36 @@ static PyObject *_wrap_TreeCtrl_Unselect(PyObject *self, PyObject *args, PyObjec
}
static PyObject *_wrap_TreeCtrl_UnselectItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
wxTreeItemId *arg2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_UnselectItem",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg2 == NULL) {
PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->UnselectItem((wxTreeItemId const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
@ -25992,6 +26048,44 @@ static PyObject *_wrap_TreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyOb
static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
wxTreeItemId *arg2 = 0 ;
bool arg3 = (bool) True ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "item",(char *) "select", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:TreeCtrl_SelectItem",kwnames,&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg2 == NULL) {
PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;
}
if (obj2) {
{
arg3 = (bool) SWIG_PyObj_AsBool(obj2);
if (PyErr_Occurred()) SWIG_fail;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectItem((wxTreeItemId const &)*arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_TreeCtrl_ToggleItemSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
wxTreeItemId *arg2 = 0 ;
@ -26001,7 +26095,7 @@ static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObj
(char *) "self",(char *) "item", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_SelectItem",kwnames,&obj0,&obj1)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TreeCtrl_ToggleItemSelection",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyTreeCtrl,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxTreeItemId,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg2 == NULL) {
@ -26009,7 +26103,7 @@ static PyObject *_wrap_TreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObj
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectItem((wxTreeItemId const &)*arg2);
(arg1)->ToggleItemSelection((wxTreeItemId const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@ -30119,8 +30213,10 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"TreeCtrl_CollapseAndReset", (PyCFunction) _wrap_TreeCtrl_CollapseAndReset, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_Toggle", (PyCFunction) _wrap_TreeCtrl_Toggle, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_Unselect", (PyCFunction) _wrap_TreeCtrl_Unselect, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_UnselectItem", (PyCFunction) _wrap_TreeCtrl_UnselectItem, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_UnselectAll", (PyCFunction) _wrap_TreeCtrl_UnselectAll, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_SelectItem", (PyCFunction) _wrap_TreeCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_ToggleItemSelection", (PyCFunction) _wrap_TreeCtrl_ToggleItemSelection, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_EnsureVisible", (PyCFunction) _wrap_TreeCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_ScrollTo", (PyCFunction) _wrap_TreeCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS },
{ (char *)"TreeCtrl_EditLabel", (PyCFunction) _wrap_TreeCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS },

6
wxPython/src/msw/core_wrap.cpp
View File

@ -31751,6 +31751,7 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args,
PyObject *resultobj;
wxItemContainer *arg1 = (wxItemContainer *) 0 ;
wxArrayString *arg2 = 0 ;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@ -31765,6 +31766,7 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args,
SWIG_fail;
}
arg2 = new wxArrayString;
temp2 = True;
int i, len=PySequence_Length(obj1);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj1, i);
@ -31787,12 +31789,12 @@ static PyObject *_wrap_ItemContainer_AppendItems(PyObject *self, PyObject *args,
}
Py_INCREF(Py_None); resultobj = Py_None;
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return resultobj;
fail:
{
if (arg2) delete arg2;
if (temp2) delete arg2;
}
return NULL;
}

41
wxPython/src/msw/gdi.py
View File

@ -235,6 +235,10 @@ class Pen(GDIObject):
"""GetDashes() -> PyObject"""
return _gdi.Pen_GetDashes(*args, **kwargs)
def __eq__(*args, **kwargs):
"""__eq__(Pen pen) -> bool"""
return _gdi.Pen___eq__(*args, **kwargs)
def GetDashCount(*args, **kwargs):
"""GetDashCount() -> int"""
return _gdi.Pen_GetDashCount(*args, **kwargs)
@ -2170,8 +2174,8 @@ _gdi.EncodingConverter_swigregister(EncodingConverterPtr)
def GetTranslation(*args):
"""
GetTranslation(String sz) -> String
GetTranslation(String sz1, String sz2, size_t n) -> String
GetTranslation(String str) -> String
GetTranslation(String str, String strPlural, size_t n) -> String
"""
return _gdi.GetTranslation(*args)
@ -2520,6 +2524,10 @@ class DC(core.Object):
"""
return _gdi.DC_GetMultiLineTextExtent(*args, **kwargs)
def GetPartialTextExtents(*args, **kwargs):
"""GetPartialTextExtents(String text) -> wxArrayInt"""
return _gdi.DC_GetPartialTextExtents(*args, **kwargs)
def GetSize(*args, **kwargs):
"""
GetSize() -> Size
@ -2895,16 +2903,22 @@ def MemoryDCFromDC(*args, **kwargs):
#---------------------------------------------------------------------------
BUFFER_DC_OVERWRITE_BG = _gdi.BUFFER_DC_OVERWRITE_BG
BUFFER_DC_PRESERVE_BG = _gdi.BUFFER_DC_PRESERVE_BG
BUFFER_DC_DEFAULT = _gdi.BUFFER_DC_DEFAULT
class BufferedDC(MemoryDC):
def __repr__(self):
return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(DC dc, Bitmap buffer) -> BufferedDC"""
newobj = _gdi.new_BufferedDC(*args, **kwargs)
def __init__(self, *args):
"""
__init__(DC dc, Bitmap buffer) -> BufferedDC
__init__(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -> BufferedDC
"""
newobj = _gdi.new_BufferedDC(*args)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self._dc = args[0] # save a ref so the other dc will not be deleted before self
val._dc = args[0] # save a ref so the other dc will not be deleted before self
def UnMask(*args, **kwargs):
"""UnMask()"""
@ -2918,9 +2932,9 @@ class BufferedDCPtr(BufferedDC):
self.__class__ = BufferedDC
_gdi.BufferedDC_swigregister(BufferedDCPtr)
def BufferedDCInternalBuffer(*args, **kwargs):
"""BufferedDCInternalBuffer(DC dc, Size area) -> BufferedDC"""
val = _gdi.new_BufferedDCInternalBuffer(*args, **kwargs)
def BufferedDCInternalBuffer(*args):
"""BufferedDCInternalBuffer(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -> BufferedDC"""
val = _gdi.new_BufferedDCInternalBuffer(*args)
val.thisown = 1
val._dc = args[0] # save a ref so the other dc will not be deleted before self
return val
@ -2928,9 +2942,12 @@ def BufferedDCInternalBuffer(*args, **kwargs):
class BufferedPaintDC(BufferedDC):
def __repr__(self):
return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(Window window, Bitmap buffer=NullBitmap) -> BufferedPaintDC"""
newobj = _gdi.new_BufferedPaintDC(*args, **kwargs)
def __init__(self, *args):
"""
__init__(Window window, Bitmap buffer) -> BufferedPaintDC
__init__(Window window, int flags=BUFFER_DC_DEFAULT) -> BufferedPaintDC
"""
newobj = _gdi.new_BufferedPaintDC(*args)
self.this = newobj.this
self.thisown = 1
del newobj.thisown

350
wxPython/src/msw/gdi_wrap.cpp
View File

@ -654,6 +654,11 @@ wxRect wxDC_GetClippingRect(wxDC *self){
self->GetClippingBox(rect);
return rect;
}
wxArrayInt wxDC_GetPartialTextExtents(wxDC *self,wxString const &text){
wxArrayInt widths;
self->GetPartialTextExtents(text, widths);
return widths;
}
PyObject *wxDC__DrawPointList(wxDC *self,PyObject *pyCoords,PyObject *pyPens,PyObject *pyBrushes){
return wxPyDrawXXXList(*self, wxPyDrawXXXPoint, pyCoords, pyPens, pyBrushes);
}
@ -1899,6 +1904,37 @@ static PyObject *_wrap_Pen_GetDashes(PyObject *self, PyObject *args, PyObject *k
}
static PyObject *_wrap_Pen___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPen *arg1 = (wxPen *) 0 ;
wxPen *arg2 = 0 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "pen", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Pen___eq__",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxPen,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg2 == NULL) {
PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxPen const *)arg1)->operator ==((wxPen const &)*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_Pen_GetDashCount(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPen *arg1 = (wxPen *) 0 ;
@ -13239,6 +13275,55 @@ static PyObject *_wrap_DC_GetMultiLineTextExtent(PyObject *self, PyObject *args,
}
static PyObject *_wrap_DC_GetPartialTextExtents(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
wxString *arg2 = 0 ;
wxArrayInt result;
bool temp2 = False ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "text", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_GetPartialTextExtents",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = wxString_in_helper(obj1);
if (arg2 == NULL) SWIG_fail;
temp2 = True;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = wxDC_GetPartialTextExtents(arg1,(wxString const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = PyList_New(0);
size_t idx;
for (idx = 0; idx < (&result)->GetCount(); idx += 1) {
PyObject* val = PyInt_FromLong( (&result)->Item(idx) );
PyList_Append(resultobj, val);
Py_DECREF(val);
}
}
{
if (temp2)
delete arg2;
}
return resultobj;
fail:
{
if (temp2)
delete arg2;
}
return NULL;
}
static PyObject *_wrap_DC_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
@ -15070,18 +15155,15 @@ static PyObject * MemoryDC_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
wxBitmap *arg2 = 0 ;
wxBufferedDC *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "dc",(char *) "buffer", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_BufferedDC",kwnames,&obj0,&obj1)) goto fail;
if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg2 == NULL) {
@ -15101,27 +15183,144 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args, PyObject *
}
static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
wxSize *arg2 = 0 ;
int arg3 = (int) wxBUFFER_DC_DEFAULT ;
wxBufferedDC *result;
wxSize temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "dc",(char *) "area", NULL
};
PyObject * obj2 = 0 ;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_BufferedDCInternalBuffer",kwnames,&obj0,&obj1)) goto fail;
if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
}
if (obj2) {
{
arg3 = (int) SWIG_PyObj_AsInt(obj2);
if (PyErr_Occurred()) SWIG_fail;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2);
result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedDC, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) {
int argc;
PyObject *argv[4];
int ii;
argc = PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GetItem(args,ii);
}
if (argc == 2) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxDC, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
void *ptr;
if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_BufferedDC__SWIG_0(self,args);
}
}
}
if ((argc >= 2) && (argc <= 3)) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxDC, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
_v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2);
}
if (_v) {
if (argc <= 2) {
return _wrap_new_BufferedDC__SWIG_1(self,args);
}
{
SWIG_PyObj_AsInt(argv[2]);
if (PyErr_Occurred()) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_BufferedDC__SWIG_1(self,args);
}
}
}
}
PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_BufferedDC'");
return NULL;
}
static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxDC *arg1 = (wxDC *) 0 ;
wxSize *arg2 = 0 ;
int arg3 = (int) wxBUFFER_DC_DEFAULT ;
wxBufferedDC *result;
wxSize temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDCInternalBuffer",&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
}
if (obj2) {
{
arg3 = (int) SWIG_PyObj_AsInt(obj2);
if (PyErr_Occurred()) SWIG_fail;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@ -15164,25 +15363,19 @@ static PyObject * BufferedDC_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_new_BufferedPaintDC__SWIG_0(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
wxBitmap const &arg2_defvalue = wxNullBitmap ;
wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ;
wxBitmap *arg2 = 0 ;
wxBufferedPaintDC *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "window",(char *) "buffer", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail;
if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedPaintDC",&obj0,&obj1)) 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_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg2 == NULL) {
PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;
}
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (arg2 == NULL) {
PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
@ -15198,6 +15391,106 @@ static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObj
}
static PyObject *_wrap_new_BufferedPaintDC__SWIG_1(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
int arg2 = (int) wxBUFFER_DC_DEFAULT ;
wxBufferedPaintDC *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O|O:new_BufferedPaintDC",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
if (obj1) {
{
arg2 = (int) SWIG_PyObj_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedPaintDC, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args) {
int argc;
PyObject *argv[3];
int ii;
argc = PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 2); ii++) {
argv[ii] = PyTuple_GetItem(args,ii);
}
if ((argc >= 1) && (argc <= 2)) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
if (argc <= 1) {
return _wrap_new_BufferedPaintDC__SWIG_1(self,args);
}
{
SWIG_PyObj_AsInt(argv[1]);
if (PyErr_Occurred()) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_BufferedPaintDC__SWIG_1(self,args);
}
}
}
if (argc == 2) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
void *ptr;
if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_BufferedPaintDC__SWIG_0(self,args);
}
}
}
PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_BufferedPaintDC'");
return NULL;
}
static PyObject * BufferedPaintDC_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
@ -18247,6 +18540,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Pen_SetWidth", (PyCFunction) _wrap_Pen_SetWidth, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Pen_SetDashes", (PyCFunction) _wrap_Pen_SetDashes, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Pen_GetDashes", (PyCFunction) _wrap_Pen_GetDashes, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Pen___eq__", (PyCFunction) _wrap_Pen___eq__, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Pen_GetDashCount", (PyCFunction) _wrap_Pen_GetDashCount, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Pen_GetStipple", (PyCFunction) _wrap_Pen_GetStipple, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Pen_SetStipple", (PyCFunction) _wrap_Pen_SetStipple, METH_VARARGS | METH_KEYWORDS },
@ -18593,6 +18887,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"DC_GetTextExtent", (PyCFunction) _wrap_DC_GetTextExtent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetFullTextExtent", (PyCFunction) _wrap_DC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetMultiLineTextExtent", (PyCFunction) _wrap_DC_GetMultiLineTextExtent, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetPartialTextExtents", (PyCFunction) _wrap_DC_GetPartialTextExtents, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetSize", (PyCFunction) _wrap_DC_GetSize, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetSizeTuple", (PyCFunction) _wrap_DC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS },
{ (char *)"DC_GetSizeMM", (PyCFunction) _wrap_DC_GetSizeMM, METH_VARARGS | METH_KEYWORDS },
@ -18654,11 +18949,11 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS },
{ (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS },
{ (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS },
{ (char *)"new_BufferedDC", (PyCFunction) _wrap_new_BufferedDC, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_BufferedDCInternalBuffer", (PyCFunction) _wrap_new_BufferedDCInternalBuffer, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS },
{ (char *)"new_BufferedDCInternalBuffer", _wrap_new_BufferedDCInternalBuffer, METH_VARARGS },
{ (char *)"BufferedDC_UnMask", (PyCFunction) _wrap_BufferedDC_UnMask, METH_VARARGS | METH_KEYWORDS },
{ (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS },
{ (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_BufferedPaintDC", _wrap_new_BufferedPaintDC, METH_VARARGS },
{ (char *)"BufferedPaintDC_swigregister", BufferedPaintDC_swigregister, METH_VARARGS },
{ (char *)"new_ScreenDC", (PyCFunction) _wrap_new_ScreenDC, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS },
@ -19669,6 +19964,9 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"PLATFORM_WINDOWS", SWIG_PyObj_FromInt((int)wxPLATFORM_WINDOWS));
PyDict_SetItemString(d,"PLATFORM_OS2", SWIG_PyObj_FromInt((int)wxPLATFORM_OS2));
PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_PyObj_FromInt((int)wxPLATFORM_MAC));
PyDict_SetItemString(d,"BUFFER_DC_OVERWRITE_BG", SWIG_PyObj_FromInt((int)wxBUFFER_DC_OVERWRITE_BG));
PyDict_SetItemString(d,"BUFFER_DC_PRESERVE_BG", SWIG_PyObj_FromInt((int)wxBUFFER_DC_PRESERVE_BG));
PyDict_SetItemString(d,"BUFFER_DC_DEFAULT", SWIG_PyObj_FromInt((int)wxBUFFER_DC_DEFAULT));
PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_NORMAL));
PyDict_SetItemString(d,"IMAGELIST_DRAW_TRANSPARENT", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_TRANSPARENT));
PyDict_SetItemString(d,"IMAGELIST_DRAW_SELECTED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_SELECTED));

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

@ -8586,6 +8586,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj
wxArrayString *arg3 = 0 ;
long *arg4 = (long *) 0 ;
long *arg5 = (long *) 0 ;
bool temp3 = False ;
long temp4 ;
long temp5 ;
PyObject * obj0 = 0 ;
@ -8609,6 +8610,7 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj
SWIG_fail;
}
arg3 = new wxArrayString;
temp3 = True;
int i, len=PySequence_Length(obj2);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj2, i);
@ -8639,12 +8641,12 @@ static PyObject *_wrap_Grid_GetTextBoxSize(PyObject *self, PyObject *args, PyObj
resultobj = t_output_helper(resultobj,o);
}
{
if (arg3) delete arg3;
if (temp3) delete arg3;
}
return resultobj;
fail:
{
if (arg3) delete arg3;
if (temp3) delete arg3;
}
return NULL;
}

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

@ -1056,6 +1056,18 @@ class HtmlWindow(windows.ScrolledWindow):
return _html.HtmlWindow_AddFilter(*args, **kwargs)
AddFilter = staticmethod(AddFilter)
def SelectWord(*args, **kwargs):
"""SelectWord(Point pos)"""
return _html.HtmlWindow_SelectWord(*args, **kwargs)
def SelectLine(*args, **kwargs):
"""SelectLine(Point pos)"""
return _html.HtmlWindow_SelectLine(*args, **kwargs)
def SelectAll(*args, **kwargs):
"""SelectAll()"""
return _html.HtmlWindow_SelectAll(*args, **kwargs)
def base_OnLinkClicked(*args, **kwargs):
"""base_OnLinkClicked(HtmlLinkInfo link)"""
return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)

89
wxPython/src/msw/html_wrap.cpp
View File

@ -6566,6 +6566,92 @@ static PyObject *_wrap_HtmlWindow_AddFilter(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_HtmlWindow_SelectWord(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxPoint *arg2 = 0 ;
wxPoint temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "pos", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SelectWord",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectWord((wxPoint const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_HtmlWindow_SelectLine(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxPoint *arg2 = 0 ;
wxPoint temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "pos", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindow_SelectLine",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = &temp2;
if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectLine((wxPoint const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectAll",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxPyHtmlWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SelectAll();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
@ -10217,6 +10303,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HtmlWindow_ScrollToAnchor", (PyCFunction) _wrap_HtmlWindow_ScrollToAnchor, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_HasAnchor", (PyCFunction) _wrap_HtmlWindow_HasAnchor, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_AddFilter", (PyCFunction) _wrap_HtmlWindow_AddFilter, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS },

14
wxPython/src/msw/misc_wrap.cpp
View File

@ -11665,6 +11665,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args,
PyObject *resultobj;
wxArrayString *arg1 = 0 ;
wxFileTypeInfo *result;
bool temp1 = False ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "sArray", NULL
@ -11677,6 +11678,7 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args,
SWIG_fail;
}
arg1 = new wxArrayString;
temp1 = True;
int i, len=PySequence_Length(obj0);
for (i=0; i<len; i++) {
PyObject* item = PySequence_GetItem(obj0, i);
@ -11699,12 +11701,12 @@ static PyObject *_wrap_new_FileTypeInfoSequence(PyObject *self, PyObject *args,
}
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFileTypeInfo, 1);
{
if (arg1) delete arg1;
if (temp1) delete arg1;
}
return resultobj;
fail:
{
if (arg1) delete arg1;
if (temp1) delete arg1;
}
return NULL;
}
@ -23453,12 +23455,12 @@ static PyObject *_wrap_DataFormat___eq____SWIG_0(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___eq__",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = (int) SWIG_PyObj_AsInt(obj1);
arg2 = (wxDataFormatId) SWIG_PyObj_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxDataFormat const *)arg1)->operator ==(arg2);
result = (bool)((wxDataFormat const *)arg1)->operator ==((wxDataFormatId )arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@ -23481,12 +23483,12 @@ static PyObject *_wrap_DataFormat___ne____SWIG_0(PyObject *self, PyObject *args)
if(!PyArg_ParseTuple(args,(char *)"OO:DataFormat___ne__",&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDataFormat,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
{
arg2 = (int) SWIG_PyObj_AsInt(obj1);
arg2 = (wxDataFormatId) SWIG_PyObj_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxDataFormat const *)arg1)->operator !=(arg2);
result = (bool)((wxDataFormat const *)arg1)->operator !=((wxDataFormatId )arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;

9
wxPython/src/msw/windows.py
View File

@ -2661,6 +2661,7 @@ PRINT_MODE_NONE = _windows.PRINT_MODE_NONE
PRINT_MODE_PREVIEW = _windows.PRINT_MODE_PREVIEW
PRINT_MODE_FILE = _windows.PRINT_MODE_FILE
PRINT_MODE_PRINTER = _windows.PRINT_MODE_PRINTER
PRINT_MODE_STREAM = _windows.PRINT_MODE_STREAM
class PrintData(core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@ -2840,6 +2841,14 @@ class PrintData(core.Object):
"""SetPrintMode(int printMode)"""
return _windows.PrintData_SetPrintMode(*args, **kwargs)
def GetOutputStream(*args, **kwargs):
"""GetOutputStream() -> OutputStream"""
return _windows.PrintData_GetOutputStream(*args, **kwargs)
def SetOutputStream(*args, **kwargs):
"""SetOutputStream(OutputStream outputstream)"""
return _windows.PrintData_SetOutputStream(*args, **kwargs)
def __nonzero__(self): return self.Ok()
class PrintDataPtr(PrintData):

126
wxPython/src/msw/windows_wrap.cpp
View File

File diff suppressed because one or more lines are too long

1
wxPython/wxPython/windows.py
View File

@ -231,6 +231,7 @@ wxPRINT_MODE_NONE = wx.windows.PRINT_MODE_NONE
wxPRINT_MODE_PREVIEW = wx.windows.PRINT_MODE_PREVIEW
wxPRINT_MODE_FILE = wx.windows.PRINT_MODE_FILE
wxPRINT_MODE_PRINTER = wx.windows.PRINT_MODE_PRINTER
wxPRINT_MODE_STREAM = wx.windows.PRINT_MODE_STREAM
wxPrintData = wx.windows.PrintData
wxPrintDataPtr = wx.windows.PrintDataPtr
wxPageSetupDialogData = wx.windows.PageSetupDialogData