Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbindaui/src aui.cpp,1.1,1.2
|
From: John L. <jr...@us...> - 2007-07-04 14:46:15
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindaui/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27321/wxLua/modules/wxbindaui/src Modified Files: aui.cpp Log Message: Fix for wxABI_VERSION being broken in 2.8.4 (release = 99 for some reason) Index: aui.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindaui/src/aui.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** aui.cpp 4 Jul 2007 05:39:20 -0000 1.1 --- aui.cpp 4 Jul 2007 14:46:11 -0000 1.2 *************** *** 2375,2378 **** --- 2375,2380 ---- } + + #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetAuiManager[] = { &s_wxluatag_wxAuiNotebook, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetAuiManager(lua_State *L); *************** *** 2393,2396 **** --- 2395,2401 ---- } + #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetHeightForPageHeight[] = { &s_wxluatag_wxAuiNotebook, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetHeightForPageHeight(lua_State *L); *************** *** 2413,2416 **** --- 2418,2423 ---- } + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetPage[] = { &s_wxluatag_wxAuiNotebook, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetPage(lua_State *L); *************** *** 2536,2539 **** --- 2543,2548 ---- } + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_GetTabCtrlHeight[] = { &s_wxluatag_wxAuiNotebook, NULL }; static int LUACALL wxLua_wxAuiNotebook_GetTabCtrlHeight(lua_State *L); *************** *** 2554,2557 **** --- 2563,2567 ---- } + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) *************** *** 2626,2630 **** ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetFont[] = { &s_wxluatag_wxAuiNotebook, &s_wxluatag_wxFont, NULL }; static int LUACALL wxLua_wxAuiNotebook_SetFont(lua_State *L); --- 2636,2640 ---- ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetFont[] = { &s_wxluatag_wxAuiNotebook, &s_wxluatag_wxFont, NULL }; static int LUACALL wxLua_wxAuiNotebook_SetFont(lua_State *L); *************** *** 2681,2685 **** } ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) --- 2691,2695 ---- } ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) *************** *** 2731,2735 **** ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetSelectedFont[] = { &s_wxluatag_wxAuiNotebook, &s_wxluatag_wxFont, NULL }; static int LUACALL wxLua_wxAuiNotebook_SetSelectedFont(lua_State *L); --- 2741,2745 ---- ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetSelectedFont[] = { &s_wxluatag_wxAuiNotebook, &s_wxluatag_wxFont, NULL }; static int LUACALL wxLua_wxAuiNotebook_SetSelectedFont(lua_State *L); *************** *** 2749,2753 **** } ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetSelection[] = { &s_wxluatag_wxAuiNotebook, &s_wxluaarg_Number, NULL }; --- 2759,2763 ---- } ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiNotebook_SetSelection[] = { &s_wxluatag_wxAuiNotebook, &s_wxluaarg_Number, NULL }; *************** *** 2936,2941 **** --- 2946,2958 ---- { "DeletePage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_DeletePage, 1, NULL }, { "GetArtProvider", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetArtProvider, 1, NULL }, + + #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) { "GetAuiManager", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetAuiManager, 1, NULL }, + #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && ((wxABI_VERSION >= 20801 ))) && (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) { "GetHeightForPageHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetHeightForPageHeight, 1, NULL }, + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + { "GetPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetPage, 1, NULL }, *************** *** 2948,2952 **** --- 2965,2972 ---- { "GetPageText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetPageText, 1, NULL }, { "GetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetSelection, 1, NULL }, + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) { "GetTabCtrlHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_GetTabCtrlHeight, 1, NULL }, + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) *************** *** 2957,2965 **** { "SetArtProvider", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetArtProvider, 1, NULL }, ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) { "SetFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetFont, 1, NULL }, { "SetMeasuringFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetMeasuringFont, 1, NULL }, { "SetNormalFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetNormalFont, 1, NULL }, ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) --- 2977,2985 ---- { "SetArtProvider", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetArtProvider, 1, NULL }, ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) { "SetFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetFont, 1, NULL }, { "SetMeasuringFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetMeasuringFont, 1, NULL }, { "SetNormalFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetNormalFont, 1, NULL }, ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxBitmap) *************** *** 2969,2975 **** { "SetPageText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetPageText, 1, NULL }, ! #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) { "SetSelectedFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetSelectedFont, 1, NULL }, ! #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxLUA_USE_wxFont) { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetSelection, 1, NULL }, --- 2989,2995 ---- { "SetPageText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetPageText, 1, NULL }, ! #if ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) { "SetSelectedFont", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetSelectedFont, 1, NULL }, ! #endif // ((wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5))) && (wxLUA_USE_wxFont) { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiNotebook_SetSelection, 1, NULL }, |
