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

some fixes and code regeneration

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-02-01 21:36:20 +00:00
parent 0c3d4bfdcf
commit e02c03a42e
30 changed files with 838 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
utils/wxPython/modules/html/html.cpp
View File

@@ -213,13 +213,8 @@ public:
const wxString& name = "htmlWindow")
: wxHtmlWindow(parent, id, pos, size, style, name) {};
#ifdef POST_2_1_12
void OnLinkClicked(const wxHtmlLinkInfo& link);
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
#else
void OnLinkClicked(wxHtmlLinkInfo* link);
void base_OnLinkClicked(wxHtmlLinkInfo* link);
#endif
DEC_PYCALLBACK__STRING(OnSetTitle);
PYPRIVATE;
@@ -228,29 +223,17 @@ public:
IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
#ifdef POST_2_1_12
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
#else
void wxPyHtmlWindow::OnLinkClicked(wxHtmlLinkInfo* link) {
#endif
bool doSave = wxPyRestoreThread();
if (m_myInst.findCallback("OnLinkClicked")) {
#ifdef POST_2_1_12
PyObject* obj = wxPyConstructObject((void*)&link, "wxHtmlLinkInfo");
#else
PyObject* obj = wxPyConstructObject(link, "wxHtmlLinkInfo");
#endif
m_myInst.callCallback(Py_BuildValue("(O)", obj));
}
else
wxHtmlWindow::OnLinkClicked(link);
wxPySaveThread(doSave);
}
#ifdef POST_2_1_12
void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) {
#else
void wxPyHtmlWindow::base_OnLinkClicked(wxHtmlLinkInfo* link) {
#endif
wxHtmlWindow::OnLinkClicked(link);
}
@@ -386,7 +369,7 @@ static PyObject *_wrap_wxHtmlLinkInfo_GetHref(PyObject *self, PyObject *args, Py
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST *(_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
delete _result;
@@ -418,7 +401,7 @@ static PyObject *_wrap_wxHtmlLinkInfo_GetTarget(PyObject *self, PyObject *args,
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST *(_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
delete _result;
@@ -426,6 +409,74 @@ static PyObject *_wrap_wxHtmlLinkInfo_GetTarget(PyObject *self, PyObject *args,
return _resultobj;
}
#define wxHtmlLinkInfo_GetEvent(_swigobj) (_swigobj->GetEvent())
static PyObject *_wrap_wxHtmlLinkInfo_GetEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxMouseEvent * _result;
wxHtmlLinkInfo * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlLinkInfo_GetEvent",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlLinkInfo_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlLinkInfo_GetEvent. Expected _wxHtmlLinkInfo_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxMouseEvent *)wxHtmlLinkInfo_GetEvent(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxMouseEvent_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxHtmlLinkInfo_GetHtmlCell(_swigobj) (_swigobj->GetHtmlCell())
static PyObject *_wrap_wxHtmlLinkInfo_GetHtmlCell(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxHtmlCell * _result;
wxHtmlLinkInfo * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlLinkInfo_GetHtmlCell",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlLinkInfo_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlLinkInfo_GetHtmlCell. Expected _wxHtmlLinkInfo_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxHtmlCell *)wxHtmlLinkInfo_GetHtmlCell(_arg0);
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxHtmlTag_GetName(_swigobj) (_swigobj->GetName())
static PyObject *_wrap_wxHtmlTag_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -450,7 +501,7 @@ static PyObject *_wrap_wxHtmlTag_GetName(PyObject *self, PyObject *args, PyObjec
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST *(_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
delete _result;
@@ -532,7 +583,7 @@ static PyObject *_wrap_wxHtmlTag_GetParam(PyObject *self, PyObject *args, PyObje
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST *(_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
if (_obj1)
@@ -568,7 +619,7 @@ static PyObject *_wrap_wxHtmlTag_GetAllParams(PyObject *self, PyObject *args, Py
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST *(_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
delete _result;
@@ -984,7 +1035,7 @@ static PyObject *_wrap_wxHtmlParser_GetSource(PyObject *self, PyObject *args, Py
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST (*_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
return _resultobj;
}
@@ -1275,11 +1326,11 @@ static PyObject *_wrap_wxHtmlWinParser_SetFonts(PyObject *self, PyObject *args,
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
PyObject * _argo3 = 0;
char *_kwnames[] = { "self","normal_face","fixed_face","LIST", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxHtmlWinParser_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxHtmlWinParser_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_argo3))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1302,12 +1353,13 @@ static PyObject *_wrap_wxHtmlWinParser_SetFonts(PyObject *self, PyObject *args,
}
_arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
}
{
_arg3 = int_LIST_helper(_obj3);
if (_arg3 == NULL) {
if (_argo3) {
if (_argo3 == Py_None) { _arg3 = NULL; }
else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_int_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxHtmlWinParser_SetFonts. Expected _int_p.");
return NULL;
}
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxHtmlWinParser_SetFonts(_arg0,*_arg1,*_arg2,_arg3);
@@ -1322,9 +1374,6 @@ static PyObject *_wrap_wxHtmlWinParser_SetFonts(PyObject *self, PyObject *args,
{
if (_obj2)
delete _arg2;
}
{
delete [] _arg3;
}
return _resultobj;
}
@@ -3712,7 +3761,7 @@ static PyObject *_wrap_HtmlHistoryItem_GetPage(PyObject *self, PyObject *args, P
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST (*_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
return _resultobj;
}
@@ -3742,7 +3791,7 @@ static PyObject *_wrap_HtmlHistoryItem_GetAnchor(PyObject *self, PyObject *args,
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST (*_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
return _resultobj;
}
@@ -3946,7 +3995,7 @@ static PyObject *_wrap_wxHtmlWindow_GetOpenedPage(PyObject *self, PyObject *args
wxPy_END_ALLOW_THREADS;
}{
_resultobj = PyString_FromString(WXSTRINGCAST *(_result));
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
delete _result;
@@ -4063,11 +4112,11 @@ static PyObject *_wrap_wxHtmlWindow_SetFonts(PyObject *self, PyObject *args, PyO
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
PyObject * _argo3 = 0;
char *_kwnames[] = { "self","normal_face","fixed_face","LIST", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxHtmlWindow_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxHtmlWindow_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_argo3))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4090,12 +4139,13 @@ static PyObject *_wrap_wxHtmlWindow_SetFonts(PyObject *self, PyObject *args, PyO
}
_arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
}
{
_arg3 = int_LIST_helper(_obj3);
if (_arg3 == NULL) {
if (_argo3) {
if (_argo3 == Py_None) { _arg3 = NULL; }
else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_int_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxHtmlWindow_SetFonts. Expected _int_p.");
return NULL;
}
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxHtmlWindow_SetFonts(_arg0,*_arg1,*_arg2,_arg3);
@@ -4110,9 +4160,6 @@ static PyObject *_wrap_wxHtmlWindow_SetFonts(PyObject *self, PyObject *args, PyO
{
if (_obj2)
delete _arg2;
}
{
delete [] _arg3;
}
return _resultobj;
}
@@ -4424,7 +4471,7 @@ static PyObject *_wrap_wxHtmlWindow_base_OnLinkClicked(PyObject *self, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxHtmlWindow_base_OnLinkClicked(_arg0,_arg1);
wxHtmlWindow_base_OnLinkClicked(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
@@ -5567,6 +5614,8 @@ static PyMethodDef htmlcMethods[] = {
{ "wxHtmlTag_GetParam", (PyCFunction) _wrap_wxHtmlTag_GetParam, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlTag_HasParam", (PyCFunction) _wrap_wxHtmlTag_HasParam, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlTag_GetName", (PyCFunction) _wrap_wxHtmlTag_GetName, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlLinkInfo_GetHtmlCell", (PyCFunction) _wrap_wxHtmlLinkInfo_GetHtmlCell, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlLinkInfo_GetEvent", (PyCFunction) _wrap_wxHtmlLinkInfo_GetEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlLinkInfo_GetTarget", (PyCFunction) _wrap_wxHtmlLinkInfo_GetTarget, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlLinkInfo_GetHref", (PyCFunction) _wrap_wxHtmlLinkInfo_GetHref, METH_VARARGS | METH_KEYWORDS },
{ "new_wxHtmlLinkInfo", (PyCFunction) _wrap_new_wxHtmlLinkInfo, METH_VARARGS | METH_KEYWORDS },

23
utils/wxPython/modules/html/html.i
View File

@@ -90,10 +90,8 @@ public:
wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString);
wxString GetHref();
wxString GetTarget();
#ifdef POST_2_1_12
wxMouseEvent* GetEvent();
wxHtmlCell* GetHtmlCell();
#endif
};
//---------------------------------------------------------------------------
@@ -412,13 +410,8 @@ public:
const wxString& name = "htmlWindow")
: wxHtmlWindow(parent, id, pos, size, style, name) {};
#ifdef POST_2_1_12
void OnLinkClicked(const wxHtmlLinkInfo& link);
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
#else
void OnLinkClicked(wxHtmlLinkInfo* link);
void base_OnLinkClicked(wxHtmlLinkInfo* link);
#endif
DEC_PYCALLBACK__STRING(OnSetTitle);
PYPRIVATE;
@@ -427,29 +420,17 @@ public:
IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
#ifdef POST_2_1_12
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
#else
void wxPyHtmlWindow::OnLinkClicked(wxHtmlLinkInfo* link) {
#endif
bool doSave = wxPyRestoreThread();
if (m_myInst.findCallback("OnLinkClicked")) {
#ifdef POST_2_1_12
PyObject* obj = wxPyConstructObject((void*)&link, "wxHtmlLinkInfo");
#else
PyObject* obj = wxPyConstructObject(link, "wxHtmlLinkInfo");
#endif
m_myInst.callCallback(Py_BuildValue("(O)", obj));
}
else
wxHtmlWindow::OnLinkClicked(link);
wxPySaveThread(doSave);
}
#ifdef POST_2_1_12
void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) {
#else
void wxPyHtmlWindow::base_OnLinkClicked(wxHtmlLinkInfo* link) {
#endif
wxHtmlWindow::OnLinkClicked(link);
}
%}
@@ -487,11 +468,7 @@ public:
wxHtmlContainerCell* GetInternalRepresentation();
wxHtmlWinParser* GetParser();
#ifdef POST_2_1_12
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
#else
void base_OnLinkClicked(wxHtmlLinkInfo* link);
#endif
void base_OnSetTitle(const char* title);
};

8
utils/wxPython/modules/html/html.py
View File

@@ -45,6 +45,14 @@ class wxHtmlLinkInfoPtr :
def GetTarget(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlLinkInfo_GetTarget,(self,) + _args, _kwargs)
return val
def GetEvent(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlLinkInfo_GetEvent,(self,) + _args, _kwargs)
if val: val = wxMouseEventPtr(val)
return val
def GetHtmlCell(self, *_args, **_kwargs):
val = apply(htmlc.wxHtmlLinkInfo_GetHtmlCell,(self,) + _args, _kwargs)
if val: val = wxHtmlCellPtr(val)
return val
def __repr__(self):
return "<C wxHtmlLinkInfo instance at %s>" % (self.this,)
class wxHtmlLinkInfo(wxHtmlLinkInfoPtr):

100
utils/wxPython/modules/ogl/oglcanvas.cpp
View File

@@ -1,5 +1,5 @@
/*
* FILE : ./oglcanvas.cpp
* FILE : oglcanvas.cpp
*
* This file was automatically generated by :
* Simplified Wrapper and Interface Generator (SWIG)
@@ -1973,9 +1973,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_signed_long","_long",0},
{ "_wxMenuEvent","_class_wxMenuEvent",0},
{ "_class_wxJPEGHandler","_wxJPEGHandler",0},
{ "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0},
{ "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
{ "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
{ "_wxBMPHandler","_class_wxBMPHandler",0},
{ "_wxImage","_class_wxImage",0},
{ "_wxPrintQuality","_wxCoord",0},
{ "_wxPrintQuality","_int",0},
{ "_wxPrintQuality","_signed_int",0},
{ "_wxPrintQuality","_unsigned_int",0},
@@ -1983,9 +1986,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPrintQuality","_uint",0},
{ "_wxPrintQuality","_EBool",0},
{ "_wxPrintQuality","_size_t",0},
{ "_class_wxCustomDataObject","_wxCustomDataObject",0},
{ "_wxFontData","_class_wxFontData",0},
{ "___wxPyCleanup","_class___wxPyCleanup",0},
{ "_class_wxRegionIterator","_wxRegionIterator",0},
{ "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},
{ "_class_wxMenuBar","_wxMenuBar",0},
{ "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
{ "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0},
@@ -1999,6 +2003,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_wxImageHandler","_class_wxImageHandler",0},
{ "_class_wxToolBarBase","_wxToolBarBase",0},
{ "_class_wxTreeCtrl","_wxTreeCtrl",0},
{ "_wxMask","_class_wxMask",0},
{ "_wxToolTip","_class_wxToolTip",0},
@@ -2010,26 +2015,33 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPen","_class_wxPen",0},
{ "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
{ "_byte","_unsigned_char",0},
{ "_wxDataObject","_class_wxDataObject",0},
{ "_class_wxPyFontEnumerator","_wxPyFontEnumerator",0},
{ "_wxStaticBox","_class_wxStaticBox",0},
{ "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0},
{ "_wxPyDropSource","_class_wxPyDropSource",0},
{ "_wxChoice","_class_wxChoice",0},
{ "_wxSlider","_class_wxSlider",0},
{ "_wxNotebookEvent","_class_wxNotebookEvent",0},
{ "_wxPyPrintout","_class_wxPyPrintout",0},
{ "_wxShapeRegion","_class_wxShapeRegion",0},
{ "_long","_wxDash",0},
{ "_long","_unsigned_long",0},
{ "_long","_signed_long",0},
{ "_wxImageList","_class_wxImageList",0},
{ "_wxDataObjectSimple","_class_wxDataObjectSimple",0},
{ "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
{ "_wxBitmapButton","_class_wxBitmapButton",0},
{ "_wxSashWindow","_class_wxSashWindow",0},
{ "_class_wxSizer","_wxSizer",0},
{ "_class_wxTIFFHandler","_wxTIFFHandler",0},
{ "_class_wxPrintDialogData","_wxPrintDialogData",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_class_wxClipboard","_wxClipboard",0},
{ "_class_wxGauge","_wxGauge",0},
{ "_class_wxSashEvent","_wxSashEvent",0},
{ "_wxDC","_class_wxDC",0},
{ "_wxSizerItem","_class_wxSizerItem",0},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
{ "_wxListEvent","_class_wxListEvent",0},
{ "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
{ "_wxProgressDialog","_class_wxProgressDialog",0},
@@ -2037,13 +2049,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPrintPreview","_class_wxPrintPreview",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
{ "_size_t","_unsigned_int",0},
{ "_size_t","_int",0},
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxPrinterDC","_class_wxPrinterDC",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
{ "_wxPNMHandler","_class_wxPNMHandler",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
@@ -2051,6 +2066,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxStatusBar","_wxStatusBar",0},
{ "_class_wxGIFHandler","_wxGIFHandler",0},
{ "_class_wxPySizer","_wxPySizer",0},
{ "_class_wxPostScriptDC","_wxPostScriptDC",0},
{ "_wxPanel","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxPanel},
{ "_wxPanel","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxPanel},
{ "_wxPanel","_class_wxPanel",0},
@@ -2059,17 +2075,21 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPyEvent","_class_wxPyEvent",0},
{ "_wxTextCtrl","_class_wxTextCtrl",0},
{ "_class_wxMask","_wxMask",0},
{ "_class_wxToolTip","_wxToolTip",0},
{ "_wxTextDataObject","_class_wxTextDataObject",0},
{ "_class_wxKeyEvent","_wxKeyEvent",0},
{ "_class_wxToolTip","_wxToolTip",0},
{ "_class_wxGrid","_wxGrid",0},
{ "_class_wxPNGHandler","_wxPNGHandler",0},
{ "_wxColour","_class_wxColour",0},
{ "_class_wxDialog","_wxDialog",0},
{ "_wxBusyCursor","_class_wxBusyCursor",0},
{ "_wxPageSetupDialog","_class_wxPageSetupDialog",0},
{ "_class_wxPrinter","_wxPrinter",0},
{ "_class_wxFileDataObject","_wxFileDataObject",0},
{ "_wxIdleEvent","_class_wxIdleEvent",0},
{ "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
{ "_wxToolBar","_class_wxToolBar",0},
{ "_class_wxDataObject","_wxDataObject",0},
{ "_wxCaret","_class_wxCaret",0},
{ "_wxStaticLine","_class_wxStaticLine",0},
{ "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0},
@@ -2077,8 +2097,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxMiniFrame","_class_wxMiniFrame",0},
{ "_class_wxNotebookEvent","_wxNotebookEvent",0},
{ "_class_wxPyPrintout","_wxPyPrintout",0},
{ "_wxDataFormat","_class_wxDataFormat",0},
{ "_class_wxDataObjectSimple","_wxDataObjectSimple",0},
{ "_class_wxSashWindow","_wxSashWindow",0},
{ "_wxShowEvent","_class_wxShowEvent",0},
{ "_uint","_wxCoord",0},
{ "_uint","_wxPrintQuality",0},
{ "_uint","_size_t",0},
{ "_uint","_unsigned_int",0},
@@ -2099,16 +2122,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxButton","_wxButton",0},
{ "_wxRadioBox","_class_wxRadioBox",0},
{ "_class_wxFontData","_wxFontData",0},
{ "_class_wxPNMHandler","_wxPNMHandler",0},
{ "_wxBoxSizer","_class_wxBoxSizer",0},
{ "_class___wxPyCleanup","___wxPyCleanup",0},
{ "_wxBitmap","_class_wxBitmap",0},
{ "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
{ "_char","_wxDash",0},
{ "_wxPrintDialog","_class_wxPrintDialog",0},
{ "_wxPyTimer","_class_wxPyTimer",0},
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxScrollBar","_class_wxScrollBar",0},
{ "_wxSpinButton","_class_wxSpinButton",0},
{ "_wxToolBarTool","_class_wxToolBarTool",0},
{ "_wxColourDialog","_class_wxColourDialog",0},
{ "_wxPrintData","_class_wxPrintData",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
@@ -2119,33 +2141,42 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
{ "_class_wxBusyCursor","_wxBusyCursor",0},
{ "_wxToolBarSimple","_class_wxToolBarSimple",0},
{ "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
{ "_wxListItem","_class_wxListItem",0},
{ "_class_wxToolBar","_wxToolBar",0},
{ "_wxDropTarget","_class_wxDropTarget",0},
{ "_class_wxStaticLine","_wxStaticLine",0},
{ "_wxScrollEvent","_class_wxScrollEvent",0},
{ "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
{ "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
{ "_class_wxShapeRegion","_wxShapeRegion",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_class_wxRegion","_wxRegion",0},
{ "_class_wxDataFormat","_wxDataFormat",0},
{ "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
{ "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
{ "_class_wxPreviewFrame","_wxPreviewFrame",0},
{ "_wxStaticText","_class_wxStaticText",0},
{ "_wxFont","_class_wxFont",0},
{ "_class_wxPyDropTarget","_wxPyDropTarget",0},
{ "_wxCloseEvent","_class_wxCloseEvent",0},
{ "_class_wxSplitterEvent","_wxSplitterEvent",0},
{ "_wxNotebook","_class_wxNotebook",0},
{ "_unsigned_long","_wxDash",0},
{ "_unsigned_long","_long",0},
{ "_class_wxRect","_wxRect",0},
{ "_class_wxDC","_wxDC",0},
{ "_wxScrollWinEvent","_class_wxScrollWinEvent",0},
{ "_class_wxPyShapeCanvas","_wxPyShapeCanvas",0},
{ "_class_wxProgressDialog","_wxProgressDialog",0},
{ "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
{ "_wxPyApp","_class_wxPyApp",0},
{ "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},
{ "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
{ "_class_wxTreeEvent","_wxTreeEvent",0},
{ "_class_wxDirDialog","_wxDirDialog",0},
@@ -2161,22 +2192,25 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxComboBox","_class_wxComboBox",0},
{ "_wxRadioButton","_class_wxRadioButton",0},
{ "_class_wxMessageDialog","_wxMessageDialog",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
{ "_signed_int","_wxWindowID",0},
{ "_signed_int","_int",0},
{ "_class_wxTextCtrl","_wxTextCtrl",0},
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
{ "_wxMetaFileDC","_class_wxMetaFileDC",0},
{ "_class_wxTextDataObject","_wxTextDataObject",0},
{ "_wxMenu","_class_wxMenu",0},
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},
{ "_wxFileDialog","_class_wxFileDialog",0},
{ "_class_wxDropTarget","_wxDropTarget",0},
{ "_class_wxCaret","_wxCaret",0},
{ "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
{ "_class_wxBrush","_wxBrush",0},
@@ -2189,10 +2223,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxStaticText","_wxStaticText",0},
{ "_wxPrintDialogData","_class_wxPrintDialogData",0},
{ "_class_wxFont","_wxFont",0},
{ "_wxClipboard","_class_wxClipboard",0},
{ "_class_wxPyValidator","_wxPyValidator",0},
{ "_class_wxCloseEvent","_wxCloseEvent",0},
{ "_wxSashEvent","_class_wxSashEvent",0},
{ "_wxBusyInfo","_class_wxBusyInfo",0},
{ "_class_wxMenuEvent","_wxMenuEvent",0},
{ "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_wxListCtrl","_class_wxListCtrl",0},
@@ -2205,16 +2243,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},
{ "_wxMemoryDC","_class_wxMemoryDC",0},
{ "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
{ "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
{ "_class_wxPrintDialog","_wxPrintDialog",0},
{ "_wxPaintDC","_class_wxPaintDC",0},
{ "_class_wxWindowDC","_wxWindowDC",0},
{ "_class_wxFocusEvent","_wxFocusEvent",0},
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxToolBarTool","_wxToolBarTool",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPostScriptDC","_class_wxPostScriptDC",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
{ "_class_wxImageHandler","_wxImageHandler",0},
{ "_wxPyShape","_class_wxPyShape",0},
{ "_wxScrolledWindow","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxScrolledWindow},
@@ -2222,10 +2261,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxScrolledWindow","_class_wxScrolledWindow",0},
{ "_wxTreeItemId","_class_wxTreeItemId",0},
{ "_unsigned_char","_byte",0},
{ "_class_wxMetaFileDC","_wxMetaFileDC",0},
{ "_class_wxMenu","_wxMenu",0},
{ "_wxControl","_class_wxControl",0},
{ "_class_wxListBox","_wxListBox",0},
{ "_unsigned_int","_wxCoord",0},
{ "_unsigned_int","_wxPrintQuality",0},
{ "_unsigned_int","_size_t",0},
{ "_unsigned_int","_uint",0},
@@ -2242,6 +2281,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_short","_signed_short",0},
{ "_class_wxStaticBox","_wxStaticBox",0},
{ "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0},
{ "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
{ "_class_wxPyDropSource","_wxPyDropSource",0},
{ "_class_wxScrollEvent","_wxScrollEvent",0},
{ "_wxJoystickEvent","_class_wxJoystickEvent",0},
{ "_class_wxChoice","_wxChoice",0},
@@ -2250,8 +2291,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxImageList","_wxImageList",0},
{ "_class_wxBitmapButton","_wxBitmapButton",0},
{ "_wxFrame","_class_wxFrame",0},
{ "_wxPCXHandler","_class_wxPCXHandler",0},
{ "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
{ "_class_wxNotebook","_wxNotebook",0},
{ "_wxJPEGHandler","_class_wxJPEGHandler",0},
{ "_wxWindowID","_wxCoord",0},
{ "_wxWindowID","_wxPrintQuality",0},
{ "_wxWindowID","_size_t",0},
{ "_wxWindowID","_EBool",0},
@@ -2261,6 +2305,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowID","_unsigned_int",0},
{ "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
{ "_class_wxSizerItem","_wxSizerItem",0},
{ "_int","_wxCoord",0},
{ "_int","_wxPrintQuality",0},
{ "_int","_size_t",0},
{ "_int","_EBool",0},
@@ -2273,21 +2318,25 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxListEvent","_wxListEvent",0},
{ "_class_wxPrintPreview","_wxPrintPreview",0},
{ "_class_wxSpinEvent","_wxSpinEvent",0},
{ "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0},
{ "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},
{ "_wxButton","_class_wxButton",0},
{ "_class_wxPyApp","_wxPyApp",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
{ "_class_wxPrinterDC","_wxPrinterDC",0},
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
{ "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
{ "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
{ "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
{ "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
{ "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
{ "_class_wxComboBox","_wxComboBox",0},
{ "_class_wxRadioButton","_wxRadioButton",0},
{ "_class_wxPyShape","_wxPyShape",0},
{ "_wxValidator","_class_wxValidator",0},
{ "_wxToolBarBase","_class_wxToolBarBase",0},
{ "_class_wxTreeItemId","_wxTreeItemId",0},
{ "_wxTreeCtrl","_class_wxTreeCtrl",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
@@ -2300,7 +2349,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPageSetupDialog","_wxPageSetupDialog",0},
{ "_wxPalette","_class_wxPalette",0},
{ "_class_wxIdleEvent","_wxIdleEvent",0},
{ "_wxCoord","_int",0},
{ "_wxCoord","_signed_int",0},
{ "_wxCoord","_unsigned_int",0},
{ "_wxCoord","_wxWindowID",0},
{ "_wxCoord","_uint",0},
{ "_wxCoord","_EBool",0},
{ "_wxCoord","_size_t",0},
{ "_wxCoord","_wxPrintQuality",0},
{ "_wxEraseEvent","_class_wxEraseEvent",0},
{ "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
{ "_class_wxJoystickEvent","_wxJoystickEvent",0},
{ "_class_wxMiniFrame","_wxMiniFrame",0},
{ "_wxFontDialog","_class_wxFontDialog",0},
@@ -2309,19 +2367,25 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPreviewFrame","_class_wxPreviewFrame",0},
{ "_wxSizer","_class_wxSizer",0},
{ "_class_wxShowEvent","_wxShowEvent",0},
{ "_class_wxPCXHandler","_wxPCXHandler",0},
{ "_wxTIFFHandler","_class_wxTIFFHandler",0},
{ "_wxDiagram","_class_wxDiagram",0},
{ "_wxPyDropTarget","_class_wxPyDropTarget",0},
{ "_wxActivateEvent","_class_wxActivateEvent",0},
{ "_wxGauge","_class_wxGauge",0},
{ "_class_wxCheckListBox","_wxCheckListBox",0},
{ "_class_wxBusyInfo","_wxBusyInfo",0},
{ "_class_wxGridEvent","_wxGridEvent",0},
{ "_class_wxCommandEvent","_wxCommandEvent",0},
{ "_class_wxClientDC","_wxClientDC",0},
{ "_class_wxSizeEvent","_wxSizeEvent",0},
{ "_class_wxListCtrl","_wxListCtrl",0},
{ "_wxCustomDataObject","_class_wxCustomDataObject",0},
{ "_class_wxGridCell","_wxGridCell",0},
{ "_class_wxSize","_wxSize",0},
{ "_class_wxBitmap","_wxBitmap",0},
{ "_class_wxMemoryDC","_wxMemoryDC",0},
{ "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},
{ "_wxMenuBar","_class_wxMenuBar",0},
{ "_wxTreeEvent","_class_wxTreeEvent",0},
{ "_wxDirDialog","_class_wxDirDialog",0},
@@ -2333,8 +2397,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxScrollBar","_wxScrollBar",0},
{ "_class_wxColourDialog","_wxColourDialog",0},
{ "_class_wxPrintData","_wxPrintData",0},
{ "_wxDash","_unsigned_long",0},
{ "_wxDash","_long",0},
{ "_wxDash","_char",0},
{ "_class_wxScrolledWindow","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxScrolledWindow},
{ "_class_wxScrolledWindow","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxScrolledWindow},
{ "_class_wxScrolledWindow","_wxScrolledWindow",0},
@@ -2344,13 +2407,18 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxColourData","_class_wxColourData",0},
{ "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0},
{ "_class_wxPalette","_wxPalette",0},
{ "_wxFileDataObject","_class_wxFileDataObject",0},
{ "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0},
{ "_class_wxEraseEvent","_wxEraseEvent",0},
{ "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0},
{ "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_class_wxFontDialog","_wxFontDialog",0},
{ "_wxWindow","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxWindow},
{ "_wxWindow","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxWindow},
{ "_wxWindow","_class_wxWindow",0},
{ "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
{ "_class_wxFrame","_wxFrame",0},
{ "_class_wxDiagram","_wxDiagram",0},
{0,0,0}};

2
utils/wxPython/modules/ogl/oglcanvas.py
View File

@@ -9,6 +9,8 @@ from windows import *
from gdi import *
from clip_dnd import *
from events import *
from mdi import *