better check of parameter in Delete() (2nd part of patch 646145)

[wxWidgets.git] / wxPython / contrib / glcanvas / msw / glcanvas.py

diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.py b/wxPython/contrib/glcanvas/msw/glcanvas.py
index 2e4beb50d8ded8d0e5e280b6fc68b7db67b9cf9e..6ae845efc30d12ef57171b02bce3b5f26e50b1be 100644 (file)
--- a/wxPython/contrib/glcanvas/msw/glcanvas.py
+++ b/wxPython/contrib/glcanvas/msw/glcanvas.py
@@ -9,12 +9,16 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from events import *
 
 from streams import *
 
 from clip_dnd import *
 
 from events import *
 
 from streams import *
 

+from utils import *
+

 from mdi import *
 
 from frames import *
 from mdi import *
 
 from frames import *


@@ -38,10 +42,8 @@ from printfw import *
 from sizers import *
 
 from filesys import *
 from sizers import *
 
 from filesys import *

-
-from utils import *

 import wx
 import wx

-class wxGLContextPtr :
+class wxGLContextPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -59,7 +61,6 @@ class wxGLContextPtr :
         return val
     def GetWindow(self, *_args, **_kwargs):
         val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
         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,)
         return val
     def __repr__(self):
         return "<C wxGLContext instance at %s>" % (self.this,)


@@ -71,7 +72,7 @@ class wxGLContext(wxGLContextPtr):
 
 
 
 
 
 

-class wxGLCanvasPtr(wxScrolledWindowPtr):
+class wxGLCanvasPtr(wxWindowPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -88,15 +89,35 @@ class wxGLCanvasPtr(wxScrolledWindowPtr):
         val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
         if val: val = wxGLContextPtr(val) 
         return val
         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
     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

 
 
 
 
 
 


@@ -107,3 +128,19 @@ class wxGLCanvas(wxGLCanvasPtr):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- 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