fixed compile error

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/ogl/ogl.cpp b/wxPython/contrib/ogl/ogl.cpp
index cb54c18b038661a83cbd451f8bb163d82a36531a..bf4df3b8728acfb5f4d8d688ddd392b0f2de6c4c 100644 (file)
--- a/wxPython/contrib/ogl/ogl.cpp
+++ b/wxPython/contrib/ogl/ogl.cpp
@@ -1,15 +1,15 @@
 /*
  * FILE : contrib/ogl/ogl.cpp
 /*
  * FILE : contrib/ogl/ogl.cpp

- *
+ * 

  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
  * Version 1.1 (Build 883)
  * 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.
  * 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!
  *
  */
  * 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;
     char *_kwnames[] = {  NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames))
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames)) 

         return NULL;
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
         return NULL;
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();


@@ -257,7 +257,7 @@ static PyObject *_wrap_wxOGLCleanUp(PyObject *self, PyObject *args, PyObject *kw
     char *_kwnames[] = {  NULL };
 
     self = self;
     char *_kwnames[] = {  NULL };
 
     self = self;

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames))
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames)) 

         return NULL;
 {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
         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
 
 static PyObject *SWIG_globals;
 #ifdef __cplusplus

-extern "C"
+extern "C" 

 #endif
 SWIGEXPORT(void) initoglc() {
         PyObject *m, *d;
 #endif
 SWIGEXPORT(void) initoglc() {
         PyObject *m, *d;

diff --git a/wxPython/contrib/ogl/ogl.i b/wxPython/contrib/ogl/ogl.i
index b23154b67940a2af40937d7fdc515112d4595ddc..3a226865f21a4ab98fb3d19538987eb1bde1c68b 100644 (file)
--- 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;
     PyObject*   pyList;
     PyObject*   pyObj;
     wxObject*   wxObj;

-    wxNode*     node = list->First();
+    wxNode*     node = list->GetFirst();

 
     wxPyBeginBlockThreads();
     pyList = PyList_New(0);
     while (node) {
 
     wxPyBeginBlockThreads();
     pyList = PyList_New(0);
     while (node) {

-        wxObj = node->Data();
+        wxObj = node->GetData();

         pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj);
         PyList_Append(pyList, pyObj);
         pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj);
         PyList_Append(pyList, pyObj);

-        node = node->Next();
+        node = node->GetNext();

     }
     wxPyEndBlockThreads();
     return pyList;
     }
     wxPyEndBlockThreads();
     return pyList;