Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxbind/src html.cpp, 1.17, 1.18 wx_bind.cpp, 1.52, 1.53
|
From: John L. <jr...@us...> - 2006-08-24 05:12:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15690/wxLua/modules/wxbind/src Modified Files: html.cpp wx_bind.cpp Log Message: update bindings to 2.7 Index: html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** html.cpp 12 Jun 2006 03:50:38 -0000 1.17 --- html.cpp 24 Aug 2006 05:12:27 -0000 1.18 *************** *** 1890,1893 **** --- 1890,1912 ---- + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + // !%wxchkver27 wxWindow* GetWindow() + static int LUACALL wxLua_wxHtmlWinParser_GetWindow(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxHtmlWinParser * self = (wxHtmlWinParser *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWinParser); + // call GetWindow + returns = self->GetWindow(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxHTML) // wxColour GetActualColor() const *************** *** 2211,2229 **** } - // wxWindow* GetWindow() - static int LUACALL wxLua_wxHtmlWinParser_GetWindow(lua_State *L) - { - wxLuaState wxlState(L); - wxWindow *returns; - // get this - wxHtmlWinParser * self = (wxHtmlWinParser *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWinParser); - // call GetWindow - returns = self->GetWindow(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); - - return 1; - } - // wxHtmlContainerCell* OpenContainer() static int LUACALL wxLua_wxHtmlWinParser_OpenContainer(lua_State *L) --- 2230,2233 ---- *************** *** 2437,2440 **** --- 2441,2450 ---- static WXLUAMETHOD s_wxHtmlWinParser_methods[] = { + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + { LuaMethod, "GetWindow", wxLua_wxHtmlWinParser_GetWindow, 0, 0, { 0 } }, + { LuaGetProp, "Window", wxLua_wxHtmlWinParser_GetWindow, 0, 0, {0} }, + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxHTML) { LuaMethod, "GetActualColor", wxLua_wxHtmlWinParser_GetActualColor, 0, 0, { 0 } }, *************** *** 2474,2478 **** { LuaMethod, "GetFontUnderlined", wxLua_wxHtmlWinParser_GetFontUnderlined, 0, 0, { 0 } }, { LuaMethod, "GetLink", wxLua_wxHtmlWinParser_GetLink, 0, 0, { 0 } }, - { LuaMethod, "GetWindow", wxLua_wxHtmlWinParser_GetWindow, 0, 0, { 0 } }, { LuaMethod, "OpenContainer", wxLua_wxHtmlWinParser_OpenContainer, 0, 0, { 0 } }, { LuaMethod, "SetAlign", wxLua_wxHtmlWinParser_SetAlign, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 2484,2487 ---- *************** *** 2486,2490 **** { LuaMethod, "SetFonts", wxLua_wxHtmlWinParser_SetFonts, 3, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "SetLink", wxLua_wxHtmlWinParser_SetLink, 1, 1, { &s_wxluatag_wxHtmlLinkInfo, 0 } }, - { LuaGetProp, "Window", wxLua_wxHtmlWinParser_GetWindow, 0, 0, {0} }, { LuaGetProp, "Align", wxLua_wxHtmlWinParser_GetAlign, 0, 0, {0} }, { LuaSetProp, "Align", wxLua_wxHtmlWinParser_SetAlign, 1, 1, {0} }, --- 2495,2498 ---- Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** wx_bind.cpp 8 Aug 2006 22:54:37 -0000 1.52 --- wx_bind.cpp 24 Aug 2006 05:12:27 -0000 1.53 *************** *** 559,563 **** { "wxINVERT", wxINVERT }, { "wxMORE", wxMORE }, - { "wxMOTIF_X", wxMOTIF_X }, { "wxNO", wxNO }, { "wxNO_3D", wxNO_3D }, --- 559,562 ---- *************** *** 591,595 **** { "wxVSCROLL", wxVSCROLL }, { "wxWANTS_CHARS", wxWANTS_CHARS }, - { "wxWINDOWS", wxWINDOWS }, { "wxWS_EX_BLOCK_EVENTS", wxWS_EX_BLOCK_EVENTS }, { "wxWS_EX_PROCESS_IDLE", wxWS_EX_PROCESS_IDLE }, --- 590,593 ---- *************** *** 597,601 **** { "wxWS_EX_TRANSIENT", wxWS_EX_TRANSIENT }, { "wxWS_EX_VALIDATE_RECURSIVELY", wxWS_EX_VALIDATE_RECURSIVELY }, - { "wxXVIEW_X", wxXVIEW_X }, { "wxYES", wxYES }, { "wxYES_DEFAULT", wxYES_DEFAULT }, --- 595,598 ---- *************** *** 1351,1354 **** --- 1348,1389 ---- // -------------------------------------------------------------------- + #if !wxCHECK_VERSION(2,7,0) + { "wxBEOS", wxBEOS }, + { "wxCOSE_X", wxCOSE_X }, + { "wxCURSES", wxCURSES }, + { "wxDOS", wxDOS }, + { "wxGEOS", wxGEOS }, + { "wxGTK", wxGTK }, + { "wxGTK_BEOS", wxGTK_BEOS }, + { "wxGTK_OS2", wxGTK_OS2 }, + { "wxGTK_WIN32", wxGTK_WIN32 }, + { "wxMAC", wxMAC }, + { "wxMAC_DARWIN", wxMAC_DARWIN }, + { "wxMGL_DOS", wxMGL_DOS }, + { "wxMGL_OS2", wxMGL_OS2 }, + { "wxMGL_UNIX", wxMGL_UNIX }, + { "wxMGL_WIN32", wxMGL_WIN32 }, + { "wxMGL_X", wxMGL_X }, + { "wxMICROWINDOWS", wxMICROWINDOWS }, + { "wxMOTIF_X", wxMOTIF_X }, + { "wxNEXTSTEP", wxNEXTSTEP }, + { "wxOS2_PM", wxOS2_PM }, + { "wxPALMOS", wxPALMOS }, + { "wxPENWINDOWS", wxPENWINDOWS }, + { "wxUNIX", wxUNIX }, + { "wxUNKNOWN_PLATFORM", wxUNKNOWN_PLATFORM }, + { "wxWIN32S", wxWIN32S }, + { "wxWIN386", wxWIN386 }, + { "wxWIN95", wxWIN95 }, + { "wxWINDOWS", wxWINDOWS }, + { "wxWINDOWS_CE", wxWINDOWS_CE }, + { "wxWINDOWS_NT", wxWINDOWS_NT }, + { "wxWINDOWS_OS2", wxWINDOWS_OS2 }, + { "wxWINDOWS_POCKETPC", wxWINDOWS_POCKETPC }, + { "wxWINDOWS_SMARTPHONE", wxWINDOWS_SMARTPHONE }, + { "wxX11", wxX11 }, + { "wxXVIEW_X", wxXVIEW_X }, + #endif // !wxCHECK_VERSION(2,7,0) + #if (defined(__WXMAC__)) && (wxLUA_USE_wxCursor) { "wxCURSOR_COPY_ARROW", wxCURSOR_COPY_ARROW }, *************** *** 1540,1544 **** { "wxALIGN_TOP", wxALIGN_TOP }, { "wxALL", wxALL }, - { "wxBEOS", wxBEOS }, { "wxBG_STYLE_COLOUR", wxBG_STYLE_COLOUR }, { "wxBG_STYLE_CUSTOM", wxBG_STYLE_CUSTOM }, --- 1575,1578 ---- *************** *** 1577,1593 **** { "wxBOTH", wxBOTH }, { "wxBOTTOM", wxBOTTOM }, - { "wxCOSE_X", wxCOSE_X }, - { "wxCURSES", wxCURSES }, - { "wxDOS", wxDOS }, { "wxDOWN", wxDOWN }, { "wxEAST", wxEAST }, { "wxEXPAND", wxEXPAND }, { "wxFILE_MUST_EXIST", wxFILE_MUST_EXIST }, - { "wxGEOS", wxGEOS }, { "wxGROW", wxGROW }, - { "wxGTK", wxGTK }, - { "wxGTK_BEOS", wxGTK_BEOS }, - { "wxGTK_OS2", wxGTK_OS2 }, - { "wxGTK_WIN32", wxGTK_WIN32 }, { "wxHORIZONTAL", wxHORIZONTAL }, { "wxIDLE_PROCESS_ALL", wxIDLE_PROCESS_ALL }, --- 1611,1619 ---- *************** *** 1596,1608 **** { "wxIMAGE_RESOLUTION_INCHES", wxIMAGE_RESOLUTION_INCHES }, { "wxLEFT", wxLEFT }, - { "wxMAC", wxMAC }, - { "wxMAC_DARWIN", wxMAC_DARWIN }, - { "wxMGL_DOS", wxMGL_DOS }, - { "wxMGL_OS2", wxMGL_OS2 }, - { "wxMGL_UNIX", wxMGL_UNIX }, - { "wxMGL_WIN32", wxMGL_WIN32 }, - { "wxMGL_X", wxMGL_X }, - { "wxMICROWINDOWS", wxMICROWINDOWS }, - { "wxMOTIF_X", wxMOTIF_X }, { "wxMOUSE_BTN_ANY", wxMOUSE_BTN_ANY }, { "wxMOUSE_BTN_LEFT", wxMOUSE_BTN_LEFT }, --- 1622,1625 ---- *************** *** 1611,1621 **** { "wxMOUSE_BTN_RIGHT", wxMOUSE_BTN_RIGHT }, { "wxMULTIPLE", wxMULTIPLE }, - { "wxNEXTSTEP", wxNEXTSTEP }, { "wxNORTH", wxNORTH }, { "wxOPEN", wxOPEN }, - { "wxOS2_PM", wxOS2_PM }, { "wxOVERWRITE_PROMPT", wxOVERWRITE_PROMPT }, - { "wxPALMOS", wxPALMOS }, - { "wxPENWINDOWS", wxPENWINDOWS }, { "wxRIGHT", wxRIGHT }, { "wxSAVE", wxSAVE }, --- 1628,1634 ---- *************** *** 1625,1630 **** { "wxSTRETCH_NOT", wxSTRETCH_NOT }, { "wxTOP", wxTOP }, - { "wxUNIX", wxUNIX }, - { "wxUNKNOWN_PLATFORM", wxUNKNOWN_PLATFORM }, { "wxUP", wxUP }, { "wxUPDATE_UI_FROMIDLE", wxUPDATE_UI_FROMIDLE }, --- 1638,1641 ---- *************** *** 1635,1647 **** { "wxVERTICAL", wxVERTICAL }, { "wxWEST", wxWEST }, - { "wxWIN32S", wxWIN32S }, - { "wxWIN386", wxWIN386 }, - { "wxWIN95", wxWIN95 }, - { "wxWINDOWS", wxWINDOWS }, - { "wxWINDOWS_CE", wxWINDOWS_CE }, - { "wxWINDOWS_NT", wxWINDOWS_NT }, - { "wxWINDOWS_OS2", wxWINDOWS_OS2 }, - { "wxWINDOWS_POCKETPC", wxWINDOWS_POCKETPC }, - { "wxWINDOWS_SMARTPHONE", wxWINDOWS_SMARTPHONE }, { "wxWINDOW_VARIANT_LARGE", wxWINDOW_VARIANT_LARGE }, { "wxWINDOW_VARIANT_MAX", wxWINDOW_VARIANT_MAX }, --- 1646,1649 ---- *************** *** 1649,1654 **** { "wxWINDOW_VARIANT_NORMAL", wxWINDOW_VARIANT_NORMAL }, { "wxWINDOW_VARIANT_SMALL", wxWINDOW_VARIANT_SMALL }, - { "wxX11", wxX11 }, - { "wxXVIEW_X", wxXVIEW_X }, #if WXWIN_COMPATIBILITY_2_4 --- 1651,1654 ---- |
