X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cd2fac87f47fa01633ab9430d05c0a659325305..c74d8df09d0c0e182cb2063cc4cc546de3a00fae:/wxPython/contrib/glcanvas/gtk/glcanvas.py?ds=sidebyside diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.py b/wxPython/contrib/glcanvas/gtk/glcanvas.py index ee1d62d319..8b5f9eabad 100644 --- a/wxPython/contrib/glcanvas/gtk/glcanvas.py +++ b/wxPython/contrib/glcanvas/gtk/glcanvas.py @@ -15,6 +15,8 @@ from events import * from streams import * +from utils import * + from mdi import * from frames import * @@ -38,10 +40,8 @@ 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 @@ -73,7 +73,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 "" % (self.this,) @@ -85,7 +84,7 @@ class wxGLContext(wxGLContextPtr): -class wxGLCanvasPtr(wxScrolledWindowPtr): +class wxGLCanvasPtr(wxWindowPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -108,9 +107,15 @@ 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 @@ -121,3 +126,19 @@ class wxGLCanvas(wxGLCanvasPtr): #-------------- VARIABLE WRAPPERS ------------------ +WX_GL_RGBA = glcanvasc.WX_GL_RGBA +WX_GL_BUFFER_SIZE = glcanvasc.WX_GL_BUFFER_SIZE +WX_GL_LEVEL = glcanvasc.WX_GL_LEVEL +WX_GL_DOUBLEBUFFER = glcanvasc.WX_GL_DOUBLEBUFFER +WX_GL_STEREO = glcanvasc.WX_GL_STEREO +WX_GL_AUX_BUFFERS = glcanvasc.WX_GL_AUX_BUFFERS +WX_GL_MIN_RED = glcanvasc.WX_GL_MIN_RED +WX_GL_MIN_GREEN = glcanvasc.WX_GL_MIN_GREEN +WX_GL_MIN_BLUE = glcanvasc.WX_GL_MIN_BLUE +WX_GL_MIN_ALPHA = glcanvasc.WX_GL_MIN_ALPHA +WX_GL_DEPTH_SIZE = glcanvasc.WX_GL_DEPTH_SIZE +WX_GL_STENCIL_SIZE = glcanvasc.WX_GL_STENCIL_SIZE +WX_GL_MIN_ACCUM_RED = glcanvasc.WX_GL_MIN_ACCUM_RED +WX_GL_MIN_ACCUM_GREEN = glcanvasc.WX_GL_MIN_ACCUM_GREEN +WX_GL_MIN_ACCUM_BLUE = glcanvasc.WX_GL_MIN_ACCUM_BLUE +WX_GL_MIN_ACCUM_ALPHA = glcanvasc.WX_GL_MIN_ACCUM_ALPHA