reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-09-21 17:00:37 +00:00
parent 74c8720e3b
commit 79df624ab9
18 changed files with 297 additions and 63 deletions

View File

@@ -5232,9 +5232,11 @@ _gdi_.Effects_swigregister(Effects)
CONTROL_DISABLED = _gdi_.CONTROL_DISABLED
CONTROL_FOCUSED = _gdi_.CONTROL_FOCUSED
CONTROL_PRESSED = _gdi_.CONTROL_PRESSED
CONTROL_SPECIAL = _gdi_.CONTROL_SPECIAL
CONTROL_ISDEFAULT = _gdi_.CONTROL_ISDEFAULT
CONTROL_ISSUBMENU = _gdi_.CONTROL_ISSUBMENU
CONTROL_EXPANDED = _gdi_.CONTROL_EXPANDED
CONTROL_SIZEGRIP = _gdi_.CONTROL_SIZEGRIP
CONTROL_CURRENT = _gdi_.CONTROL_CURRENT
CONTROL_SELECTED = _gdi_.CONTROL_SELECTED
CONTROL_CHECKED = _gdi_.CONTROL_CHECKED

View File

@@ -33853,9 +33853,11 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "CONTROL_DISABLED",SWIG_From_int(static_cast< int >(wxCONTROL_DISABLED)));
SWIG_Python_SetConstant(d, "CONTROL_FOCUSED",SWIG_From_int(static_cast< int >(wxCONTROL_FOCUSED)));
SWIG_Python_SetConstant(d, "CONTROL_PRESSED",SWIG_From_int(static_cast< int >(wxCONTROL_PRESSED)));
SWIG_Python_SetConstant(d, "CONTROL_SPECIAL",SWIG_From_int(static_cast< int >(wxCONTROL_SPECIAL)));
SWIG_Python_SetConstant(d, "CONTROL_ISDEFAULT",SWIG_From_int(static_cast< int >(wxCONTROL_ISDEFAULT)));
SWIG_Python_SetConstant(d, "CONTROL_ISSUBMENU",SWIG_From_int(static_cast< int >(wxCONTROL_ISSUBMENU)));
SWIG_Python_SetConstant(d, "CONTROL_EXPANDED",SWIG_From_int(static_cast< int >(wxCONTROL_EXPANDED)));
SWIG_Python_SetConstant(d, "CONTROL_SIZEGRIP",SWIG_From_int(static_cast< int >(wxCONTROL_SIZEGRIP)));
SWIG_Python_SetConstant(d, "CONTROL_CURRENT",SWIG_From_int(static_cast< int >(wxCONTROL_CURRENT)));
SWIG_Python_SetConstant(d, "CONTROL_SELECTED",SWIG_From_int(static_cast< int >(wxCONTROL_SELECTED)));
SWIG_Python_SetConstant(d, "CONTROL_CHECKED",SWIG_From_int(static_cast< int >(wxCONTROL_CHECKED)));

View File

@@ -1109,7 +1109,7 @@ class Grid(_windows.ScrolledWindow):
"""
__init__(self, Window parent, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize, long style=WANTS_CHARS,
String name=PanelNameStr) -> Grid
String name=wxPyGridNameStr) -> Grid
"""
_grid.Grid_swiginit(self,_grid.new_Grid(*args, **kwargs))
self._setOORInfo(self)
@@ -1118,7 +1118,7 @@ class Grid(_windows.ScrolledWindow):
"""
Create(self, Window parent, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize, long style=WANTS_CHARS,
String name=PanelNameStr) -> bool
String name=wxPyGridNameStr) -> bool
"""
return _grid.Grid_Create(*args, **kwargs)

View File

@@ -2761,7 +2761,7 @@ namespace swig {
static const wxString wxPyEmptyString(wxEmptyString);
static const wxString wxPyPanelNameStr(wxPanelNameStr);
static const wxString wxPyGridNameStr(wxGridNameStr);
static const wxString wxPyDefaultDateTimeFormat(wxDefaultDateTimeFormat);
@@ -10218,7 +10218,7 @@ SWIGINTERN PyObject *_wrap_new_Grid(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
wxSize const &arg4_defvalue = wxDefaultSize ;
wxSize *arg4 = (wxSize *) &arg4_defvalue ;
long arg5 = (long) wxWANTS_CHARS ;
wxString const &arg6_defvalue = wxPyPanelNameStr ;
wxString const &arg6_defvalue = wxPyGridNameStr ;
wxString *arg6 = (wxString *) &arg6_defvalue ;
wxGrid *result = 0 ;
void *argp1 = 0 ;
@@ -10330,7 +10330,7 @@ SWIGINTERN PyObject *_wrap_Grid_Create(PyObject *SWIGUNUSEDPARM(self), PyObject
wxSize const &arg5_defvalue = wxDefaultSize ;
wxSize *arg5 = (wxSize *) &arg5_defvalue ;
long arg6 = (long) wxWANTS_CHARS ;
wxString const &arg7_defvalue = wxPyPanelNameStr ;
wxString const &arg7_defvalue = wxPyGridNameStr ;
wxString *arg7 = (wxString *) &arg7_defvalue ;
bool result;
void *argp1 = 0 ;

View File

@@ -1135,6 +1135,14 @@ class RichTextCtrl(_windows.ScrolledWindow):
"""SetSelectionRange(self, RichTextRange range)"""
return _richtext.RichTextCtrl_SetSelectionRange(*args, **kwargs)
def GetInternalSelectionRange(*args, **kwargs):
"""GetInternalSelectionRange(self) -> RichTextRange"""
return _richtext.RichTextCtrl_GetInternalSelectionRange(*args, **kwargs)
def SetInternalSelectionRange(*args, **kwargs):
"""SetInternalSelectionRange(self, RichTextRange range)"""
return _richtext.RichTextCtrl_SetInternalSelectionRange(*args, **kwargs)
def AddParagraph(*args, **kwargs):
"""AddParagraph(self, String text) -> RichTextRange"""
return _richtext.RichTextCtrl_AddParagraph(*args, **kwargs)

View File

@@ -7259,7 +7259,7 @@ SWIGINTERN PyObject *_wrap_RichTextCtrl_GetStyle(PyObject *SWIGUNUSEDPARM(self),
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RichTextCtrl_GetStyle",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_GetStyle" "', expected argument " "1"" of type '" "wxRichTextCtrl const *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_GetStyle" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'");
}
arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1);
ecode2 = SWIG_AsVal_long(obj1, &val2);
@@ -7277,7 +7277,7 @@ SWIGINTERN PyObject *_wrap_RichTextCtrl_GetStyle(PyObject *SWIGUNUSEDPARM(self),
arg3 = reinterpret_cast< wxRichTextAttr * >(argp3);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxRichTextCtrl const *)arg1)->GetStyle(arg2,*arg3);
result = (bool)(arg1)->GetStyle(arg2,*arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -9740,7 +9740,7 @@ fail:
SWIGINTERN PyObject *_wrap_RichTextCtrl_GetSelectionRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ;
wxRichTextRange *result = 0 ;
wxRichTextRange result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -9754,14 +9754,11 @@ SWIGINTERN PyObject *_wrap_RichTextCtrl_GetSelectionRange(PyObject *SWIGUNUSEDPA
arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRichTextRange const &_result_ref = ((wxRichTextCtrl const *)arg1)->GetSelectionRange();
result = (wxRichTextRange *) &_result_ref;
}
result = ((wxRichTextCtrl const *)arg1)->GetSelectionRange();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRichTextRange, 0 | 0 );
resultobj = SWIG_NewPointerObj((new wxRichTextRange(static_cast< const wxRichTextRange& >(result))), SWIGTYPE_p_wxRichTextRange, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@@ -9804,6 +9801,73 @@ fail:
}
SWIGINTERN PyObject *_wrap_RichTextCtrl_GetInternalSelectionRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ;
wxRichTextRange *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_GetInternalSelectionRange" "', expected argument " "1"" of type '" "wxRichTextCtrl const *""'");
}
arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxRichTextRange const &_result_ref = ((wxRichTextCtrl const *)arg1)->GetInternalSelectionRange();
result = (wxRichTextRange *) &_result_ref;
}
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxRichTextRange, 0 | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_RichTextCtrl_SetInternalSelectionRange(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ;
wxRichTextRange *arg2 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
wxRichTextRange temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "range", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RichTextCtrl_SetInternalSelectionRange",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_SetInternalSelectionRange" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'");
}
arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1);
{
arg2 = &temp2;
if ( ! wxRichTextRange_helper(obj1, &arg2)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetInternalSelectionRange((wxRichTextRange const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_RichTextCtrl_AddParagraph(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxRichTextCtrl *arg1 = (wxRichTextCtrl *) 0 ;
@@ -11020,12 +11084,12 @@ SWIGINTERN PyObject *_wrap_RichTextCtrl_IsSelectionBold(PyObject *SWIGUNUSEDPARM
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_IsSelectionBold" "', expected argument " "1"" of type '" "wxRichTextCtrl const *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_IsSelectionBold" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'");
}
arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxRichTextCtrl const *)arg1)->IsSelectionBold();
result = (bool)(arg1)->IsSelectionBold();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -11050,12 +11114,12 @@ SWIGINTERN PyObject *_wrap_RichTextCtrl_IsSelectionItalics(PyObject *SWIGUNUSEDP
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_IsSelectionItalics" "', expected argument " "1"" of type '" "wxRichTextCtrl const *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_IsSelectionItalics" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'");
}
arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxRichTextCtrl const *)arg1)->IsSelectionItalics();
result = (bool)(arg1)->IsSelectionItalics();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -11080,12 +11144,12 @@ SWIGINTERN PyObject *_wrap_RichTextCtrl_IsSelectionUnderlined(PyObject *SWIGUNUS
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_IsSelectionUnderlined" "', expected argument " "1"" of type '" "wxRichTextCtrl const *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_IsSelectionUnderlined" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'");
}
arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxRichTextCtrl const *)arg1)->IsSelectionUnderlined();
result = (bool)(arg1)->IsSelectionUnderlined();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -11116,7 +11180,7 @@ SWIGINTERN PyObject *_wrap_RichTextCtrl_IsSelectionAligned(PyObject *SWIGUNUSEDP
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RichTextCtrl_IsSelectionAligned",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRichTextCtrl, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_IsSelectionAligned" "', expected argument " "1"" of type '" "wxRichTextCtrl const *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RichTextCtrl_IsSelectionAligned" "', expected argument " "1"" of type '" "wxRichTextCtrl *""'");
}
arg1 = reinterpret_cast< wxRichTextCtrl * >(argp1);
ecode2 = SWIG_AsVal_int(obj1, &val2);
@@ -11126,7 +11190,7 @@ SWIGINTERN PyObject *_wrap_RichTextCtrl_IsSelectionAligned(PyObject *SWIGUNUSEDP
arg2 = static_cast< wxTextAttrAlignment >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxRichTextCtrl const *)arg1)->IsSelectionAligned(arg2);
result = (bool)(arg1)->IsSelectionAligned(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -11724,6 +11788,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RichTextCtrl_SelectNone", (PyCFunction)_wrap_RichTextCtrl_SelectNone, METH_O, NULL},
{ (char *)"RichTextCtrl_GetSelectionRange", (PyCFunction)_wrap_RichTextCtrl_GetSelectionRange, METH_O, NULL},
{ (char *)"RichTextCtrl_SetSelectionRange", (PyCFunction) _wrap_RichTextCtrl_SetSelectionRange, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RichTextCtrl_GetInternalSelectionRange", (PyCFunction)_wrap_RichTextCtrl_GetInternalSelectionRange, METH_O, NULL},
{ (char *)"RichTextCtrl_SetInternalSelectionRange", (PyCFunction) _wrap_RichTextCtrl_SetInternalSelectionRange, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RichTextCtrl_AddParagraph", (PyCFunction) _wrap_RichTextCtrl_AddParagraph, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RichTextCtrl_AddImage", (PyCFunction) _wrap_RichTextCtrl_AddImage, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RichTextCtrl_LayoutContent", (PyCFunction) _wrap_RichTextCtrl_LayoutContent, METH_VARARGS | METH_KEYWORDS, NULL},