From: John L. <jr...@us...> - 2005-11-25 18:52:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15042/wxLua/modules/wxlua/src Modified Files: internal.cpp wxlhandl.cpp wxlstate.cpp Log Message: initialize vars in debugio.cpp add static function in wxLuaHandler to get the global handler, deprecate global function code cleaning Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** internal.cpp 25 Nov 2005 10:09:11 -0000 1.7 --- internal.cpp 25 Nov 2005 18:52:21 -0000 1.8 *************** *** 1930,1934 **** #else #define LUAERROR_OUTPUT(msg) \ ! wxGetLuaHandler().DisplayError(msg); #endif --- 1930,1934 ---- #else #define LUAERROR_OUTPUT(msg) \ ! wxLuaHandler::GetHandler().DisplayError(msg); #endif Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlstate.cpp 25 Nov 2005 10:09:11 -0000 1.2 --- wxlstate.cpp 25 Nov 2005 18:52:21 -0000 1.3 *************** *** 1362,1366 **** #else #define LUAERROR_OUTPUT(msg) \ ! wxGetLuaHandler().DisplayError(msg); #endif --- 1362,1366 ---- #else #define LUAERROR_OUTPUT(msg) \ ! wxLuaHandler::GetHandler().DisplayError(msg); #endif Index: wxlhandl.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlhandl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlhandl.cpp 25 Nov 2005 02:46:53 -0000 1.1 --- wxlhandl.cpp 25 Nov 2005 18:52:21 -0000 1.2 *************** *** 35,40 **** wxLuaHandler::wxLuaHandler() { ! wxASSERT(!sm_luahandler); ! sm_luahandler = this; } --- 35,39 ---- wxLuaHandler::wxLuaHandler() { ! wxASSERT_MSG(!sm_luahandler, wxT("There can only be one wxLuaHandler")); sm_luahandler = this; } *************** *** 47,50 **** wxLuaHandler& wxGetLuaHandler() { ! return *wxLuaHandler::sm_luahandler; } --- 46,49 ---- wxLuaHandler& wxGetLuaHandler() { ! return wxLuaHandler::GetHandler(); } |