X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..08da19d737fcb12a19a2746b438b3a3610214e6d:/wxPython/contrib/glcanvas/msw/glcanvas.py

diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.py b/wxPython/contrib/glcanvas/msw/glcanvas.py
index 11d46f9612..76fcdd33fd 100644
--- a/wxPython/contrib/glcanvas/msw/glcanvas.py
+++ b/wxPython/contrib/glcanvas/msw/glcanvas.py
@@ -13,6 +13,8 @@ from clip_dnd import *
 
 from events import *
 
+from streams import *
+
 from mdi import *
 
 from frames import *
@@ -34,8 +36,12 @@ from image import *
 from printfw import *
 
 from sizers import *
+
+from filesys import *
+
+from utils import *
 import wx
-class wxGLContextPtr :
+class wxGLContextPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -53,7 +59,6 @@ class wxGLContextPtr :
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
-        if val: val = wxWindowPtr(val) 
         return val
     def __repr__(self):
         return "<C wxGLContext instance at %s>" % (self.this,)
@@ -65,7 +70,7 @@ class wxGLContext(wxGLContextPtr):
 
 
 
-class wxGLCanvasPtr(wxScrolledWindowPtr):
+class wxGLCanvasPtr(wxWindowPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -82,15 +87,35 @@ class wxGLCanvasPtr(wxScrolledWindowPtr):
         val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
         if val: val = wxGLContextPtr(val) 
         return val
+    def SetupPixelFormat(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SetupPixelFormat,(self,) + _args, _kwargs)
+        return val
+    def SetupPalette(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_SetupPalette,(self,) + _args, _kwargs)
+        return val
+    def CreateDefaultPalette(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_CreateDefaultPalette,(self,) + _args, _kwargs)
+        if val: val = wxPalettePtr(val) ; val.thisown = 1
+        return val
+    def GetPalette(self, *_args, **_kwargs):
+        val = apply(glcanvasc.wxGLCanvas_GetPalette,(self,) + _args, _kwargs)
+        if val: val = wxPalettePtr(val) 
+        return val
     def __repr__(self):
         return "<C wxGLCanvas instance at %s>" % (self.this,)
 class wxGLCanvas(wxGLCanvasPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)
         self.thisown = 1
-        #wx._StdWindowCallbacks(self)
+        self._setOORInfo(self)
+
 
 
+def wxGLCanvasWithContext(*_args,**_kwargs):
+    val = wxGLCanvasPtr(apply(glcanvasc.new_wxGLCanvasWithContext,_args,_kwargs))
+    val.thisown = 1
+    val._setOORInfo(self)
+    return val