From: John L. <jr...@us...> - 2006-05-04 05:07:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19877/wxLua/modules/wxbind/src Modified Files: clipdrag.cpp wx_bind.cpp Log Message: fix static wxClipboard::Get in clipdrag.i cleanup in interal.cpp add more pages to prefs dialog in wxluasudoku Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wx_bind.cpp 2 May 2006 05:25:04 -0000 1.31 --- wx_bind.cpp 4 May 2006 05:07:03 -0000 1.32 *************** *** 2970,2973 **** --- 2970,2993 ---- + #if (wxLUA_USE_wxClipboard) && ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard)) + + // %wxchkver25 %static wxClipboard *Get() + static int LUACALL wxLua_wxClipboard_Get(lua_State *L) + { + wxLuaState wxlState(L); + wxClipboard *returns; + // call Get + returns = wxClipboard::Get(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxClipboard, returns); + + return 1; + } + + + + #endif + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,3,0)) *************** *** 4741,4744 **** --- 4761,4769 ---- + #if (wxLUA_USE_wxClipboard) && ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard)) + { LuaGlobal, "wxClipboard_Get", wxLua_wxClipboard_Get, 0, 0, { 0 } }, + #endif + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,3,0)) { LuaGlobal, "wxGetMousePosition", wxLua_function_wxGetMousePosition, 0, 0, { 0 } }, Index: clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** clipdrag.cpp 2 May 2006 05:25:01 -0000 1.17 --- clipdrag.cpp 4 May 2006 05:07:03 -0000 1.18 *************** *** 40,44 **** #if (wxLUA_USE_wxClipboard) && ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard)) ! // %wxchkver25 static wxClipboard *Get() static int LUACALL wxLua_wxClipboard_Get(lua_State *L) { --- 40,44 ---- #if (wxLUA_USE_wxClipboard) && ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard)) ! // %wxchkver25 %static wxClipboard *Get() static int LUACALL wxLua_wxClipboard_Get(lua_State *L) { |