Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src wxgl_gl.cpp,1.6,1.7
|
From: John L. <jr...@us...> - 2008-01-09 05:03:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16893/wxLua/modules/wxbind/src Modified Files: wxgl_gl.cpp Log Message: Update for OSX since wxGLXXX doesn't match MSW or GTK Index: wxgl_gl.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxgl_gl.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxgl_gl.cpp 22 Dec 2007 06:07:14 -0000 1.6 --- wxgl_gl.cpp 9 Jan 2008 05:02:53 -0000 1.7 *************** *** 62,70 **** ! #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1[] = { &g_wxluatype_wxGLCanvas, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLCanvas_SetCurrent1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent1[1] = {{ wxLua_wxGLCanvas_SetCurrent1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1 }}; ! // %wxchkver_2_8 void SetCurrent(const wxGLContext& RC) const static int LUACALL wxLua_wxGLCanvas_SetCurrent1(lua_State *L) { --- 62,70 ---- ! #if ((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1[] = { &g_wxluatype_wxGLCanvas, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLCanvas_SetCurrent1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent1[1] = {{ wxLua_wxGLCanvas_SetCurrent1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1 }}; ! // %wxchkver_2_8&!%mac void SetCurrent(const wxGLContext& RC) const static int LUACALL wxLua_wxGLCanvas_SetCurrent1(lua_State *L) { *************** *** 79,88 **** } ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent[] = { &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent[1] = {{ wxLua_wxGLCanvas_SetCurrent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent }}; ! // void SetCurrent() static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L) { --- 79,89 ---- } ! #endif // ((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) + #if (defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent[] = { &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent[1] = {{ wxLua_wxGLCanvas_SetCurrent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent }}; ! // %mac void SetCurrent() static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L) { *************** *** 95,98 **** --- 96,101 ---- } + #endif // (defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) + static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_SwapBuffers[] = { &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLCanvas_SwapBuffers(lua_State *L); *************** *** 110,118 **** ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_constructor3[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TTABLE, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor3[1] = {{ wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatypeArray_wxLua_wxGLCanvas_constructor3 }}; ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L) { --- 113,121 ---- ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_constructor3[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_TTABLE, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor3[1] = {{ wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatypeArray_wxLua_wxGLCanvas_constructor3 }}; ! // !%mac wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L) { *************** *** 145,148 **** --- 148,154 ---- } + #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect) + + #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLCanvas_constructor2[] = { &g_wxluatype_wxWindow, &g_wxluatype_wxGLCanvas, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, &g_wxluatype_TTABLE, &g_wxluatype_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L); *************** *** 255,280 **** ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)))||(wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload[] = { ! #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { wxLua_wxGLCanvas_SetCurrent1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1 }, ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { wxLua_wxGLCanvas_SetCurrent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent }, }; static int s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload_count = sizeof(s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)))||(wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor_overload[] = { ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatypeArray_wxLua_wxGLCanvas_constructor3 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) --- 261,289 ---- ! #if (((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))||((defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload[] = { ! #if ((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLCanvas_SetCurrent1, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent1 }, ! #endif // ((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! ! #if (defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLCanvas_SetCurrent, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLCanvas_SetCurrent }, + #endif // (defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload_count = sizeof(s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))||((defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! #if ((((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor_overload[] = { ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect) { wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatypeArray_wxLua_wxGLCanvas_constructor3 }, ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect) #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) *************** *** 292,296 **** static int s_wxluafunc_wxLua_wxGLCanvas_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxGLCanvas_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) // Map Lua Class Methods to C Binding Functions --- 301,305 ---- static int s_wxluafunc_wxLua_wxGLCanvas_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxGLCanvas_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) // Map Lua Class Methods to C Binding Functions *************** *** 299,311 **** { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SetColour, 1, NULL }, ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)))||(wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { "SetCurrent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload, s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)))||(wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { "SwapBuffers", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SwapBuffers, 1, NULL }, ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) { "wxGLCanvas", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGLCanvas_constructor_overload, s_wxluafunc_wxLua_wxGLCanvas_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) { 0, 0, 0, 0 }, --- 308,320 ---- { "SetColour", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SetColour, 1, NULL }, ! #if (((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))||((defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "SetCurrent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload, s_wxluafunc_wxLua_wxGLCanvas_SetCurrent_overload_count, 0 }, ! #endif // (((wxCHECK_VERSION(2,8,0) && !defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))||((defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "SwapBuffers", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLCanvas_SwapBuffers, 1, NULL }, ! #if ((((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) { "wxGLCanvas", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGLCanvas_constructor_overload, s_wxluafunc_wxLua_wxGLCanvas_constructor_overload_count, 0 }, ! #endif // ((((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && ((!defined(__WXMAC__)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPointSizeRect))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect)) { 0, 0, 0, 0 }, *************** *** 358,365 **** } static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1[] = { &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_SetCurrent1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent1[1] = {{ wxLua_wxGLContext_SetCurrent1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1 }}; ! // void SetCurrent() static int LUACALL wxLua_wxGLContext_SetCurrent1(lua_State *L) { --- 367,391 ---- } + static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent2[] = { &g_wxluatype_wxGLContext, NULL }; + static int LUACALL wxLua_wxGLContext_SetCurrent2(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent2[1] = {{ wxLua_wxGLContext_SetCurrent2, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent2 }}; + // void SetCurrent() + static int LUACALL wxLua_wxGLContext_SetCurrent2(lua_State *L) + { + // get this + wxGLContext * self = (wxGLContext *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxGLContext); + // call SetCurrent + self->SetCurrent(); + + return 0; + } + + #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) + + #if (defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1[] = { &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_SetCurrent1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent1[1] = {{ wxLua_wxGLContext_SetCurrent1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1 }}; ! // %mac void SetCurrent() const static int LUACALL wxLua_wxGLContext_SetCurrent1(lua_State *L) { *************** *** 372,382 **** } ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent[] = { &g_wxluatype_wxGLContext, &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent[1] = {{ wxLua_wxGLContext_SetCurrent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent }}; ! // void SetCurrent(const wxGLCanvas& win) const static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L) { --- 398,408 ---- } ! #endif // (defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) ! #if ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_SetCurrent[] = { &g_wxluatype_wxGLContext, &g_wxluatype_wxGLCanvas, NULL }; static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent[1] = {{ wxLua_wxGLContext_SetCurrent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent }}; ! // !%mac void SetCurrent(const wxGLCanvas& win) const static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L) { *************** *** 391,395 **** } ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) --- 417,421 ---- } ! #endif // ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) *************** *** 463,471 **** #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_constructor[] = { &g_wxluatype_wxGLCanvas, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor[1] = {{ wxLua_wxGLContext_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxGLContext_constructor }}; ! // wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) static int LUACALL wxLua_wxGLContext_constructor(lua_State *L) { --- 489,497 ---- #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! #if ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) static wxLuaArgType s_wxluatypeArray_wxLua_wxGLContext_constructor[] = { &g_wxluatype_wxGLCanvas, &g_wxluatype_wxGLContext, NULL }; static int LUACALL wxLua_wxGLContext_constructor(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor[1] = {{ wxLua_wxGLContext_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxGLContext_constructor }}; ! // !%mac wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) // FIXME static int LUACALL wxLua_wxGLContext_constructor(lua_State *L) { *************** *** 486,494 **** } ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload[] = --- 512,520 ---- } ! #endif // ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||((defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload[] = *************** *** 496,511 **** #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! { wxLua_wxGLContext_SetCurrent1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1 }, #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLContext_SetCurrent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload_count = sizeof(s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor_overload[] = --- 522,541 ---- #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! { wxLua_wxGLContext_SetCurrent2, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent2 }, #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if (defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) ! { wxLua_wxGLContext_SetCurrent1, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent1 }, ! #endif // (defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) ! ! #if ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLContext_SetCurrent, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxGLContext_SetCurrent }, ! #endif // ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload_count = sizeof(s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload)/sizeof(wxLuaBindCFunc); ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||((defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLContext_constructor_overload[] = *************** *** 520,530 **** #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLContext_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxGLContext_constructor }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLContext_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxGLContext_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // Map Lua Class Methods to C Binding Functions --- 550,560 ---- #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE) ! #if ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { wxLua_wxGLContext_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxGLContext_constructor }, ! #endif // ((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) }; static int s_wxluafunc_wxLua_wxGLContext_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxGLContext_constructor_overload)/sizeof(wxLuaBindCFunc); ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) // Map Lua Class Methods to C Binding Functions *************** *** 535,541 **** #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "SetCurrent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload, s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) --- 565,571 ---- #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||((defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "SetCurrent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload, s_wxluafunc_wxLua_wxGLContext_SetCurrent_overload_count, 0 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))||((defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) *************** *** 543,549 **** #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "wxGLContext", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGLContext_constructor_overload, s_wxluafunc_wxLua_wxGLContext_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { 0, 0, 0, 0 }, --- 573,579 ---- #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)) ! #if (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { "wxGLContext", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxGLContext_constructor_overload, s_wxluafunc_wxLua_wxGLContext_constructor_overload_count, 0 }, ! #endif // (((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (!wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxPalette && wxUSE_PALETTE))||(((!defined(__WXMAC__)) && ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxCHECK_VERSION(2,8,0)))) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) { 0, 0, 0, 0 }, |
