wxPython 2.1b1: Very minor changes needed for wxGTK

[wxWidgets.git] / utils / wxPython / src / msw / glcanvas.py

diff --git a/utils/wxPython/src/msw/glcanvas.py b/utils/wxPython/src/msw/glcanvas.py
index d88c3403662cb379137d46bf74bedf8aaea505f1..8f75f0ea53c5864d06fceb4f8b8310624f0b27e9 100644 (file)
--- a/utils/wxPython/src/msw/glcanvas.py
+++ b/utils/wxPython/src/msw/glcanvas.py
@@ -24,6 +24,8 @@ from windows2 import *
 from cmndlgs import *
 
 from windows3 import *
 from cmndlgs import *
 
 from windows3 import *

+
+from image import *

 import wx
 class wxGLContextPtr :
     def __init__(self,this):
 import wx
 class wxGLContextPtr :
     def __init__(self,this):


@@ -41,21 +43,6 @@ class wxGLContextPtr :
     def SwapBuffers(self):
         val = glcanvasc.wxGLContext_SwapBuffers(self.this)
         return val
     def SwapBuffers(self):
         val = glcanvasc.wxGLContext_SwapBuffers(self.this)
         return val

-    def SetupPixelFormat(self):
-        val = glcanvasc.wxGLContext_SetupPixelFormat(self.this)
-        return val
-    def SetupPalette(self,arg0):
-        val = glcanvasc.wxGLContext_SetupPalette(self.this,arg0.this)
-        return val
-    def CreateDefaultPalette(self):
-        val = glcanvasc.wxGLContext_CreateDefaultPalette(self.this)
-        val = wxPalettePtr(val)
-        val.thisown = 1
-        return val
-    def GetPalette(self):
-        val = glcanvasc.wxGLContext_GetPalette(self.this)
-        val = wxPalettePtr(val)
-        return val

     def GetWindow(self):
         val = glcanvasc.wxGLContext_GetWindow(self.this)
         val = wxWindowPtr(val)
     def GetWindow(self):
         val = glcanvasc.wxGLContext_GetWindow(self.this)
         val = wxWindowPtr(val)


@@ -1025,7 +1012,6 @@ GL_FOG_END = glcanvasc.GL_FOG_END
 GL_FOG_HINT = glcanvasc.GL_FOG_HINT
 GL_FOG_INDEX = glcanvasc.GL_FOG_INDEX
 GL_FOG_MODE = glcanvasc.GL_FOG_MODE
 GL_FOG_HINT = glcanvasc.GL_FOG_HINT
 GL_FOG_INDEX = glcanvasc.GL_FOG_INDEX
 GL_FOG_MODE = glcanvasc.GL_FOG_MODE

-GL_FOG_SPECULAR_TEXTURE_WIN = glcanvasc.GL_FOG_SPECULAR_TEXTURE_WIN

 GL_FOG_START = glcanvasc.GL_FOG_START
 GL_FRONT = glcanvasc.GL_FRONT
 GL_FRONT_AND_BACK = glcanvasc.GL_FRONT_AND_BACK
 GL_FOG_START = glcanvasc.GL_FOG_START
 GL_FRONT = glcanvasc.GL_FRONT
 GL_FRONT_AND_BACK = glcanvasc.GL_FRONT_AND_BACK


@@ -1149,8 +1135,6 @@ GL_MATRIX_MODE = glcanvasc.GL_MATRIX_MODE
 GL_MAX_ATTRIB_STACK_DEPTH = glcanvasc.GL_MAX_ATTRIB_STACK_DEPTH
 GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = glcanvasc.GL_MAX_CLIENT_ATTRIB_STACK_DEPTH
 GL_MAX_CLIP_PLANES = glcanvasc.GL_MAX_CLIP_PLANES
 GL_MAX_ATTRIB_STACK_DEPTH = glcanvasc.GL_MAX_ATTRIB_STACK_DEPTH
 GL_MAX_CLIENT_ATTRIB_STACK_DEPTH = glcanvasc.GL_MAX_CLIENT_ATTRIB_STACK_DEPTH
 GL_MAX_CLIP_PLANES = glcanvasc.GL_MAX_CLIP_PLANES

-GL_MAX_ELEMENTS_INDICES_WIN = glcanvasc.GL_MAX_ELEMENTS_INDICES_WIN
-GL_MAX_ELEMENTS_VERTICES_WIN = glcanvasc.GL_MAX_ELEMENTS_VERTICES_WIN

 GL_MAX_EVAL_ORDER = glcanvasc.GL_MAX_EVAL_ORDER
 GL_MAX_LIGHTS = glcanvasc.GL_MAX_LIGHTS
 GL_MAX_LIST_NESTING = glcanvasc.GL_MAX_LIST_NESTING
 GL_MAX_EVAL_ORDER = glcanvasc.GL_MAX_EVAL_ORDER
 GL_MAX_LIGHTS = glcanvasc.GL_MAX_LIGHTS
 GL_MAX_LIST_NESTING = glcanvasc.GL_MAX_LIST_NESTING


@@ -1209,8 +1193,6 @@ GL_PACK_SKIP_ROWS = glcanvasc.GL_PACK_SKIP_ROWS
 GL_PACK_SWAP_BYTES = glcanvasc.GL_PACK_SWAP_BYTES
 GL_PASS_THROUGH_TOKEN = glcanvasc.GL_PASS_THROUGH_TOKEN
 GL_PERSPECTIVE_CORRECTION_HINT = glcanvasc.GL_PERSPECTIVE_CORRECTION_HINT
 GL_PACK_SWAP_BYTES = glcanvasc.GL_PACK_SWAP_BYTES
 GL_PASS_THROUGH_TOKEN = glcanvasc.GL_PASS_THROUGH_TOKEN
 GL_PERSPECTIVE_CORRECTION_HINT = glcanvasc.GL_PERSPECTIVE_CORRECTION_HINT

-GL_PHONG_HINT_WIN = glcanvasc.GL_PHONG_HINT_WIN
-GL_PHONG_WIN = glcanvasc.GL_PHONG_WIN

 GL_PIXEL_MAP_A_TO_A = glcanvasc.GL_PIXEL_MAP_A_TO_A
 GL_PIXEL_MAP_A_TO_A_SIZE = glcanvasc.GL_PIXEL_MAP_A_TO_A_SIZE
 GL_PIXEL_MAP_B_TO_B = glcanvasc.GL_PIXEL_MAP_B_TO_B
 GL_PIXEL_MAP_A_TO_A = glcanvasc.GL_PIXEL_MAP_A_TO_A
 GL_PIXEL_MAP_A_TO_A_SIZE = glcanvasc.GL_PIXEL_MAP_A_TO_A_SIZE
 GL_PIXEL_MAP_B_TO_B = glcanvasc.GL_PIXEL_MAP_B_TO_B


@@ -1415,8 +1397,6 @@ GL_VERTEX_ARRAY_TYPE = glcanvasc.GL_VERTEX_ARRAY_TYPE
 GL_VERTEX_ARRAY_TYPE_EXT = glcanvasc.GL_VERTEX_ARRAY_TYPE_EXT
 GL_VIEWPORT = glcanvasc.GL_VIEWPORT
 GL_VIEWPORT_BIT = glcanvasc.GL_VIEWPORT_BIT
 GL_VERTEX_ARRAY_TYPE_EXT = glcanvasc.GL_VERTEX_ARRAY_TYPE_EXT
 GL_VIEWPORT = glcanvasc.GL_VIEWPORT
 GL_VIEWPORT_BIT = glcanvasc.GL_VIEWPORT_BIT

-GL_WIN_draw_range_elements = glcanvasc.GL_WIN_draw_range_elements
-GL_WIN_swap_hint = glcanvasc.GL_WIN_swap_hint

 GL_XOR = glcanvasc.GL_XOR
 GL_ZERO = glcanvasc.GL_ZERO
 GL_ZOOM_X = glcanvasc.GL_ZOOM_X
 GL_XOR = glcanvasc.GL_XOR
 GL_ZERO = glcanvasc.GL_ZERO
 GL_ZOOM_X = glcanvasc.GL_ZOOM_X