X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf2f43eade1ec5d3c6cbd96cb13551acabc9a99..4101db8100f956b8ad2ea2d5f9e329134a6cce89:/wxPython/contrib/ogl/oglcanvas.py

diff --git a/wxPython/contrib/ogl/oglcanvas.py b/wxPython/contrib/ogl/oglcanvas.py
index b80e23933a..d0126a265a 100644
--- a/wxPython/contrib/ogl/oglcanvas.py
+++ b/wxPython/contrib/ogl/oglcanvas.py
@@ -9,12 +9,16 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
 
 from streams import *
 
+from utils import *
+
 from mdi import *
 
 from frames import *
@@ -39,8 +43,6 @@ from sizers import *
 
 from filesys import *
 
-from utils import *
-
 from oglbasic import *
 import wx
 class wxDiagramPtr(wxObjectPtr):
@@ -148,8 +150,8 @@ class wxPyShapeCanvasPtr(wxScrolledWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(oglcanvasc.wxPyShapeCanvas__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(oglcanvasc.wxPyShapeCanvas__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def AddShape(self, *_args, **_kwargs):
         val = apply(oglcanvasc.wxPyShapeCanvas_AddShape,(self,) + _args, _kwargs)
@@ -207,13 +209,16 @@ class wxPyShapeCanvasPtr(wxScrolledWindowPtr):
         return val
     def __repr__(self):
         return "<C wxPyShapeCanvas instance at %s>" % (self.this,)
+    
+    def GetShapeList(self):
+        return self.GetDiagram().GetShapeList()
+    
 class wxPyShapeCanvas(wxPyShapeCanvasPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(oglcanvasc.new_wxPyShapeCanvas,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyShapeCanvas)
-        #wx._StdWindowCallbacks(self)
-        #wx._StdOnScrollCallbacks(self)
+        self._setCallbackInfo(self, wxPyShapeCanvas)
+        self._setOORInfo(self)