corrected CodeWarrior project target names and generated application names

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

diff --git a/wxPython/contrib/ogl/oglcanvas.i b/wxPython/contrib/ogl/oglcanvas.i
index 88ed4a4345034989dfb2cf53b17f4341bcb6ee74..0794f68e2b4c8cd7cb12bf00e8e1671c8ada4fde 100644 (file)
--- a/wxPython/contrib/ogl/oglcanvas.i
+++ b/wxPython/contrib/ogl/oglcanvas.i
@@ -31,7 +31,7 @@
 
 %include _ogldefs.i
 
-%extern oglbasic.i
+%import oglbasic.i
 
 
 %pragma(python) code = "import wx"
@@ -40,12 +40,12 @@
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
-class wxDiagram {
+class wxDiagram : public wxObject {
 public:
     wxDiagram();
-    ~wxDiagram();
+    //~wxDiagram();
 
-    void AddShape(wxPyShape*shape, wxPyShape *addAfter = NULL);
+    void AddShape(wxPyShape* shape, wxPyShape *addAfter = NULL);
     void Clear(wxDC& dc);
     void DeleteAllShapes();
     void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2);
@@ -91,7 +91,7 @@ public:
     void SetQuickEditMode(bool mode);
     void SetSnapToGrid(bool snap);
     void ShowAll(bool show);
-    void Snap(double *OUTPUT, double *OUTPUT);
+    void Snap(double *INOUT, double *INOUT);
 
 };
 
@@ -147,7 +147,7 @@ public:
     void Redraw(wxDC& dc);
     void RemoveShape(wxPyShape *shape);
     void SetDiagram(wxDiagram *diagram);
-    void Snap(double *OUTPUT, double *OUTPUT);
+    void Snap(double *INOUT, double *INOUT);
 
 };