Update of /cvsroot/wxlua/wxLua/bindings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20923/wxLua/bindings
Modified Files:
genwxbind.lua
Log Message:
remove trailing ;
use wxModule for "static" initialization of the bindings to avoid library linking problems
Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** genwxbind.lua 30 Dec 2005 04:35:59 -0000 1.15
--- genwxbind.lua 10 Jan 2006 04:58:06 -0000 1.16
***************
*** 3087,3091 ****
end
! table.insert(codeList, " "..memberTypeWithAttrib.."returns;\n");
end
--- 3087,3091 ----
end
! table.insert(codeList, " "..memberTypeWithAttrib.."returns;\n")
end
***************
*** 3167,3171 ****
table.insert(codeList, "\n return 1;\n")
! table.insert(codeList, "}\n\n");
else
-- how we call c-function
--- 3167,3171 ----
table.insert(codeList, "\n return 1;\n")
! table.insert(codeList, "}\n\n")
else
-- how we call c-function
***************
*** 3207,3211 ****
table.insert(codeList, " "..functor..";\n")
table.insert(codeList, "\n return 0;\n")
! table.insert(codeList, "}\n\n");
else
-- call function, get return value
--- 3207,3211 ----
table.insert(codeList, " "..functor..";\n")
table.insert(codeList, "\n return 0;\n")
! table.insert(codeList, "}\n\n")
else
-- call function, get return value
***************
*** 3261,3265 ****
table.insert(codeList, "\n return 1;\n")
! table.insert(codeList, "}\n\n");
end
end
--- 3261,3265 ----
table.insert(codeList, "\n return 1;\n")
! table.insert(codeList, "}\n\n")
end
end
***************
*** 3670,3689 ****
table.insert(fileData, "\n")
table.insert(fileData, "\n")
table.insert(fileData, "// bind "..hook_namespace.." functions to lua interpreter\n")
table.insert(fileData, "bool bind_"..hook_namespace.."(lua_State* L)\n")
table.insert(fileData, "{\n")
! table.insert(fileData, " wxLuaState wxlState(L);\n");
! table.insert(fileData, " wxCHECK_MSG(wxlState.Ok(), false, wxT(\"Invalid wxLuaState\"));\n");
! table.insert(fileData, "\n");
! table.insert(fileData, " wxASSERT(!wxlState.GetLuaStateRefData()->m_typesRegistered);\n");
! table.insert(fileData, " wxASSERT(!wxlState.GetLuaBinding(wxT(\""..hook_namespace.."\")));\n");
! table.insert(fileData, "\n");
! table.insert(fileData, " // ignore binding request when we already have "..hook_namespace.." registered\n");
! table.insert(fileData, " if (wxlState.GetLuaBinding(wxT(\""..hook_namespace.."\")))\n");
! table.insert(fileData, " return false;\n");
! table.insert(fileData, "\n");
! table.insert(fileData, " wxlState.GetLuaStateRefData()->m_bindings.Append(new "..hook_binding_class.."());\n");
! table.insert(fileData, "\n");
! table.insert(fileData, " return true;\n");
table.insert(fileData, "}\n")
--- 3670,3690 ----
table.insert(fileData, "\n")
table.insert(fileData, "\n")
+
table.insert(fileData, "// bind "..hook_namespace.." functions to lua interpreter\n")
table.insert(fileData, "bool bind_"..hook_namespace.."(lua_State* L)\n")
table.insert(fileData, "{\n")
! table.insert(fileData, " wxLuaState wxlState(L);\n")
! table.insert(fileData, " wxCHECK_MSG(wxlState.Ok(), false, wxT(\"Invalid wxLuaState\"));\n")
! table.insert(fileData, "\n")
! table.insert(fileData, " wxASSERT(!wxlState.GetLuaStateRefData()->m_typesRegistered);\n")
! table.insert(fileData, " wxASSERT(!wxlState.GetLuaBinding(wxT(\""..hook_namespace.."\")));\n")
! table.insert(fileData, "\n")
! table.insert(fileData, " // ignore binding request when we already have "..hook_namespace.." registered\n")
! table.insert(fileData, " if (wxlState.GetLuaBinding(wxT(\""..hook_namespace.."\")))\n")
! table.insert(fileData, " return false;\n")
! table.insert(fileData, "\n")
! table.insert(fileData, " wxlState.GetLuaStateRefData()->m_bindings.Append(new "..hook_binding_class.."());\n")
! table.insert(fileData, "\n")
! table.insert(fileData, " return true;\n")
table.insert(fileData, "}\n")
***************
*** 3749,3763 ****
-- create a instance of the hook binding class to initialize it
table.insert(fileData, "\n\n")
!
! table.insert(fileData, "class "..hook_binding_class.."Init\n")
table.insert(fileData, "{\n")
table.insert(fileData, "public:\n")
! table.insert(fileData, " "..hook_binding_class.."Init()\n")
table.insert(fileData, " {\n")
! table.insert(fileData, " m_binding.GetBindingList()->Append(&m_binding);\n")
table.insert(fileData, " }\n")
table.insert(fileData, " "..hook_binding_class.." m_binding;\n")
table.insert(fileData, "};\n\n")
! table.insert(fileData, hook_binding_class.."Init s_"..hook_binding_class.."Init;\n\n")
return fileData
--- 3750,3767 ----
-- create a instance of the hook binding class to initialize it
table.insert(fileData, "\n\n")
! table.insert(fileData, "class "..hook_binding_class.."Init : public wxModule\n")
table.insert(fileData, "{\n")
table.insert(fileData, "public:\n")
! table.insert(fileData, " "..hook_binding_class.."Init() {}\n")
! table.insert(fileData, " bool OnInit()\n")
table.insert(fileData, " {\n")
! table.insert(fileData, " wxLuaBinding::GetBindingList()->Append(&m_binding);\n")
! table.insert(fileData, " return true;\n")
table.insert(fileData, " }\n")
+ table.insert(fileData, " void OnExit() {}\n")
table.insert(fileData, " "..hook_binding_class.." m_binding;\n")
+ table.insert(fileData, " DECLARE_DYNAMIC_CLASS("..hook_binding_class.."Init);\n")
table.insert(fileData, "};\n\n")
! table.insert(fileData, "IMPLEMENT_DYNAMIC_CLASS("..hook_binding_class.."Init, wxModule);\n")
return fileData
***************
*** 4405,4409 ****
io.write(tostring(o))
else
! error("cannot serialize a "..type(o));
end
end
--- 4409,4413 ----
io.write(tostring(o))
else
! error("cannot serialize a "..type(o))
end
end
|
