From 76565a3e1155213eaa740fe9990ed595b66e9cc1 Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <slime73@gmail.com>
Date: Wed, 14 Aug 2013 11:16:41 -0300
Subject: [PATCH] Renamed love.window.setCaption to love.window.setTitle
 (resolves issue #703)

---
 src/modules/window/wrap_Window.cpp | 8 ++++----
 src/modules/window/wrap_Window.h   | 4 ++--
 src/scripts/boot.lua               | 2 +-
 src/scripts/boot.lua.h             | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/modules/window/wrap_Window.cpp b/src/modules/window/wrap_Window.cpp
index 02bcea71f..02736aaa0 100644
--- a/src/modules/window/wrap_Window.cpp
+++ b/src/modules/window/wrap_Window.cpp
@@ -198,14 +198,14 @@ int w_getIcon(lua_State *L)
 	return 1;
 }
 
-int w_setCaption(lua_State *L)
+int w_setTitle(lua_State *L)
 {
 	std::string title = luax_checkstring(L, 1);
 	instance->setWindowTitle(title);
 	return 0;
 }
 
-int w_getCaption(lua_State *L)
+int w_getTitle(lua_State *L)
 {
 	luax_pushstring(L, instance->getWindowTitle());
 	return 1;
@@ -242,8 +242,8 @@ static const luaL_Reg functions[] =
 	{ "getDimensions", w_getDimensions },
 	{ "setIcon", w_setIcon },
 	{ "getIcon", w_getIcon },
-	{ "setCaption", w_setCaption },
-	{ "getCaption", w_getCaption },
+	{ "setTitle", w_setTitle },
+	{ "getTitle", w_getTitle },
 	{ "hasFocus", w_hasFocus },
 	{ "hasMouseFocus", w_hasMouseFocus },
 	{ "isVisible", w_isVisible },
diff --git a/src/modules/window/wrap_Window.h b/src/modules/window/wrap_Window.h
index 4d6525c61..ec813ac04 100644
--- a/src/modules/window/wrap_Window.h
+++ b/src/modules/window/wrap_Window.h
@@ -40,8 +40,8 @@ int w_getHeight(lua_State *L);
 int w_getDimensions(lua_State *L);
 int w_setIcon(lua_State *L);
 int w_getIcon(lua_State *L);
-int w_setCaption(lua_State *L);
-int w_getCaption(lua_State *L);
+int w_setTitle(lua_State *L);
+int w_getTitle(lua_State *L);
 int w_hasFocus(lua_State *L);
 int w_hasMouseFocus(lua_State *L);
 int w_isVisible(lua_State *L);
diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua
index c10fa830a..8d94bfde8 100644
--- a/src/scripts/boot.lua
+++ b/src/scripts/boot.lua
@@ -360,7 +360,7 @@ function love.init()
 		else
 			error("Could not set window mode")
 		end
-		love.window.setCaption(c.title)
+		love.window.setTitle(c.window.title or c.title)
 	end
 
 	-- Our first timestep, because window creation can take some time
diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h
index 5674fc790..17d3bfed5 100644
--- a/src/scripts/boot.lua.h
+++ b/src/scripts/boot.lua.h
@@ -620,8 +620,9 @@ const unsigned char boot_lua[] =
 	0x74, 0x20, 0x73, 0x65, 0x74, 0x20, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x22, 
 	0x29, 0x0a,
 	0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a,
-	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x73, 0x65, 0x74, 0x43, 
-	0x61, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x63, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a,
+	0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x73, 0x65, 0x74, 0x54, 
+	0x69, 0x74, 0x6c, 0x65, 0x28, 0x63, 0x2e, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x74, 0x69, 0x74, 0x6c, 
+	0x65, 0x20, 0x6f, 0x72, 0x20, 0x63, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x29, 0x0a,
 	0x09, 0x65, 0x6e, 0x64, 0x0a,
 	0x09, 0x2d, 0x2d, 0x20, 0x4f, 0x75, 0x72, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x74, 0x69, 0x6d, 0x65, 
 	0x73, 0x74, 0x65, 0x70, 0x2c, 0x20, 0x62, 0x65, 0x63, 0x61, 0x75, 0x73, 0x65, 0x20, 0x77, 0x69, 0x6e, 0x64,