Updated to Lua 5.2

Build/CMakeLists.txt

@@ -102,7 +102,7 @@ endif()
 
 #Lua
 if(BUILD_LUA_BINDINGS)
-    find_package(Lua51 REQUIRED)
+    find_package(Lua52 REQUIRED)
     if(LUA_INCLUDE_DIR)
         include_directories(${LUA_INCLUDE_DIR})
         list(APPEND LUA_BINDINGS_LINK_LIBS ${LUA_LIBRARIES})

Include/Rocket/Core/Debug.h

@@ -35,7 +35,7 @@
 	#if defined (__MINGW32__)
 		#define ROCKET_BREAK asm("int $0x03")
 	#else
-		#define ROCKET_BREAK __debugbreak();
+		#define ROCKET_BREAK _asm { int 0x03 }
 	#endif
 #elif defined (ROCKET_PLATFORM_LINUX)
 	#if defined __i386__ || defined __x86_64__

Include/Rocket/Core/Lua/LuaType.h

@@ -60,16 +60,16 @@
 #define LUACORETYPEDEFINE(type,is_ref_counted) \
     template<> const char* GetTClassName<type>() { return #type; } \
     template<> RegType<type>* GetMethodTable<type>() { return type##Methods; } \
-    template<> luaL_reg* GetAttrTable<type>() { return type##Getters; } \
-    template<> luaL_reg* SetAttrTable<type>() { return type##Setters; } \
+    template<> luaL_Reg* GetAttrTable<type>() { return type##Getters; } \
+    template<> luaL_Reg* SetAttrTable<type>() { return type##Setters; } \
     template<> bool IsReferenceCounted<type>() { return (is_ref_counted); } \
 
 //We can't use LUACORETYPEDEFINE due to namespace issues
 #define LUACONTROLSTYPEDEFINE(type,is_ref_counted) \
     template<> const char* GetTClassName<type>() { return #type; } \
     template<> RegType<type>* GetMethodTable<type>() { return Rocket::Controls::Lua::type##Methods; } \
-    template<> luaL_reg* GetAttrTable<type>() { return Rocket::Controls::Lua::type##Getters; } \
-    template<> luaL_reg* SetAttrTable<type>() { return Rocket::Controls::Lua::type##Setters; } \
+    template<> luaL_Reg* GetAttrTable<type>() { return Rocket::Controls::Lua::type##Getters; } \
+    template<> luaL_Reg* SetAttrTable<type>() { return Rocket::Controls::Lua::type##Setters; } \
     template<> bool IsReferenceCounted<type>() { return (is_ref_counted); } \
 
 /** Used to remove repetitive typing at the cost of flexibility. It creates function prototypes for
@@ -79,8 +79,8 @@ the LUACORETYPEDEFINE macro, or make sure that the function signatures are @em e
 #define LUACORETYPEDECLARE(type) \
     template<> ROCKETLUA_API const char* GetTClassName<type>(); \
     template<> ROCKETLUA_API RegType<type>* GetMethodTable<type>(); \
-    template<> ROCKETLUA_API luaL_reg* GetAttrTable<type>(); \
-    template<> ROCKETLUA_API luaL_reg* SetAttrTable<type>(); \
+    template<> ROCKETLUA_API luaL_Reg* GetAttrTable<type>(); \
+    template<> ROCKETLUA_API luaL_Reg* SetAttrTable<type>(); \
     template<> ROCKETLUA_API bool IsReferenceCounted<type>(); \
 
 /** Used to remove repetitive typing at the cost of flexibility. It creates function prototypes for
@@ -90,14 +90,14 @@ the LUACORETYPEDEFINE macro, or make sure that the function signatures are @em e
 #define LUACONTROLSTYPEDECLARE(type) \
     template<> ROCKETLUA_API const char* GetTClassName<type>(); \
     template<> ROCKETLUA_API RegType<type>* GetMethodTable<type>(); \
-    template<> ROCKETLUA_API luaL_reg* GetAttrTable<type>(); \
-    template<> ROCKETLUA_API luaL_reg* SetAttrTable<type>(); \
+    template<> ROCKETLUA_API luaL_Reg* GetAttrTable<type>(); \
+    template<> ROCKETLUA_API luaL_Reg* SetAttrTable<type>(); \
     template<> ROCKETLUA_API bool IsReferenceCounted<type>(); \
 
 namespace Rocket {
 namespace Core {
 namespace Lua {
-//replacement for luaL_reg that uses a different function pointer signature, but similar syntax
+//replacement for luaL_Reg that uses a different function pointer signature, but similar syntax
 template<typename T>
 struct ROCKETLUA_API RegType
 {
@@ -108,9 +108,9 @@ struct ROCKETLUA_API RegType
 /** For all of the methods available from Lua that call to the C functions. */
 template<typename T> ROCKETLUA_API RegType<T>* GetMethodTable();
 /** For all of the function that 'get' an attribute/property */
-template<typename T> ROCKETLUA_API luaL_reg* GetAttrTable();
+template<typename T> ROCKETLUA_API luaL_Reg* GetAttrTable();
 /** For all of the functions that 'set' an attribute/property  */
-template<typename T> ROCKETLUA_API luaL_reg* SetAttrTable();
+template<typename T> ROCKETLUA_API luaL_Reg* SetAttrTable();
 /** String representation of the class */
 template<typename T> ROCKETLUA_API const char* GetTClassName();
 /** bool for if it is reference counted */
@@ -133,7 +133,7 @@ class ROCKETLUA_API LuaType
 {
 public:
     typedef int (*ftnptr)(lua_State* L, T* ptr);
-    /** replacement for luaL_reg that uses a different function pointer signature, but similar syntax */
+    /** replacement for luaL_Reg that uses a different function pointer signature, but similar syntax */
     typedef struct { const char* name; ftnptr func; } RegType;
 
     /** Registers the type T as a type in the Lua global namespace by creating a

Include/Rocket/Core/Lua/LuaType.inl

@@ -314,7 +314,7 @@ void LuaType<T>::_regfunctions(lua_State* L, int meta, int methods)
         lua_setfield(L,methods,"__getters"); // pop [1]
         lua_getfield(L,methods,"__getters"); // -> table [1]
     }
-    for(luaL_reg* m = (luaL_reg*)GetAttrTable<T>(); m->name; m++)
+    for(luaL_Reg* m = (luaL_Reg*)GetAttrTable<T>(); m->name; m++)
     {
         lua_pushcfunction(L,m->func); // -> [2] is this function
         lua_setfield(L,-2,m->name); //[-2 = 1] -> __getters.name = function
@@ -330,7 +330,7 @@ void LuaType<T>::_regfunctions(lua_State* L, int meta, int methods)
         lua_setfield(L,methods,"__setters"); // pop [1]
         lua_getfield(L,methods,"__setters"); // -> table [1]
     }
-    for(luaL_reg* m = (luaL_reg*)SetAttrTable<T>(); m->name; m++)
+    for(luaL_Reg* m = (luaL_Reg*)SetAttrTable<T>(); m->name; m++)
     {
         lua_pushcfunction(L,m->func); // -> [2] is this function
         lua_setfield(L,-2,m->name); //[-2 = 1] -> __setters.name = function

Source/Controls/Lua/DataFormatter.cpp

@@ -90,12 +90,12 @@ Rocket::Core::Lua::RegType<DataFormatter> DataFormatterMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg DataFormatterGetters[] =
+luaL_Reg DataFormatterGetters[] =
 {
     { NULL, NULL },
 };
 
-luaL_reg DataFormatterSetters[] =
+luaL_Reg DataFormatterSetters[] =
 {
     LUASETTER(DataFormatter,FormatData)
     { NULL, NULL },

Source/Controls/Lua/DataFormatter.h

@@ -45,8 +45,8 @@ int DataFormatternew(lua_State* L);
 int DataFormatterSetAttrFormatData(lua_State* L);
 
 extern Rocket::Core::Lua::RegType<DataFormatter> DataFormatterMethods[];
-extern luaL_reg DataFormatterGetters[];
-extern luaL_reg DataFormatterSetters[];
+extern luaL_Reg DataFormatterGetters[];
+extern luaL_Reg DataFormatterSetters[];
 }
 }
 }

Source/Controls/Lua/DataSource.cpp

@@ -88,7 +88,7 @@ int DataSourceSetAttrGetNumRows(lua_State* L)
     if(lua_type(L,2) == LUA_TFUNCTION)
     {
         lua_pushvalue(L,2); //copy of the function, so it is for sure at the top of the stack
-        obj->getNumRowsRef = lua_ref(L,true);
+        obj->getNumRowsRef = luaL_ref(L, LUA_REGISTRYINDEX);
     }
     else
         Log::Message(Log::LT_WARNING, "Lua: Must assign DataSource.GetNumRows as a function, value received was of %s type", lua_typename(L,2));
@@ -102,7 +102,7 @@ int DataSourceSetAttrGetRow(lua_State* L)
     if(lua_type(L,2) == LUA_TFUNCTION)
     {
         lua_pushvalue(L,2); //copy of the functions, so it is for sure at the top of the stack
-        obj->getRowRef = lua_ref(L,true);
+        obj->getRowRef = luaL_ref(L, LUA_REGISTRYINDEX);
     }
     else
         Log::Message(Log::LT_WARNING, "Lua: Must assign DataSource.GetRow as a function, value received was of %s type", lua_typename(L,2));
@@ -118,12 +118,12 @@ Rocket::Core::Lua::RegType<DataSource> DataSourceMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg DataSourceGetters[] =
+luaL_Reg DataSourceGetters[] =
 {
     { NULL, NULL },
 };
 
-luaL_reg DataSourceSetters[] =
+luaL_Reg DataSourceSetters[] =
 {
     LUASETTER(DataSource,GetNumRows)
     LUASETTER(DataSource,GetRow)

Source/Controls/Lua/DataSource.h

@@ -48,8 +48,8 @@ int DataSourceSetAttrGetNumRows(lua_State* L);
 int DataSourceSetAttrGetRow(lua_State* L);
 
 extern Rocket::Core::Lua::RegType<DataSource> DataSourceMethods[];
-extern luaL_reg DataSourceGetters[];
-extern luaL_reg DataSourceSetters[];
+extern luaL_Reg DataSourceGetters[];
+extern luaL_Reg DataSourceSetters[];
 
 
 

Source/Controls/Lua/ElementDataGrid.cpp

@@ -88,13 +88,13 @@ Rocket::Core::Lua::RegType<ElementDataGrid> ElementDataGridMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementDataGridGetters[] =
+luaL_Reg ElementDataGridGetters[] =
 {
     LUAGETTER(ElementDataGrid,rows)
     { NULL, NULL },
 };
 
-luaL_reg ElementDataGridSetters[] =
+luaL_Reg ElementDataGridSetters[] =
 {
     { NULL, NULL },
 };

Source/Controls/Lua/ElementDataGrid.h

@@ -47,8 +47,8 @@ int ElementDataGridGetAttrrows(lua_State* L);
 
 
 extern Rocket::Core::Lua::RegType<ElementDataGrid> ElementDataGridMethods[];
-extern luaL_reg ElementDataGridGetters[];
-extern luaL_reg ElementDataGridSetters[];
+extern luaL_Reg ElementDataGridGetters[];
+extern luaL_Reg ElementDataGridSetters[];
 
 
 }

Source/Controls/Lua/ElementDataGridRow.cpp

@@ -98,7 +98,7 @@ Rocket::Core::Lua::RegType<ElementDataGridRow> ElementDataGridRowMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementDataGridRowGetters[] =
+luaL_Reg ElementDataGridRowGetters[] =
 {
     LUAGETTER(ElementDataGridRow,row_expanded)
     LUAGETTER(ElementDataGridRow,parent_relative_index)
@@ -108,7 +108,7 @@ luaL_reg ElementDataGridRowGetters[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementDataGridRowSetters[] =
+luaL_Reg ElementDataGridRowSetters[] =
 {
     LUASETTER(ElementDataGridRow,row_expanded)
     { NULL, NULL },

Source/Controls/Lua/ElementDataGridRow.h

@@ -50,8 +50,8 @@ int ElementDataGridRowSetAttrrow_expanded(lua_State* L);
 
 
 extern Rocket::Core::Lua::RegType<ElementDataGridRow> ElementDataGridRowMethods[];
-extern luaL_reg ElementDataGridRowGetters[];
-extern luaL_reg ElementDataGridRowSetters[];
+extern luaL_Reg ElementDataGridRowGetters[];
+extern luaL_Reg ElementDataGridRowSetters[];
 
 
 

Source/Controls/Lua/ElementForm.cpp

@@ -57,12 +57,12 @@ Rocket::Core::Lua::RegType<ElementForm> ElementFormMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementFormGetters[] =
+luaL_Reg ElementFormGetters[] =
 {
     { NULL, NULL },
 };
 
-luaL_reg ElementFormSetters[] =
+luaL_Reg ElementFormSetters[] =
 {
     { NULL, NULL },
 };

Source/Controls/Lua/ElementForm.h

@@ -43,8 +43,8 @@ namespace Lua {
 int ElementFormSubmit(lua_State* L, ElementForm* obj);
 
 extern Rocket::Core::Lua::RegType<ElementForm> ElementFormMethods[];
-extern luaL_reg ElementFormGetters[];
-extern luaL_reg ElementFormSetters[];
+extern luaL_Reg ElementFormGetters[];
+extern luaL_Reg ElementFormSetters[];
 }
 }
 }

Source/Controls/Lua/ElementFormControl.cpp

@@ -96,7 +96,7 @@ Rocket::Core::Lua::RegType<ElementFormControl> ElementFormControlMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementFormControlGetters[] = 
+luaL_Reg ElementFormControlGetters[] = 
 {
     LUAGETTER(ElementFormControl,disabled)
     LUAGETTER(ElementFormControl,name)
@@ -104,7 +104,7 @@ luaL_reg ElementFormControlGetters[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementFormControlSetters[] = 
+luaL_Reg ElementFormControlSetters[] = 
 {
     LUASETTER(ElementFormControl,disabled)
     LUASETTER(ElementFormControl,name)

Source/Controls/Lua/ElementFormControl.h

@@ -48,8 +48,8 @@ int ElementFormControlSetAttrname(lua_State* L);
 int ElementFormControlSetAttrvalue(lua_State* L);
 
 extern Rocket::Core::Lua::RegType<ElementFormControl> ElementFormControlMethods[];
-extern luaL_reg ElementFormControlGetters[];
-extern luaL_reg ElementFormControlSetters[];
+extern luaL_Reg ElementFormControlGetters[];
+extern luaL_Reg ElementFormControlSetters[];
 
 }
 }

Source/Controls/Lua/ElementFormControlDataSelect.cpp

@@ -49,12 +49,12 @@ Rocket::Core::Lua::RegType<ElementFormControlDataSelect> ElementFormControlDataS
     { NULL, NULL },
 };
 
-luaL_reg ElementFormControlDataSelectGetters[] =
+luaL_Reg ElementFormControlDataSelectGetters[] =
 {
     { NULL, NULL },
 };
 
-luaL_reg ElementFormControlDataSelectSetters[] =
+luaL_Reg ElementFormControlDataSelectSetters[] =
 {
     { NULL, NULL },
 };

Source/Controls/Lua/ElementFormControlDataSelect.h

@@ -41,8 +41,8 @@ namespace Lua {
 int ElementFormControlDataSelectSetDataSource(lua_State* L, ElementFormControlDataSelect* obj);
 
 extern Rocket::Core::Lua::RegType<ElementFormControlDataSelect> ElementFormControlDataSelectMethods[];
-extern luaL_reg ElementFormControlDataSelectGetters[];
-extern luaL_reg ElementFormControlDataSelectSetters[];
+extern luaL_Reg ElementFormControlDataSelectGetters[];
+extern luaL_Reg ElementFormControlDataSelectSetters[];
 
 }
 }

Source/Controls/Lua/ElementFormControlInput.cpp

@@ -150,7 +150,7 @@ Rocket::Core::Lua::RegType<ElementFormControlInput> ElementFormControlInputMetho
     {NULL,NULL},
 };
 
-luaL_reg ElementFormControlInputGetters[] = 
+luaL_Reg ElementFormControlInputGetters[] = 
 {
     LUAGETTER(ElementFormControlInput,checked)
     LUAGETTER(ElementFormControlInput,maxlength)
@@ -161,7 +161,7 @@ luaL_reg ElementFormControlInputGetters[] =
     {NULL,NULL},
 };
 
-luaL_reg ElementFormControlInputSetters[] = 
+luaL_Reg ElementFormControlInputSetters[] = 
 {
     LUASETTER(ElementFormControlInput,checked)
     LUASETTER(ElementFormControlInput,maxlength)

Source/Controls/Lua/ElementFormControlInput.h

@@ -54,8 +54,8 @@ int ElementFormControlInputSetAttrmin(lua_State* L);
 int ElementFormControlInputSetAttrstep(lua_State* L);
 
 extern Rocket::Core::Lua::RegType<ElementFormControlInput> ElementFormControlInputMethods[];
-extern luaL_reg ElementFormControlInputGetters[];
-extern luaL_reg ElementFormControlInputSetters[];
+extern luaL_Reg ElementFormControlInputGetters[];
+extern luaL_Reg ElementFormControlInputSetters[];
 
 }
 }

Source/Controls/Lua/ElementFormControlSelect.cpp

@@ -99,14 +99,14 @@ Rocket::Core::Lua::RegType<ElementFormControlSelect> ElementFormControlSelectMet
     { NULL, NULL },
 };
 
-luaL_reg ElementFormControlSelectGetters[] =
+luaL_Reg ElementFormControlSelectGetters[] =
 {
     LUAGETTER(ElementFormControlSelect,options)
     LUAGETTER(ElementFormControlSelect,selection)
     { NULL, NULL },
 };
 
-luaL_reg ElementFormControlSelectSetters[] =
+luaL_Reg ElementFormControlSelectSetters[] =
 {
     LUASETTER(ElementFormControlSelect,selection)
     { NULL, NULL },

Source/Controls/Lua/ElementFormControlSelect.h

@@ -49,8 +49,8 @@ int ElementFormControlSelectGetAttrselection(lua_State* L);
 int ElementFormControlSelectSetAttrselection(lua_State* L);
 
 extern Rocket::Core::Lua::RegType<ElementFormControlSelect> ElementFormControlSelectMethods[];
-extern luaL_reg ElementFormControlSelectGetters[];
-extern luaL_reg ElementFormControlSelectSetters[];
+extern luaL_Reg ElementFormControlSelectGetters[];
+extern luaL_Reg ElementFormControlSelectSetters[];
 
 }
 }

Source/Controls/Lua/ElementFormControlTextArea.cpp

@@ -112,7 +112,7 @@ Rocket::Core::Lua::RegType<ElementFormControlTextArea> ElementFormControlTextAre
     { NULL, NULL },
 };
 
-luaL_reg ElementFormControlTextAreaGetters[] =
+luaL_Reg ElementFormControlTextAreaGetters[] =
 {
     LUAGETTER(ElementFormControlTextArea,cols)
     LUAGETTER(ElementFormControlTextArea,maxlength)
@@ -121,7 +121,7 @@ luaL_reg ElementFormControlTextAreaGetters[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementFormControlTextAreaSetters[] =
+luaL_Reg ElementFormControlTextAreaSetters[] =
 {
     LUASETTER(ElementFormControlTextArea,cols)
     LUASETTER(ElementFormControlTextArea,maxlength)

Source/Controls/Lua/ElementFormControlTextArea.h

@@ -50,8 +50,8 @@ int ElementFormControlTextAreaSetAttrrows(lua_State* L);
 int ElementFormControlTextAreaSetAttrwordwrap(lua_State* L);
 
 extern Rocket::Core::Lua::RegType<ElementFormControlTextArea> ElementFormControlTextAreaMethods[];
-extern luaL_reg ElementFormControlTextAreaGetters[];
-extern luaL_reg ElementFormControlTextAreaSetters[];
+extern luaL_Reg ElementFormControlTextAreaGetters[];
+extern luaL_Reg ElementFormControlTextAreaSetters[];
 
 }
 }

Source/Controls/Lua/ElementTabSet.cpp

@@ -95,14 +95,14 @@ Rocket::Core::Lua::RegType<ElementTabSet> ElementTabSetMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementTabSetGetters[] =
+luaL_Reg ElementTabSetGetters[] =
 {
     LUAGETTER(ElementTabSet,active_tab)
     LUAGETTER(ElementTabSet,num_tabs)
     { NULL, NULL },
 };
 
-luaL_reg ElementTabSetSetters[] =
+luaL_Reg ElementTabSetSetters[] =
 {
     LUASETTER(ElementTabSet,active_tab)
     { NULL, NULL },

Source/Controls/Lua/ElementTabSet.h

@@ -49,8 +49,8 @@ int ElementTabSetGetAttrnum_tabs(lua_State* L);
 int ElementTabSetSetAttractive_tab(lua_State* L);
 
 extern Rocket::Core::Lua::RegType<ElementTabSet> ElementTabSetMethods[];
-extern luaL_reg ElementTabSetGetters[];
-extern luaL_reg ElementTabSetSetters[];
+extern luaL_Reg ElementTabSetGetters[];
+extern luaL_Reg ElementTabSetSetters[];
 
 
 }

Source/Controls/Lua/SelectOptionsProxy.cpp

@@ -102,12 +102,12 @@ Rocket::Core::Lua::RegType<SelectOptionsProxy> SelectOptionsProxyMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg SelectOptionsProxyGetters[] =
+luaL_Reg SelectOptionsProxyGetters[] =
 {
     { NULL, NULL },
 };
 
-luaL_reg SelectOptionsProxySetters[] =
+luaL_Reg SelectOptionsProxySetters[] =
 {
     { NULL, NULL },
 };

Source/Controls/Lua/SelectOptionsProxy.h

@@ -44,8 +44,8 @@ int SelectOptionsProxy__pairs(lua_State* L);
 int SelectOptionsProxy__ipairs(lua_State* L);
 
 extern Rocket::Core::Lua::RegType<SelectOptionsProxy> SelectOptionsProxyMethods[];
-extern luaL_reg SelectOptionsProxyGetters[];
-extern luaL_reg SelectOptionsProxySetters[];
+extern luaL_Reg SelectOptionsProxyGetters[];
+extern luaL_Reg SelectOptionsProxySetters[];
 
 }
 }

Source/Core/FontDatabase.cpp

@@ -279,7 +279,7 @@ void* FontDatabase::LoadFace(const String& file_name)
 
 	if (!handle)
 	{
-		return NULL;
+		return false;
 	}
 
 	size_t length = file_interface->Length(handle);

Source/Core/Lua/Colourb.cpp

@@ -212,7 +212,7 @@ RegType<Colourb> ColourbMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ColourbGetters[] =
+luaL_Reg ColourbGetters[] =
 {
     LUAGETTER(Colourb,red)
     LUAGETTER(Colourb,green)
@@ -222,7 +222,7 @@ luaL_reg ColourbGetters[] =
     { NULL, NULL },
 };
 
-luaL_reg ColourbSetters[] =
+luaL_Reg ColourbSetters[] =
 {
     LUASETTER(Colourb,red)
     LUASETTER(Colourb,green)

Source/Core/Lua/Colourb.h

@@ -58,8 +58,8 @@ int ColourbSetAttralpha(lua_State* L);
 int ColourbSetAttrrgba(lua_State* L);
 
 extern RegType<Colourb> ColourbMethods[];
-extern luaL_reg ColourbGetters[];
-extern luaL_reg ColourbSetters[];
+extern luaL_Reg ColourbGetters[];
+extern luaL_Reg ColourbSetters[];
 
 LUACORETYPEDECLARE(Colourb)
 }

Source/Core/Lua/Colourf.cpp

@@ -182,7 +182,7 @@ RegType<Colourf> ColourfMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ColourfGetters[] =
+luaL_Reg ColourfGetters[] =
 {
     LUAGETTER(Colourf,red)
     LUAGETTER(Colourf,green)
@@ -192,7 +192,7 @@ luaL_reg ColourfGetters[] =
     { NULL, NULL },
 };
 
-luaL_reg ColourfSetters[] =
+luaL_Reg ColourfSetters[] =
 {
     LUASETTER(Colourf,red)
     LUASETTER(Colourf,green)

Source/Core/Lua/Colourf.h

@@ -56,8 +56,8 @@ int ColourfSetAttralpha(lua_State* L);
 int ColourfSetAttrrgba(lua_State* L);
 
 extern RegType<Colourf> ColourfMethods[];
-extern luaL_reg ColourfGetters[];
-extern luaL_reg ColourfSetters[];
+extern luaL_Reg ColourfGetters[];
+extern luaL_Reg ColourfSetters[];
 
 LUACORETYPEDECLARE(Colourf)
 }

Source/Core/Lua/Context.cpp

@@ -243,7 +243,7 @@ RegType<Context> ContextMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ContextGetters[] =
+luaL_Reg ContextGetters[] =
 {
     LUAGETTER(Context,dimensions)
     LUAGETTER(Context,documents)
@@ -254,7 +254,7 @@ luaL_reg ContextGetters[] =
     { NULL, NULL },
 };
 
-luaL_reg ContextSetters[] =
+luaL_Reg ContextSetters[] =
 {
     LUASETTER(Context,dimensions)
     { NULL, NULL },

Source/Core/Lua/Context.h

@@ -65,8 +65,8 @@ int ContextSetAttrdimensions(lua_State* L);
 
 
 extern RegType<Context> ContextMethods[];
-extern luaL_reg ContextGetters[];
-extern luaL_reg ContextSetters[];
+extern luaL_Reg ContextGetters[];
+extern luaL_Reg ContextSetters[];
 
 LUACORETYPEDECLARE(Context)
 }

Source/Core/Lua/ContextDocumentsProxy.cpp

@@ -137,12 +137,12 @@ RegType<ContextDocumentsProxy> ContextDocumentsProxyMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ContextDocumentsProxyGetters[] =
+luaL_Reg ContextDocumentsProxyGetters[] =
 {
     { NULL, NULL },
 };
 
-luaL_reg ContextDocumentsProxySetters[] =
+luaL_Reg ContextDocumentsProxySetters[] =
 {
     { NULL, NULL },
 };

Source/Core/Lua/ContextDocumentsProxy.h

@@ -44,8 +44,8 @@ int ContextDocumentsProxy__pairs(lua_State* L);
 int ContextDocumentsProxy__ipairs(lua_State* L);
 
 extern RegType<ContextDocumentsProxy> ContextDocumentsProxyMethods[];
-extern luaL_reg ContextDocumentsProxyGetters[];
-extern luaL_reg ContextDocumentsProxySetters[];
+extern luaL_Reg ContextDocumentsProxyGetters[];
+extern luaL_Reg ContextDocumentsProxySetters[];
 
 LUACORETYPEDECLARE(ContextDocumentsProxy)
 }

Source/Core/Lua/Document.cpp

@@ -157,14 +157,14 @@ RegType<Document> DocumentMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg DocumentGetters[] =
+luaL_Reg DocumentGetters[] =
 {
     LUAGETTER(Document,title)
     LUAGETTER(Document,context)
     { NULL, NULL },
 };
 
-luaL_reg DocumentSetters[] =
+luaL_Reg DocumentSetters[] =
 {
     LUASETTER(Document,title)
     { NULL, NULL },

Source/Core/Lua/Document.h

@@ -57,8 +57,8 @@ int DocumentGetAttrcontext(lua_State* L);
 int DocumentSetAttrtitle(lua_State* L);
 
 extern RegType<Document> DocumentMethods[];
-extern luaL_reg DocumentGetters[];
-extern luaL_reg DocumentSetters[];
+extern luaL_Reg DocumentGetters[];
+extern luaL_Reg DocumentSetters[];
 
 LUACORETYPEDECLARE(Document)
 }

Source/Core/Lua/Element.cpp

@@ -572,7 +572,7 @@ RegType<Element> ElementMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementGetters[] =
+luaL_Reg ElementGetters[] =
 {
     LUAGETTER(Element,attributes)
     LUAGETTER(Element,child_nodes)
@@ -603,7 +603,7 @@ luaL_reg ElementGetters[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementSetters[] =
+luaL_Reg ElementSetters[] =
 {
     LUASETTER(Element,class_name)
     LUASETTER(Element,id)

Source/Core/Lua/Element.h

@@ -97,8 +97,8 @@ int ElementSetAttrscroll_top(lua_State* L);
 
 
 extern RegType<Element> ElementMethods[];
-extern luaL_reg ElementGetters[];
-extern luaL_reg ElementSetters[];
+extern luaL_Reg ElementGetters[];
+extern luaL_Reg ElementSetters[];
 
 LUACORETYPEDECLARE(Element)
 }

Source/Core/Lua/ElementAttributesProxy.cpp

@@ -96,11 +96,11 @@ RegType<ElementAttributesProxy> ElementAttributesProxyMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementAttributesProxyGetters[] =
+luaL_Reg ElementAttributesProxyGetters[] =
 {
     { NULL, NULL },
 };
-luaL_reg ElementAttributesProxySetters[] =
+luaL_Reg ElementAttributesProxySetters[] =
 {
     { NULL, NULL },
 };

Source/Core/Lua/ElementAttributesProxy.h

@@ -44,8 +44,8 @@ int ElementAttributesProxy__pairs(lua_State* L);
 int ElementAttributesProxy__ipairs(lua_State* L);
 
 extern RegType<ElementAttributesProxy> ElementAttributesProxyMethods[];
-extern luaL_reg ElementAttributesProxyGetters[];
-extern luaL_reg ElementAttributesProxySetters[];
+extern luaL_Reg ElementAttributesProxyGetters[];
+extern luaL_Reg ElementAttributesProxySetters[];
 
 LUACORETYPEDECLARE(ElementAttributesProxy)
 }

Source/Core/Lua/ElementChildNodesProxy.cpp

@@ -94,11 +94,11 @@ RegType<ElementChildNodesProxy> ElementChildNodesProxyMethods[] =
 {
     { NULL, NULL },
 };
-luaL_reg ElementChildNodesProxyGetters[] = 
+luaL_Reg ElementChildNodesProxyGetters[] = 
 {
     { NULL, NULL },
 };
-luaL_reg ElementChildNodesProxySetters[] = 
+luaL_Reg ElementChildNodesProxySetters[] = 
 {
     { NULL, NULL },
 };

Source/Core/Lua/ElementChildNodesProxy.h

@@ -45,8 +45,8 @@ int ElementChildNodesProxy__pairs(lua_State* L);
 int ElementChildNodesProxy__ipairs(lua_State* L);
 
 extern RegType<ElementChildNodesProxy> ElementChildNodesProxyMethods[];
-extern luaL_reg ElementChildNodesProxyGetters[];
-extern luaL_reg ElementChildNodesProxySetters[];
+extern luaL_Reg ElementChildNodesProxyGetters[];
+extern luaL_Reg ElementChildNodesProxySetters[];
 
 LUACORETYPEDECLARE(ElementChildNodesProxy)
 }

Source/Core/Lua/ElementInstancer.cpp

@@ -71,12 +71,12 @@ RegType<ElementInstancer> ElementInstancerMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementInstancerGetters[] =
+luaL_Reg ElementInstancerGetters[] =
 {
     { NULL, NULL },
 };
 
-luaL_reg ElementInstancerSetters[] =
+luaL_Reg ElementInstancerSetters[] =
 {
     LUASETTER(ElementInstancer,InstanceElement)
     { NULL, NULL },

Source/Core/Lua/ElementInstancer.h

@@ -42,8 +42,8 @@ int ElementInstancernew(lua_State* L);
 int ElementInstancerSetAttrInstanceElement(lua_State* L);
 
 extern RegType<ElementInstancer> ElementInstancerMethods[];
-extern luaL_reg ElementInstancerGetters[];
-extern luaL_reg ElementInstancerSetters[];
+extern luaL_Reg ElementInstancerGetters[];
+extern luaL_Reg ElementInstancerSetters[];
 
 LUACORETYPEDECLARE(ElementInstancer)
 }

Source/Core/Lua/ElementStyleProxy.cpp

@@ -137,12 +137,12 @@ RegType<ElementStyleProxy> ElementStyleProxyMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementStyleProxyGetters[] = 
+luaL_Reg ElementStyleProxyGetters[] = 
 {
     { NULL, NULL },
 };
 
-luaL_reg ElementStyleProxySetters[] = 
+luaL_Reg ElementStyleProxySetters[] = 
 {
     { NULL, NULL },
 };

Source/Core/Lua/ElementStyleProxy.h

@@ -43,8 +43,8 @@ int ElementStyleProxy__pairs(lua_State* L);
 int ElementStyleProxy__ipairs(lua_State* L);
 
 extern RegType<ElementStyleProxy> ElementStyleProxyMethods[];
-extern luaL_reg ElementStyleProxyGetters[];
-extern luaL_reg ElementStyleProxySetters[];
+extern luaL_Reg ElementStyleProxyGetters[];
+extern luaL_Reg ElementStyleProxySetters[];
 
 LUACORETYPEDECLARE(ElementStyleProxy)
 }

Source/Core/Lua/ElementText.cpp

@@ -64,13 +64,13 @@ RegType<ElementText> ElementTextMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg ElementTextGetters[] =
+luaL_Reg ElementTextGetters[] =
 {
     LUAGETTER(ElementText,text)
     { NULL, NULL },
 };
 
-luaL_reg ElementTextSetters[] =
+luaL_Reg ElementTextSetters[] =
 {
     LUASETTER(ElementText,text)
     { NULL, NULL },

Source/Core/Lua/ElementText.h

@@ -42,11 +42,11 @@ int ElementTextGetAttrtext(lua_State* L);
 int ElementTextSetAttrtext(lua_State* L);
 
 extern RegType<ElementText> ElementTextMethods[];
-extern luaL_reg ElementTextGetters[];
-extern luaL_reg ElementTextSetters[];
+extern luaL_Reg ElementTextGetters[];
+extern luaL_Reg ElementTextSetters[];
 
 LUACORETYPEDECLARE(ElementText)
 }
 }
 }
-#endif
+#endif

Source/Core/Lua/Event.cpp

@@ -90,7 +90,7 @@ RegType<Event> EventMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg EventGetters[] =
+luaL_Reg EventGetters[] =
 {
     LUAGETTER(Event,current_element)
     LUAGETTER(Event,type)
@@ -99,7 +99,7 @@ luaL_reg EventGetters[] =
     { NULL, NULL },
 };
 
-luaL_reg EventSetters[] =
+luaL_Reg EventSetters[] =
 {
     { NULL, NULL },
 };

Source/Core/Lua/Event.h

@@ -45,8 +45,8 @@ int EventGetAttrtarget_element(lua_State* L);
 int EventGetAttrparameters(lua_State* L);
 
 extern RegType<Event> EventMethods[];
-extern luaL_reg EventGetters[];
-extern luaL_reg EventSetters[];
+extern luaL_Reg EventGetters[];
+extern luaL_Reg EventSetters[];
 
 LUACORETYPEDECLARE(Event)
 }

Source/Core/Lua/EventParametersProxy.cpp

@@ -99,11 +99,11 @@ RegType<EventParametersProxy> EventParametersProxyMethods[] =
 {
     { NULL, NULL },
 };
-luaL_reg EventParametersProxyGetters[] =
+luaL_Reg EventParametersProxyGetters[] =
 {
     { NULL, NULL },
 };
-luaL_reg EventParametersProxySetters[] =
+luaL_Reg EventParametersProxySetters[] =
 {
     { NULL, NULL },
 };

Source/Core/Lua/EventParametersProxy.h

@@ -44,8 +44,8 @@ int EventParametersProxy__pairs(lua_State* L);
 int EventParametersProxy__ipairs(lua_State* L);
 
 extern RegType<EventParametersProxy> EventParametersProxyMethods[];
-extern luaL_reg EventParametersProxyGetters[];
-extern luaL_reg EventParametersProxySetters[];
+extern luaL_Reg EventParametersProxyGetters[];
+extern luaL_Reg EventParametersProxySetters[];
 
 LUACORETYPEDECLARE(EventParametersProxy)
 }

Source/Core/Lua/Interpreter.cpp

@@ -145,7 +145,8 @@ void Interpreter::LoadString(const Rocket::Core::String& code, const Rocket::Cor
 void Interpreter::BeginCall(int funRef)
 {
     lua_settop(_L,0); //empty stack
-    lua_getref(_L,funRef);
+    //lua_getref(_L,funRef);
+    lua_rawgeti(_L, LUA_REGISTRYINDEX, (int)funRef);
 }
 
 bool Interpreter::ExecuteCall(int params, int res)

Source/Core/Lua/Log.cpp

@@ -84,12 +84,12 @@ RegType<Log> LogMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg LogGetters[] =
+luaL_Reg LogGetters[] =
 {
     { NULL, NULL },
 };
 
-luaL_reg LogSetters[] =
+luaL_Reg LogSetters[] =
 {
     { NULL, NULL },
 };

Source/Core/Lua/Log.h

@@ -36,8 +36,8 @@ template<> void ExtraInit<Log>(lua_State* L, int metatable_index);
 int LogMessage(lua_State* L);
 
 extern RegType<Log> LogMethods[];
-extern luaL_reg LogGetters[];
-extern luaL_reg LogSetters[];
+extern luaL_Reg LogGetters[];
+extern luaL_Reg LogSetters[];
 
 LUACORETYPEDECLARE(Log)
 }

Source/Core/Lua/Rocket.cpp

@@ -311,13 +311,13 @@ RegType<LuaRocket> LuaRocketMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg LuaRocketGetters[] = 
+luaL_Reg LuaRocketGetters[] = 
 {
     LUAGETTER(LuaRocket,contexts)
     { NULL, NULL },
 };
 
-luaL_reg LuaRocketSetters[] = 
+luaL_Reg LuaRocketSetters[] = 
 {
     { NULL, NULL },
 };

Source/Core/Lua/Rocket.h

@@ -60,8 +60,8 @@ void LuaRocketEnumkey_identifier(lua_State* L);
 void LuaRocketEnumkey_modifier(lua_State* L);
 
 extern RegType<LuaRocket> LuaRocketMethods[];
-extern luaL_reg LuaRocketGetters[];
-extern luaL_reg LuaRocketSetters[];
+extern luaL_Reg LuaRocketGetters[];
+extern luaL_Reg LuaRocketSetters[];
 
 LUACORETYPEDECLARE(LuaRocket)
 }

Source/Core/Lua/RocketContextsProxy.cpp

@@ -126,11 +126,11 @@ RegType<RocketContextsProxy> RocketContextsProxyMethods[] =
 {
     { NULL, NULL },
 };
-luaL_reg RocketContextsProxyGetters[] =
+luaL_Reg RocketContextsProxyGetters[] =
 {
     { NULL, NULL },
 };
-luaL_reg RocketContextsProxySetters[] =
+luaL_Reg RocketContextsProxySetters[] =
 {
     { NULL, NULL },
 };

Source/Core/Lua/RocketContextsProxy.h

@@ -44,8 +44,8 @@ int RocketContextsProxy__pairs(lua_State* L);
 int RocketContextsProxy__ipairs(lua_State* L);
 
 extern RegType<RocketContextsProxy> RocketContextsProxyMethods[];
-extern luaL_reg RocketContextsProxyGetters[];
-extern luaL_reg RocketContextsProxySetters[];
+extern luaL_Reg RocketContextsProxyGetters[];
+extern luaL_Reg RocketContextsProxySetters[];
 
 LUACORETYPEDECLARE(RocketContextsProxy)
 }

Source/Core/Lua/Vector2f.cpp

@@ -222,7 +222,7 @@ RegType<Vector2f> Vector2fMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg Vector2fGetters[]= 
+luaL_Reg Vector2fGetters[]= 
 {
     LUAGETTER(Vector2f,x)
     LUAGETTER(Vector2f,y)
@@ -230,7 +230,7 @@ luaL_reg Vector2fGetters[]=
     { NULL, NULL },
 };
 
-luaL_reg Vector2fSetters[]= 
+luaL_Reg Vector2fSetters[]= 
 {
     LUASETTER(Vector2f,x)
     LUASETTER(Vector2f,y)

Source/Core/Lua/Vector2f.h

@@ -58,8 +58,8 @@ int Vector2fSetAttry(lua_State*L);
 
 
 extern RegType<Vector2f> Vector2fMethods[];
-extern luaL_reg Vector2fGetters[];
-extern luaL_reg Vector2fSetters[];
+extern luaL_Reg Vector2fGetters[];
+extern luaL_Reg Vector2fSetters[];
 
 LUACORETYPEDECLARE(Vector2f)
 }

Source/Core/Lua/Vector2i.cpp

@@ -186,7 +186,7 @@ RegType<Vector2i> Vector2iMethods[] =
     { NULL, NULL },
 };
 
-luaL_reg Vector2iGetters[]= 
+luaL_Reg Vector2iGetters[]= 
 {
     LUAGETTER(Vector2i,x)
     LUAGETTER(Vector2i,y)
@@ -194,7 +194,7 @@ luaL_reg Vector2iGetters[]=
     { NULL, NULL },
 };
 
-luaL_reg Vector2iSetters[]= 
+luaL_Reg Vector2iSetters[]= 
 {
     LUASETTER(Vector2i,x)
     LUASETTER(Vector2i,y)

Source/Core/Lua/Vector2i.h

@@ -55,8 +55,8 @@ int Vector2iSetAttry(lua_State*L);
 
 
 extern RegType<Vector2i> Vector2iMethods[];
-extern luaL_reg Vector2iGetters[];
-extern luaL_reg Vector2iSetters[];
+extern luaL_Reg Vector2iGetters[];
+extern luaL_Reg Vector2iSetters[];
 
 LUACORETYPEDECLARE(Vector2i)
 }

Source/Core/TextureResource.cpp

@@ -162,7 +162,7 @@ bool TextureResource::Load(RenderInterface* render_interface) const
 			else
 			{
 				Log::Message(Log::LT_WARNING, "Failed to generate internal texture %s.", source.CString());
-				texture_data[render_interface] = TextureData(0, Vector2i(0, 0));
+				texture_data[render_interface] = TextureData(NULL, Vector2i(0, 0));
 
 				return false;
 			}
@@ -174,7 +174,7 @@ bool TextureResource::Load(RenderInterface* render_interface) const
 	if (!render_interface->LoadTexture(handle, dimensions, source))
 	{
 		Log::Message(Log::LT_WARNING, "Failed to load texture from %s.", source.CString());
-		texture_data[render_interface] = TextureData(0, Vector2i(0, 0));
+		texture_data[render_interface] = TextureData(NULL, Vector2i(0, 0));
 
 		return false;
 	}