Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More changes to make the autodocs be better, made all the namestrings

Browse Source 
and such be visible to swig so the autodoc generator knows how to
rename them.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-12-20 01:01:49 +00:00
parent 161c73a392
commit b2dc104421
81 changed files with 1852 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wxPython/contrib/glcanvas/glcanvas.i
View File

@@ -19,8 +19,6 @@
#include <wx/glcanvas.h>
static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas"));
static const wxString wxPyEmptyString(wxT(""));
%}
//---------------------------------------------------------------------------
@@ -28,6 +26,11 @@
%import core.i
%pythoncode { wx = core }
MAKE_CONST_WXSTRING2(GLCanvasNameStr, "GLCanvas");
MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
%include _glcanvas_rename.i
//---------------------------------------------------------------------------

9
wxPython/contrib/glcanvas/gtk/glcanvas.py
View File

@@ -62,6 +62,8 @@ class GLContextPtr(GLContext):
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = GLContext
_glcanvas.GLContext_swigregister(GLContextPtr)
cvar = _glcanvas.cvar
GLCanvasNameStr = cvar.GLCanvasNameStr
WX_GL_RGBA = _glcanvas.WX_GL_RGBA
WX_GL_BUFFER_SIZE = _glcanvas.WX_GL_BUFFER_SIZE
@@ -85,9 +87,8 @@ class GLCanvas(core.Window):
def __init__(self, *args, **kwargs):
"""
__init__(Window parent, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize, long style=0, String name=wxPyGLCanvasNameStr,
int attribList=None,
wxPalette palette=wxNullPalette) -> GLCanvas
Size size=DefaultSize, long style=0, String name=GLCanvasNameStr,
int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
"""
newobj = _glcanvas.new_GLCanvas(*args, **kwargs)
self.this = newobj.this
@@ -123,7 +124,7 @@ def wxGLCanvasWithContext(*args, **kwargs):
"""
wxGLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize,
long style=0, String name=wxPyGLCanvasNameStr,
long style=0, String name=GLCanvasNameStr,
int attribList=None, wxPalette palette=wxNullPalette) -> GLCanvas
"""
val = _glcanvas.new_wxGLCanvasWithContext(*args, **kwargs)

26
wxPython/contrib/glcanvas/gtk/glcanvas_wrap.cpp
View File

@@ -234,12 +234,32 @@ static swig_type_info *swig_types[9];
#include <wx/glcanvas.h>
static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas"));
static const wxString wxPyEmptyString(wxT(""));
static const wxString wxPyGLCanvasNameStr(wxT("GLCanvas"));
static const wxString wxPyEmptyString(wxEmptyString);
#ifdef __cplusplus
extern "C" {
#endif
static int _wrap_GLCanvasNameStr_set(PyObject *_val) {
PyErr_SetString(PyExc_TypeError,"Variable GLCanvasNameStr is read-only.");
return 1;
}
static PyObject *_wrap_GLCanvasNameStr_get() {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyGLCanvasNameStr)->c_str(), (&wxPyGLCanvasNameStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyGLCanvasNameStr)->c_str(), (&wxPyGLCanvasNameStr)->Len());
#endif
}
return pyobj;
}
static PyObject *_wrap_new_GLContext(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
bool arg1 ;
@@ -1214,6 +1234,8 @@ SWIGEXPORT(void) SWIG_init(void) {
}
SWIG_InstallConstants(d,swig_const_table);
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"GLCanvasNameStr",_wrap_GLCanvasNameStr_get, _wrap_GLCanvasNameStr_set);