From: John L. <jr...@us...> - 2008-01-17 18:26:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9816/wxLua/modules/wxbind/src Modified Files: wxaui_aui.cpp wxaui_bind.cpp Log Message: %wxchkver_2_8_6 for some wxAui items. Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxaui_bind.cpp 22 Dec 2007 06:07:11 -0000 1.5 --- wxaui_bind.cpp 17 Jan 2008 18:26:28 -0000 1.6 *************** *** 147,151 **** --- 147,157 ---- { "wxAUI_NB_DEFAULT_STYLE", wxAUI_NB_DEFAULT_STYLE }, { "wxAUI_NB_LEFT", wxAUI_NB_LEFT }, + #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI + + #if (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) { "wxAUI_NB_MIDDLE_CLICK_CLOSE", wxAUI_NB_MIDDLE_CLICK_CLOSE }, + #endif // (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + + #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { "wxAUI_NB_RIGHT", wxAUI_NB_RIGHT }, { "wxAUI_NB_SCROLL_BUTTONS", wxAUI_NB_SCROLL_BUTTONS }, Index: wxaui_aui.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_aui.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxaui_aui.cpp 22 Dec 2007 06:07:11 -0000 1.14 --- wxaui_aui.cpp 17 Jan 2008 18:26:28 -0000 1.15 *************** *** 1659,1667 **** #endif // (wxCHECK_VERSION(2,8,5)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxDC) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_IsTabVisible[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxDC, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_IsTabVisible(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_IsTabVisible[1] = {{ wxLua_wxAuiTabCtrl_IsTabVisible, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxAuiTabCtrl_IsTabVisible }}; ! // bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd); static int LUACALL wxLua_wxAuiTabCtrl_IsTabVisible(lua_State *L) { --- 1659,1667 ---- #endif // (wxCHECK_VERSION(2,8,5)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) ! #if ((wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxDC) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_IsTabVisible[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_wxDC, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_IsTabVisible(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_IsTabVisible[1] = {{ wxLua_wxAuiTabCtrl_IsTabVisible, WXLUAMETHOD_METHOD, 5, 5, s_wxluatypeArray_wxLua_wxAuiTabCtrl_IsTabVisible }}; ! // %wxchkver_2_8_6 bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd); static int LUACALL wxLua_wxAuiTabCtrl_IsTabVisible(lua_State *L) { *************** *** 1684,1693 **** } ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxDC) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_MakeTabVisible[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_TNUMBER, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_MakeTabVisible(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_MakeTabVisible[1] = {{ wxLua_wxAuiTabCtrl_MakeTabVisible, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiTabCtrl_MakeTabVisible }}; ! // void MakeTabVisible(int tabPage, wxWindow* win); static int LUACALL wxLua_wxAuiTabCtrl_MakeTabVisible(lua_State *L) { --- 1684,1694 ---- } ! #endif // ((wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxDC) + #if (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_MakeTabVisible[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_TNUMBER, &g_wxluatype_wxWindow, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_MakeTabVisible(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_MakeTabVisible[1] = {{ wxLua_wxAuiTabCtrl_MakeTabVisible, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxAuiTabCtrl_MakeTabVisible }}; ! // %wxchkver_2_8_6 void MakeTabVisible(int tabPage, wxWindow* win); static int LUACALL wxLua_wxAuiTabCtrl_MakeTabVisible(lua_State *L) { *************** *** 1704,1707 **** --- 1705,1710 ---- } + #endif // (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + static wxLuaArgType s_wxluatypeArray_wxLua_wxAuiTabCtrl_MovePage[] = { &g_wxluatype_wxAuiTabCtrl, &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, NULL }; static int LUACALL wxLua_wxAuiTabCtrl_MovePage(lua_State *L); *************** *** 2037,2045 **** #endif // (wxCHECK_VERSION(2,8,5)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxDC) { "IsTabVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_IsTabVisible, 1, NULL }, ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxDC) { "MakeTabVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_MakeTabVisible, 1, NULL }, { "MovePage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_MovePage, 1, NULL }, { "RemoveButton", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_RemoveButton, 1, NULL }, --- 2040,2051 ---- #endif // (wxCHECK_VERSION(2,8,5)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) ! #if ((wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxDC) { "IsTabVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_IsTabVisible, 1, NULL }, ! #endif // ((wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI)) && (wxLUA_USE_wxDC) + #if (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) { "MakeTabVisible", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_MakeTabVisible, 1, NULL }, + #endif // (wxCHECK_VERSION(2,8,6)) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + { "MovePage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_MovePage, 1, NULL }, { "RemoveButton", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiTabCtrl_RemoveButton, 1, NULL }, |