From 26b8693ba563b16685bb68b1a3a8ee2ceed70ba2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 25 Mar 2003 17:10:57 +0000 Subject: [PATCH] fixed compile error git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/ogl/ogl.cpp | 12 ++++++------ wxPython/contrib/ogl/ogl.i | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/wxPython/contrib/ogl/ogl.cpp b/wxPython/contrib/ogl/ogl.cpp index cb54c18b03..bf4df3b872 100644 --- a/wxPython/contrib/ogl/ogl.cpp +++ b/wxPython/contrib/ogl/ogl.cpp @@ -1,15 +1,15 @@ /* * FILE : contrib/ogl/ogl.cpp - * + * * This file was automatically generated by : * Simplified Wrapper and Interface Generator (SWIG) * Version 1.1 (Build 883) - * + * * Portions Copyright (c) 1995-1998 * The University of Utah and The Regents of the University of California. * Permission is granted to distribute this file in any manner provided * this notice remains intact. - * + * * Do not make changes to this file--changes will be lost! * */ @@ -239,7 +239,7 @@ static PyObject *_wrap_wxOGLInitialize(PyObject *self, PyObject *args, PyObject char *_kwnames[] = { NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames)) return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -257,7 +257,7 @@ static PyObject *_wrap_wxOGLCleanUp(PyObject *self, PyObject *args, PyObject *kw char *_kwnames[] = { NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames)) return NULL; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -386,7 +386,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { static PyObject *SWIG_globals; #ifdef __cplusplus -extern "C" +extern "C" #endif SWIGEXPORT(void) initoglc() { PyObject *m, *d; diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i index b23154b679..3a226865f2 100644 --- a/wxPython/contrib/ogl/ogl.i +++ b/wxPython/contrib/ogl/ogl.i @@ -237,19 +237,20 @@ PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source) { //--------------------------------------------------------------------------- -PyObject* wxPy_ConvertShapeList(wxListBase* list, const char* className) { +PyObject* wxPy_ConvertShapeList(wxListBase* listbase, const char* className) { + wxList* list = (wxList*)listbase; PyObject* pyList; PyObject* pyObj; wxObject* wxObj; - wxNode* node = list->First(); + wxNode* node = list->GetFirst(); wxPyBeginBlockThreads(); pyList = PyList_New(0); while (node) { - wxObj = node->Data(); + wxObj = node->GetData(); pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj); PyList_Append(pyList, pyObj); - node = node->Next(); + node = node->GetNext(); } wxPyEndBlockThreads(); return pyList;