3 files changed, 8 insertions, 4 deletions

diff --git a/gui/gui.cpp b/gui/gui.cpp
index 35b33b10c..f3d31d7b3 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -990,7 +990,10 @@ extern "C" void set_scale_values(float w, float h)
 extern "C" int scale_theme_x(int initial_x)
 {
 	if (scale_theme_w != 1) {
-		return (int) ((float)initial_x * scale_theme_w);
+		int scaled = (float)initial_x * scale_theme_w;
+		if (scaled == 0 && initial_x > 0)
+			return 1;
+		return scaled;
 	}
 	return initial_x;
 }
@@ -998,7 +1001,10 @@ extern "C" int scale_theme_x(int initial_x)
 extern "C" int scale_theme_y(int initial_y)
 {
 	if (scale_theme_h != 1) {
-		return (int) ((float)initial_y * scale_theme_h);
+		int scaled = (float)initial_y * scale_theme_h;
+		if (scaled == 0 && initial_y > 0)
+			return 1;
+		return scaled;
 	}
 	return initial_y;
 }
diff --git a/gui/gui.h b/gui/gui.h
index 37d205408..f6f0483a4 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -37,7 +37,6 @@ int scale_theme_y(int initial_y);
 int scale_theme_min(int initial_value);
 float get_scale_w();
 float get_scale_h();
-float get_scale_h();
 
 #endif  // _GUI_HEADER
 
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 00770b378..0f853ac59 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -893,7 +893,6 @@ protected:
 class GUIInput : public GUIObject, public RenderObject, public ActionObject, public InputObject
 {
 public:
-	// w and h may be ignored, in which case, no bounding box is applied
 	GUIInput(xml_node<>* node);
 	virtual ~GUIInput();