Fixed inconsistency in default window sizes

The default window sizes were all too small, since they were specified
in content size. On pressing "Reset Windows", the sizes would be
interpreted as such and apply alright.

The inconsistency is now removed, and the default window sizes are
always the size of the whole widget now, not just the contents.

Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>

(cherry picked from eAthena branch,
 commit 72f5288682f46af1f7c04c002172178c880e060b)

Conflicts:

	src/gui/chat.cpp
	src/gui/equipmentwindow.cpp
	src/gui/inventorywindow.cpp
	src/gui/ministatus.cpp
	src/gui/setup.cpp
	src/gui/skill.cpp
	src/gui/trade.cpp
	src/gui/window.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index e498236a..37c61520 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -248,7 +248,7 @@ void Window::setMaxHeight(unsigned int height)
 
 void Window::setResizable(bool r)
 {
-    if ((bool)mGrip == r) return;
+    if ((bool) mGrip == r) return;
 
     if (r)
     {
@@ -269,7 +269,7 @@ void Window::widgetResized(const gcn::Event &event)
 {
     if (mGrip)
     {
-        gcn::Rectangle const &area = getChildrenArea();
+        const gcn::Rectangle area = getChildrenArea();
         mGrip->setPosition(getWidth() - mGrip->getWidth() - area.x,
                            getHeight() - mGrip->getHeight() - area.y);
     }
@@ -497,7 +497,7 @@ void Window::setDefaultSize(int defaultX, int defaultY,
 void Window::resetToDefaultSize()
 {
     setPosition(mDefaultX, mDefaultY);
-    setContentSize(mDefaultWidth, mDefaultHeight);
+    setSize(mDefaultWidth, mDefaultHeight);
 }
 
 int Window::getResizeHandles(gcn::MouseEvent &event)