8 files changed, 11 insertions, 10 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index c94429c8..c9663192 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -53,10 +53,10 @@ ChatWindow::ChatWindow():
     mTmpVisible(false)
 {
     setResizable(true);
-    setDefaultSize(0, (windowContainer->getHeight() - 105), 400, 100);
+    setDefaultSize(0, windowContainer->getHeight() - 123, 600, 123);
     setOpaque(false);
 
-    mChatInput = new ChatInput();
+    mChatInput = new ChatInput;
     mChatInput->setActionEventId("chatinput");
     mChatInput->addActionListener(this);
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index aee262d0..57f0899b 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -51,7 +51,6 @@ static const int boxPosition[][2] = {
 };
 
 EquipmentWindow::EquipmentWindow(Equipment *equipment):
-
     Window(_("Equipment")),
     mEquipment(equipment),
     mBackground(NULL),
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 0fda7945..92b635d8 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -60,7 +60,7 @@ InventoryWindow::InventoryWindow():
     setMinWidth(375);
     setMinHeight(283);
     // If you adjust these defaults, don't forget to adjust the trade window's.
-    setDefaultSize(115, 25, 375, 283);
+    setDefaultSize(115, 30, 375, 283);
     addKeyListener(this);
 
     mUseButton = new Button(_("Use"), "use", this);
diff --git a/src/gui/itemshortcutwindow.cpp b/src/gui/itemshortcutwindow.cpp
index e4d352fe..1a71b11e 100644
--- a/src/gui/itemshortcutwindow.cpp
+++ b/src/gui/itemshortcutwindow.cpp
@@ -34,7 +34,7 @@ ItemShortcutWindow::ItemShortcutWindow()
     setResizable(true);
     setDefaultSize(758, 174, 42, 426);
 
-    mItems = new ItemShortcutContainer();
+    mItems = new ItemShortcutContainer;
 
     const int border = SCROLL_PADDING * 2 + getPadding() * 2;
     setMinWidth(mItems->getBoxWidth() + border);
diff --git a/src/gui/magic.cpp b/src/gui/magic.cpp
index ca7b5489..ad63f914 100644
--- a/src/gui/magic.cpp
+++ b/src/gui/magic.cpp
@@ -36,7 +36,7 @@ MagicDialog::MagicDialog():
     Window(_("Magic"))
 {
     setCloseButton(true);
-    setDefaultSize(255, 25, 175, 225);
+    setDefaultSize(255, 30, 175, 225);
 
     gcn::Button *spellButton1 = new Button(_("Cast Test Spell 1"), "spell_1", this);
     gcn::Button *spellButton2 = new Button(_("Cast Test Spell 2"), "spell_2", this);
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 2a60308b..e062f674 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -43,6 +43,7 @@ extern Window *helpWindow;
 extern Window *skillDialog;
 extern Window *magicDialog;
 extern Window *guildWindow;
+extern Window *itemShortcutWindow;
 
 Setup::Setup():
     Window(_("Setup"))
@@ -117,5 +118,6 @@ void Setup::action(const gcn::ActionEvent &event)
         skillDialog->resetToDefaultSize();
         magicDialog->resetToDefaultSize();
         guildWindow->resetToDefaultSize();
+        itemShortcutWindow->resetToDefaultSize();
     }
 }
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 49bacaf0..2eecca55 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -44,7 +44,7 @@ SkillDialog::SkillDialog():
     Window(_("Skills"))
 {
     setCloseButton(true);
-    setDefaultSize(windowContainer->getWidth() - 255, 25, 275, 425);
+    setDefaultSize(windowContainer->getWidth() - 280, 30, 275, 425);
 
     TabbedArea *panel = new TabbedArea();
     panel->setDimension(gcn::Rectangle(5, 5, 270, 420));
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)