From: Robin Dunn Date: Sat, 4 Sep 2004 18:48:31 +0000 (+0000) Subject: reSWIGed X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/01ac03ba5c9db52ba5cba9208e32abe832ce1d34?ds=inline reSWIGed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index b9c60cbeec..a557e5316d 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -241,6 +241,18 @@ def GetCurrentId(*args, **kwargs): """GetCurrentId() -> long""" return _misc_.GetCurrentId(*args, **kwargs) +def wxIsStockID(*args, **kwargs): + """wxIsStockID(int id) -> bool""" + return _misc_.wxIsStockID(*args, **kwargs) + +def wxIsStockLabel(*args, **kwargs): + """wxIsStockLabel(int id, String label) -> bool""" + return _misc_.wxIsStockLabel(*args, **kwargs) + +def wxGetStockLabel(*args, **kwargs): + """wxGetStockLabel(int id) -> String""" + return _misc_.wxGetStockLabel(*args, **kwargs) + def Bell(*args, **kwargs): """Bell()""" return _misc_.Bell(*args, **kwargs) diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index b1e811ac13..c8d3d70ae8 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -422,6 +422,9 @@ SWIG_CheckInt(PyObject* obj) } } + +#include + static const wxString wxPyFileSelectorPromptStr(wxFileSelectorPromptStr); static const wxString wxPyFileSelectorDefaultWildcardStr(wxFileSelectorDefaultWildcardStr); static const wxString wxPyDirSelectorPromptStr(wxDirSelectorPromptStr); @@ -2165,6 +2168,110 @@ static PyObject *_wrap_GetCurrentId(PyObject *self, PyObject *args, PyObject *kw } +static PyObject *_wrap_wxIsStockID(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 ; + bool result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "id", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxIsStockID",kwnames,&obj0)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxIsStockID(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_wxIsStockLabel(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 ; + wxString *arg2 = 0 ; + bool result; + bool temp2 = False ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "id",(char *) "label", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:wxIsStockLabel",kwnames,&obj0,&obj1)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = True; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)wxIsStockLabel(arg1,(wxString const &)*arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + { + if (temp2) + delete arg2; + } + return resultobj; + fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + +static PyObject *_wrap_wxGetStockLabel(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + int arg1 ; + wxString result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "id", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:wxGetStockLabel",kwnames,&obj0)) goto fail; + arg1 = (int) SWIG_AsInt(obj0); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = wxGetStockLabel(arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { +#if wxUSE_UNICODE + resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +#else + resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +#endif + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Bell(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; char *kwnames[] = { @@ -28312,6 +28419,9 @@ static PyMethodDef SwigMethods[] = { { (char *)"NewId", (PyCFunction) _wrap_NewId, METH_VARARGS | METH_KEYWORDS }, { (char *)"RegisterId", (PyCFunction) _wrap_RegisterId, METH_VARARGS | METH_KEYWORDS }, { (char *)"GetCurrentId", (PyCFunction) _wrap_GetCurrentId, METH_VARARGS | METH_KEYWORDS }, + { (char *)"wxIsStockID", (PyCFunction) _wrap_wxIsStockID, METH_VARARGS | METH_KEYWORDS }, + { (char *)"wxIsStockLabel", (PyCFunction) _wrap_wxIsStockLabel, METH_VARARGS | METH_KEYWORDS }, + { (char *)"wxGetStockLabel", (PyCFunction) _wrap_wxGetStockLabel, METH_VARARGS | METH_KEYWORDS }, { (char *)"Bell", (PyCFunction) _wrap_Bell, METH_VARARGS | METH_KEYWORDS }, { (char *)"EndBusyCursor", (PyCFunction) _wrap_EndBusyCursor, METH_VARARGS | METH_KEYWORDS }, { (char *)"GetElapsedTime", (PyCFunction) _wrap_GetElapsedTime, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 46f2ba6f1b..42e5e3c1a5 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -27,6 +27,8 @@ class Panel(_core.Window): Create(self, Window parent, int id=-1, Point pos=DefaultPosition, Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, String name=PanelNameStr) -> bool + + Create the GUI part of the Window for 2-phase creation mode. """ return _windows_.Panel_Create(*args, **kwargs) @@ -110,6 +112,8 @@ class ScrolledWindow(Panel): Create(self, Window parent, int id=-1, Point pos=DefaultPosition, Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, String name=PanelNameStr) -> bool + + Create the GUI part of the Window for 2-phase creation mode. """ return _windows_.ScrolledWindow_Create(*args, **kwargs) @@ -1762,7 +1766,14 @@ class VScrolledWindow(Panel): return _windows_.VScrolledWindow_ScrollToLine(*args, **kwargs) def ScrollLines(*args, **kwargs): - """ScrollLines(self, int lines) -> bool""" + """ + ScrollLines(self, int lines) -> bool + + If the platform and window class supports it, scrolls the window by + the given number of lines down, if lines is positive, or up if lines + is negative. Returns True if the window was scrolled, False if it was + already on top/bottom and nothing was done. + """ return _windows_.VScrolledWindow_ScrollLines(*args, **kwargs) def ScrollPages(*args, **kwargs): diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py index a24d8799e9..d2b3215013 100644 --- a/wxPython/src/mac/grid.py +++ b/wxPython/src/mac/grid.py @@ -1655,6 +1655,10 @@ class Grid(_windows.ScrolledWindow): """SetColAttr(self, int col, GridCellAttr attr)""" return _grid.Grid_SetColAttr(*args, **kwargs) + def GetOrCreateCellAttr(*args, **kwargs): + """GetOrCreateCellAttr(self, int row, int col) -> GridCellAttr""" + return _grid.Grid_GetOrCreateCellAttr(*args, **kwargs) + def SetColFormatBool(*args, **kwargs): """SetColFormatBool(self, int col)""" return _grid.Grid_SetColFormatBool(*args, **kwargs) diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp index d8d3ff2c8d..2586a3bfd8 100644 --- a/wxPython/src/mac/grid_wrap.cpp +++ b/wxPython/src/mac/grid_wrap.cpp @@ -11438,6 +11438,42 @@ static PyObject *_wrap_Grid_SetColAttr(PyObject *self, PyObject *args, PyObject } +static PyObject *_wrap_Grid_GetOrCreateCellAttr(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxGrid *arg1 = (wxGrid *) 0 ; + int arg2 ; + int arg3 ; + wxGridCellAttr *result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "row",(char *) "col", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Grid_GetOrCreateCellAttr",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid, + SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail; + arg2 = (int) SWIG_AsInt(obj1); + if (PyErr_Occurred()) SWIG_fail; + arg3 = (int) SWIG_AsInt(obj2); + if (PyErr_Occurred()) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxGridCellAttr *)((wxGrid const *)arg1)->GetOrCreateCellAttr(arg2,arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = wxPyMake_wxGridCellAttr(result, 0); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_Grid_SetColFormatBool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxGrid *arg1 = (wxGrid *) 0 ; @@ -16043,6 +16079,7 @@ static PyMethodDef SwigMethods[] = { { (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 }, + { (char *)"Grid_GetOrCreateCellAttr", (PyCFunction) _wrap_Grid_GetOrCreateCellAttr, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_SetColFormatBool", (PyCFunction) _wrap_Grid_SetColFormatBool, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_SetColFormatNumber", (PyCFunction) _wrap_Grid_SetColFormatNumber, METH_VARARGS | METH_KEYWORDS }, { (char *)"Grid_SetColFormatFloat", (PyCFunction) _wrap_Grid_SetColFormatFloat, METH_VARARGS | METH_KEYWORDS },