From 3abb1a2cbb9e3d5bd992cc7e7ee92ff0dffcf265 Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <slime73@gmail.com>
Date: Sat, 5 Apr 2014 01:40:30 -0300
Subject: [PATCH] Removed love.window.getWidth/getHeight. Use
 love.graphics.getWidth/getHeight or love.window.getMode instead.

love.window.getWidth/getHeight were originally added to help deal with high-dpi mode, but the API ended up going in a different direction (love.window.getPixelScale).

--HG--
branch : minor
---
 src/modules/window/Window.h        |  3 ---
 src/modules/window/sdl/Window.cpp  | 10 ----------
 src/modules/window/sdl/Window.h    |  3 ---
 src/modules/window/wrap_Window.cpp | 22 ----------------------
 src/modules/window/wrap_Window.h   |  3 ---
 5 files changed, 41 deletions(-)

diff --git a/src/modules/window/Window.h b/src/modules/window/Window.h
index 9faf0390a..afe8bd4e5 100644
--- a/src/modules/window/Window.h
+++ b/src/modules/window/Window.h
@@ -96,9 +96,6 @@ public:
 
 	virtual std::vector<WindowSize> getFullscreenSizes(int displayindex) const = 0;
 
-	virtual int getWidth() const = 0;
-	virtual int getHeight() const = 0;
-
 	virtual void getDesktopDimensions(int displayindex, int &width, int &height) const = 0;
 
 	virtual bool isCreated() const = 0;
diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp
index 063f0cddc..cc97830d1 100644
--- a/src/modules/window/sdl/Window.cpp
+++ b/src/modules/window/sdl/Window.cpp
@@ -494,16 +494,6 @@ std::vector<WindowSize> Window::getFullscreenSizes(int displayindex) const
 	return sizes;
 }
 
-int Window::getWidth() const
-{
-	return curMode.width;
-}
-
-int Window::getHeight() const
-{
-	return curMode.height;
-}
-
 void Window::getDesktopDimensions(int displayindex, int &width, int &height) const
 {
 	if (displayindex >= 0 && displayindex < getDisplayCount())
diff --git a/src/modules/window/sdl/Window.h b/src/modules/window/sdl/Window.h
index 9657ec03d..74ce36551 100644
--- a/src/modules/window/sdl/Window.h
+++ b/src/modules/window/sdl/Window.h
@@ -53,9 +53,6 @@ public:
 
 	std::vector<WindowSize> getFullscreenSizes(int displayindex) const;
 
-	int getWidth() const;
-	int getHeight() const;
-
 	void getDesktopDimensions(int displayindex, int &width, int &height) const;
 
 	bool isCreated() const;
diff --git a/src/modules/window/wrap_Window.cpp b/src/modules/window/wrap_Window.cpp
index 42c14fa74..fad379785 100644
--- a/src/modules/window/wrap_Window.cpp
+++ b/src/modules/window/wrap_Window.cpp
@@ -227,25 +227,6 @@ int w_isCreated(lua_State *L)
 	return 1;
 }
 
-int w_getWidth(lua_State *L)
-{
-	lua_pushinteger(L, instance->getWidth());
-	return 1;
-}
-
-int w_getHeight(lua_State *L)
-{
-	lua_pushinteger(L, instance->getHeight());
-	return 1;
-}
-
-int w_getDimensions(lua_State *L)
-{
-	lua_pushinteger(L, instance->getWidth());
-	lua_pushinteger(L, instance->getHeight());
-	return 2;
-}
-
 int w_getDesktopDimensions(lua_State *L)
 {
 	int width = 0, height = 0;
@@ -322,9 +303,6 @@ static const luaL_Reg functions[] =
 	{ "setFullscreen", w_setFullscreen },
 	{ "getFullscreen", w_getFullscreen },
 	{ "isCreated", w_isCreated },
-	{ "getWidth", w_getWidth },
-	{ "getHeight", w_getHeight },
-	{ "getDimensions", w_getDimensions },
 	{ "getDesktopDimensions", w_getDesktopDimensions },
 	{ "setIcon", w_setIcon },
 	{ "getIcon", w_getIcon },
diff --git a/src/modules/window/wrap_Window.h b/src/modules/window/wrap_Window.h
index 760374c14..f096a3789 100644
--- a/src/modules/window/wrap_Window.h
+++ b/src/modules/window/wrap_Window.h
@@ -36,9 +36,6 @@ int w_getFullscreenModes(lua_State *L);
 int w_setFullscreen(lua_State *L);
 int w_getFullscreen(lua_State *L);
 int w_isCreated(lua_State *L);
-int w_getWidth(lua_State *L);
-int w_getHeight(lua_State *L);
-int w_getDimensions(lua_State *L);
 int w_getDesktopDimensions(lua_State *L);
 int w_setIcon(lua_State *L);
 int w_getIcon(lua_State *L);