fixes for deprecated warnings

[wxWidgets.git] / wxPython / contrib / ogl / oglbasic.i

diff --git a/wxPython/contrib/ogl/oglbasic.i b/wxPython/contrib/ogl/oglbasic.i
index 23380890165032b070978e1db7ccda8f6180f6f5..72202703238ba87c4771da1a9ba9c3de9a00daf3 100644 (file)
--- a/wxPython/contrib/ogl/oglbasic.i
+++ b/wxPython/contrib/ogl/oglbasic.i
@@ -14,7 +14,7 @@
 %module oglbasic
 
 %{
 %module oglbasic
 
 %{

-#include "export.h"
+#include "wxPython.h"

 #include "oglhelpers.h"
 %}
 
 #include "oglhelpers.h"
 %}
 


@@ -179,7 +179,7 @@ public:
     %addmethods {
         PyObject* GetChildren() {
             wxList& list = self->GetChildren();
     %addmethods {
         PyObject* GetChildren() {
             wxList& list = self->GetChildren();

-            return wxPy_ConvertList(&list, "wxPyShape");
+            return wxPy_ConvertShapeList(&list, "wxPyShape");

         }
     }
 
         }
     }
 


@@ -223,7 +223,7 @@ public:
     %addmethods {
         PyObject* GetLines() {
             wxList& list = self->GetLines();
     %addmethods {
         PyObject* GetLines() {
             wxList& list = self->GetLines();

-            return wxPy_ConvertList(&list, "wxPyLineShape");
+            return wxPy_ConvertShapeList(&list, "wxPyLineShape");

         }
     }
 
         }
     }
 


@@ -303,7 +303,7 @@ public:
     void ClearText(int regionId = 0);
     void RemoveLine(wxPyLineShape *line);
 
     void ClearText(int regionId = 0);
     void RemoveLine(wxPyLineShape *line);
 

-#ifdef PROLOGIO
+#ifdef wxUSE_PROLOGIO

     void WriteAttributes(wxExpr *clause);
     void ReadAttributes(wxExpr *clause);
     void ReadConstraints(wxExpr *clause, wxExprDatabase *database);
     void WriteAttributes(wxExpr *clause);
     void ReadAttributes(wxExpr *clause);
     void ReadConstraints(wxExpr *clause, wxExprDatabase *database);