Removed deprecation warnings in OGL and Gizmos

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

diff --git a/wxPython/contrib/ogl/oglcanvas.py b/wxPython/contrib/ogl/oglcanvas.py
index a2a67b2cae873a6e315d5f65647beb68634b1dd5..6a6a7459bd26b9898f34a909b62e40f2ea8fe553 100644 (file)
--- a/wxPython/contrib/ogl/oglcanvas.py
+++ b/wxPython/contrib/ogl/oglcanvas.py
@@ -9,6 +9,8 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
@@ -86,18 +88,6 @@ class wxDiagramPtr(wxObjectPtr):
     def InsertShape(self, *_args, **_kwargs):
         val = apply(oglcanvasc.wxDiagram_InsertShape,(self,) + _args, _kwargs)
         return val
-    def LoadFile(self, *_args, **_kwargs):
-        val = apply(oglcanvasc.wxDiagram_LoadFile,(self,) + _args, _kwargs)
-        return val
-    def ReadContainerGeometry(self, *_args, **_kwargs):
-        val = apply(oglcanvasc.wxDiagram_ReadContainerGeometry,(self,) + _args, _kwargs)
-        return val
-    def ReadLines(self, *_args, **_kwargs):
-        val = apply(oglcanvasc.wxDiagram_ReadLines,(self,) + _args, _kwargs)
-        return val
-    def ReadNodes(self, *_args, **_kwargs):
-        val = apply(oglcanvasc.wxDiagram_ReadNodes,(self,) + _args, _kwargs)
-        return val
     def RecentreAll(self, *_args, **_kwargs):
         val = apply(oglcanvasc.wxDiagram_RecentreAll,(self,) + _args, _kwargs)
         return val
@@ -110,9 +100,6 @@ class wxDiagramPtr(wxObjectPtr):
     def RemoveShape(self, *_args, **_kwargs):
         val = apply(oglcanvasc.wxDiagram_RemoveShape,(self,) + _args, _kwargs)
         return val
-    def SaveFile(self, *_args, **_kwargs):
-        val = apply(oglcanvasc.wxDiagram_SaveFile,(self,) + _args, _kwargs)
-        return val
     def SetCanvas(self, *_args, **_kwargs):
         val = apply(oglcanvasc.wxDiagram_SetCanvas,(self,) + _args, _kwargs)
         return val
@@ -207,6 +194,10 @@ 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)