X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf694132f1c28509a9f84377ce8d374bae4177ad..ea804aadf91c963d97a56e152d8372c9e689affe:/utils/wxPython/src/msw/glcanvas.cpp diff --git a/utils/wxPython/src/msw/glcanvas.cpp b/utils/wxPython/src/msw/glcanvas.cpp index 9e31f8ddfd..51f05beca5 100644 --- a/utils/wxPython/src/msw/glcanvas.cpp +++ b/utils/wxPython/src/msw/glcanvas.cpp @@ -8955,7 +8955,6 @@ SWIGEXPORT(void,initglcanvasc)() { PyDict_SetItemString(d,"GL_FOG_HINT", PyInt_FromLong((long) GL_FOG_HINT)); PyDict_SetItemString(d,"GL_FOG_INDEX", PyInt_FromLong((long) GL_FOG_INDEX)); PyDict_SetItemString(d,"GL_FOG_MODE", PyInt_FromLong((long) GL_FOG_MODE)); - PyDict_SetItemString(d,"GL_FOG_SPECULAR_TEXTURE_WIN", PyInt_FromLong((long) GL_FOG_SPECULAR_TEXTURE_WIN)); PyDict_SetItemString(d,"GL_FOG_START", PyInt_FromLong((long) GL_FOG_START)); PyDict_SetItemString(d,"GL_FRONT", PyInt_FromLong((long) GL_FRONT)); PyDict_SetItemString(d,"GL_FRONT_AND_BACK", PyInt_FromLong((long) GL_FRONT_AND_BACK)); @@ -9079,8 +9078,6 @@ SWIGEXPORT(void,initglcanvasc)() { PyDict_SetItemString(d,"GL_MAX_ATTRIB_STACK_DEPTH", PyInt_FromLong((long) GL_MAX_ATTRIB_STACK_DEPTH)); PyDict_SetItemString(d,"GL_MAX_CLIENT_ATTRIB_STACK_DEPTH", PyInt_FromLong((long) GL_MAX_CLIENT_ATTRIB_STACK_DEPTH)); PyDict_SetItemString(d,"GL_MAX_CLIP_PLANES", PyInt_FromLong((long) GL_MAX_CLIP_PLANES)); - PyDict_SetItemString(d,"GL_MAX_ELEMENTS_INDICES_WIN", PyInt_FromLong((long) GL_MAX_ELEMENTS_INDICES_WIN)); - PyDict_SetItemString(d,"GL_MAX_ELEMENTS_VERTICES_WIN", PyInt_FromLong((long) GL_MAX_ELEMENTS_VERTICES_WIN)); PyDict_SetItemString(d,"GL_MAX_EVAL_ORDER", PyInt_FromLong((long) GL_MAX_EVAL_ORDER)); PyDict_SetItemString(d,"GL_MAX_LIGHTS", PyInt_FromLong((long) GL_MAX_LIGHTS)); PyDict_SetItemString(d,"GL_MAX_LIST_NESTING", PyInt_FromLong((long) GL_MAX_LIST_NESTING)); @@ -9139,8 +9136,6 @@ SWIGEXPORT(void,initglcanvasc)() { PyDict_SetItemString(d,"GL_PACK_SWAP_BYTES", PyInt_FromLong((long) GL_PACK_SWAP_BYTES)); PyDict_SetItemString(d,"GL_PASS_THROUGH_TOKEN", PyInt_FromLong((long) GL_PASS_THROUGH_TOKEN)); PyDict_SetItemString(d,"GL_PERSPECTIVE_CORRECTION_HINT", PyInt_FromLong((long) GL_PERSPECTIVE_CORRECTION_HINT)); - PyDict_SetItemString(d,"GL_PHONG_HINT_WIN", PyInt_FromLong((long) GL_PHONG_HINT_WIN)); - PyDict_SetItemString(d,"GL_PHONG_WIN", PyInt_FromLong((long) GL_PHONG_WIN)); PyDict_SetItemString(d,"GL_PIXEL_MAP_A_TO_A", PyInt_FromLong((long) GL_PIXEL_MAP_A_TO_A)); PyDict_SetItemString(d,"GL_PIXEL_MAP_A_TO_A_SIZE", PyInt_FromLong((long) GL_PIXEL_MAP_A_TO_A_SIZE)); PyDict_SetItemString(d,"GL_PIXEL_MAP_B_TO_B", PyInt_FromLong((long) GL_PIXEL_MAP_B_TO_B)); @@ -9345,8 +9340,6 @@ SWIGEXPORT(void,initglcanvasc)() { PyDict_SetItemString(d,"GL_VERTEX_ARRAY_TYPE_EXT", PyInt_FromLong((long) GL_VERTEX_ARRAY_TYPE_EXT)); PyDict_SetItemString(d,"GL_VIEWPORT", PyInt_FromLong((long) GL_VIEWPORT)); PyDict_SetItemString(d,"GL_VIEWPORT_BIT", PyInt_FromLong((long) GL_VIEWPORT_BIT)); - PyDict_SetItemString(d,"GL_WIN_draw_range_elements", PyInt_FromLong((long) GL_WIN_draw_range_elements)); - PyDict_SetItemString(d,"GL_WIN_swap_hint", PyInt_FromLong((long) GL_WIN_swap_hint)); PyDict_SetItemString(d,"GL_XOR", PyInt_FromLong((long) GL_XOR)); PyDict_SetItemString(d,"GL_ZERO", PyInt_FromLong((long) GL_ZERO)); PyDict_SetItemString(d,"GL_ZOOM_X", PyInt_FromLong((long) GL_ZOOM_X)); @@ -9362,6 +9355,9 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLfloat","_float",0); SWIG_RegisterMapping("_signed_long","_long",0); SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0); + SWIG_RegisterMapping("_class_wxJPEGHandler","_wxJPEGHandler",0); + SWIG_RegisterMapping("_wxBMPHandler","_class_wxBMPHandler",0); + SWIG_RegisterMapping("_wxImage","_class_wxImage",0); SWIG_RegisterMapping("_double","_GLclampd",0); SWIG_RegisterMapping("_double","_GLdouble",0); SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0); @@ -9372,8 +9368,10 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_class_wxEvtHandler","_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0); SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); + SWIG_RegisterMapping("_wxGIFHandler","_class_wxGIFHandler",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxImageHandler","_class_wxImageHandler",0); SWIG_RegisterMapping("_GLsizei","_GLuint",0); SWIG_RegisterMapping("_GLsizei","_int",0); SWIG_RegisterMapping("_GLsizei","_signed_int",0); @@ -9381,6 +9379,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLsizei","_wxWindowID",0); SWIG_RegisterMapping("_GLsizei","_uint",0); SWIG_RegisterMapping("_GLsizei","_EBool",0); + SWIG_RegisterMapping("_GLsizei","_size_t",0); SWIG_RegisterMapping("_GLsizei","_GLenum",0); SWIG_RegisterMapping("_GLsizei","_GLbitfield",0); SWIG_RegisterMapping("_GLsizei","_GLint",0); @@ -9388,6 +9387,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0); + SWIG_RegisterMapping("_wxPNGHandler","_class_wxPNGHandler",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0); SWIG_RegisterMapping("_class_wxPageSetupDialogData","_wxPageSetupDialogData",0); @@ -9416,6 +9416,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLenum","_int",0); SWIG_RegisterMapping("_GLenum","_wxWindowID",0); SWIG_RegisterMapping("_GLenum","_uint",0); + SWIG_RegisterMapping("_GLenum","_size_t",0); SWIG_RegisterMapping("_class_wxPrintDialogData","_wxPrintDialogData",0); SWIG_RegisterMapping("_wxGLContext","_class_wxGLContext",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); @@ -9426,14 +9427,25 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0); SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0); + SWIG_RegisterMapping("_class_wxBMPHandler","_wxBMPHandler",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0); + SWIG_RegisterMapping("_size_t","_GLuint",0); + SWIG_RegisterMapping("_size_t","_GLsizei",0); + SWIG_RegisterMapping("_size_t","_GLint",0); + SWIG_RegisterMapping("_size_t","_GLbitfield",0); + SWIG_RegisterMapping("_size_t","_GLenum",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0); + SWIG_RegisterMapping("_class_wxGIFHandler","_wxGIFHandler",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); @@ -9444,6 +9456,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0); + SWIG_RegisterMapping("_class_wxPNGHandler","_wxPNGHandler",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0); SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0); @@ -9459,6 +9472,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLuint","_int",0); SWIG_RegisterMapping("_GLuint","_wxWindowID",0); SWIG_RegisterMapping("_GLuint","_uint",0); + SWIG_RegisterMapping("_GLuint","_size_t",0); SWIG_RegisterMapping("_GLuint","_GLenum",0); SWIG_RegisterMapping("_GLuint","_GLbitfield",0); SWIG_RegisterMapping("_GLuint","_GLint",0); @@ -9469,6 +9483,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_uint","_GLint",0); SWIG_RegisterMapping("_uint","_GLbitfield",0); SWIG_RegisterMapping("_uint","_GLenum",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -9478,6 +9493,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_wxRect","_class_wxRect",0); SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0); SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0); + SWIG_RegisterMapping("_class_wxImage","_wxImage",0); SWIG_RegisterMapping("_GLclampd","_double",0); SWIG_RegisterMapping("_GLclampd","_GLdouble",0); SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0); @@ -9505,6 +9521,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLbitfield","_int",0); SWIG_RegisterMapping("_GLbitfield","_wxWindowID",0); SWIG_RegisterMapping("_GLbitfield","_uint",0); + SWIG_RegisterMapping("_GLbitfield","_size_t",0); SWIG_RegisterMapping("_GLbitfield","_GLenum",0); SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0); SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0); @@ -9614,6 +9631,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); + SWIG_RegisterMapping("_class_wxImageHandler","_wxImageHandler",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow); SWIG_RegisterMapping("_wxScrolledWindow","_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); @@ -9630,6 +9648,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_unsigned_int","_GLint",0); SWIG_RegisterMapping("_unsigned_int","_GLbitfield",0); SWIG_RegisterMapping("_unsigned_int","_GLenum",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -9659,11 +9678,13 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); SWIG_RegisterMapping("_class_wxGLContext","_wxGLContext",0); SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0); + SWIG_RegisterMapping("_wxJPEGHandler","_class_wxJPEGHandler",0); SWIG_RegisterMapping("_wxWindowID","_GLuint",0); SWIG_RegisterMapping("_wxWindowID","_GLsizei",0); SWIG_RegisterMapping("_wxWindowID","_GLint",0); SWIG_RegisterMapping("_wxWindowID","_GLbitfield",0); SWIG_RegisterMapping("_wxWindowID","_GLenum",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); @@ -9674,6 +9695,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_int","_GLint",0); SWIG_RegisterMapping("_int","_GLbitfield",0); SWIG_RegisterMapping("_int","_GLenum",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); @@ -9721,6 +9743,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLint","_wxWindowID",0); SWIG_RegisterMapping("_GLint","_uint",0); SWIG_RegisterMapping("_GLint","_EBool",0); + SWIG_RegisterMapping("_GLint","_size_t",0); SWIG_RegisterMapping("_GLint","_GLenum",0); SWIG_RegisterMapping("_GLint","_GLbitfield",0); SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);