Added a resize grip to resizable window, fixed some compiling errors.

7 files changed, 174 insertions, 140 deletions

diff --git a/ChangeLog b/ChangeLog
index 80ef04a2..cde35379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-16  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* The Mana World.dev, src/gui/status.cpp, src/gui/window.cpp,
+	src/gui/window.h, src/gui/windowcontainer.h, data/graphics/gui/resize.png:
+	Added a resize grip to resizable window, fixed some compiling errors.
+
 2005-08-15  Björn Steinbrink  <B.Steinbrink@gmx.de>
 
 	* src/engine.cpp, src/gui/gui.cpp, src/gui/gui.h: Removed guiTop global
diff --git a/The Mana World.dev b/The Mana World.dev
index f573ff8f..7cd285a6 100644
--- a/The Mana World.dev
+++ b/The Mana World.dev
@@ -20,7 +20,7 @@ ObjectOutput=obj
 OverrideOutput=1
 OverrideOutputName=tmw.exe
 HostApplication=
-Folders=graphic,gui,net,resources
+Folders=graphic,graphic/header,graphic/source,gui,gui/header,gui/source,header,net,net/header,net/source,resources
 CommandLine=
 UseCustomMakefile=0
 CustomMakefile=
@@ -60,7 +60,7 @@ BuildCmd=
 [Unit13]
 FileName=src\game.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -70,7 +70,7 @@ BuildCmd=
 [Unit17]
 FileName=src\log.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -90,7 +90,7 @@ BuildCmd=
 [Unit25]
 FileName=src\gui\windowcontainer.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -100,7 +100,7 @@ BuildCmd=
 [Unit29]
 FileName=src\gui\button.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -110,7 +110,7 @@ BuildCmd=
 [Unit30]
 FileName=src\gui\buy.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -120,7 +120,7 @@ BuildCmd=
 [Unit32]
 FileName=src\gui\buysell.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -140,7 +140,7 @@ BuildCmd=
 [Unit7]
 FileName=src\configuration.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -150,7 +150,7 @@ BuildCmd=
 [Unit3]
 FileName=src\base64.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -170,7 +170,7 @@ BuildCmd=
 [Unit5]
 FileName=src\being.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -190,7 +190,7 @@ BuildCmd=
 [Unit43]
 FileName=src\gui\chatinput.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -200,7 +200,7 @@ BuildCmd=
 [Unit44]
 FileName=src\gui\checkbox.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -210,7 +210,7 @@ BuildCmd=
 [Unit46]
 FileName=src\gui\confirm_dialog.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -220,7 +220,7 @@ BuildCmd=
 [Unit45]
 FileName=src\gui\checkbox.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -230,7 +230,7 @@ BuildCmd=
 [Unit49]
 FileName=src\gui\equipmentwindow.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -240,7 +240,7 @@ BuildCmd=
 [Unit50]
 FileName=src\gui\gui.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -250,7 +250,7 @@ BuildCmd=
 [Unit55]
 FileName=src\gui\itemcontainer.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -260,7 +260,7 @@ BuildCmd=
 [Unit56]
 FileName=src\gui\listbox.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -270,7 +270,7 @@ BuildCmd=
 [Unit58]
 FileName=src\gui\login.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -280,7 +280,7 @@ BuildCmd=
 [Unit59]
 FileName=src\gui\login.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -290,7 +290,7 @@ BuildCmd=
 [Unit60]
 FileName=src\gui\minimap.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -300,7 +300,7 @@ BuildCmd=
 [Unit69]
 FileName=src\gui\ok_dialog.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -310,7 +310,7 @@ BuildCmd=
 [Unit70]
 FileName=src\gui\passwordfield.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -320,7 +320,7 @@ BuildCmd=
 [Unit71]
 FileName=src\gui\passwordfield.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -330,7 +330,7 @@ BuildCmd=
 [Unit72]
 FileName=src\gui\playerbox.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -340,7 +340,7 @@ BuildCmd=
 [Unit73]
 FileName=src\gui\playerbox.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -350,7 +350,7 @@ BuildCmd=
 [Unit74]
 FileName=src\gui\progressbar.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -360,7 +360,7 @@ BuildCmd=
 [Unit41]
 FileName=src\gui\chat.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -370,7 +370,7 @@ BuildCmd=
 [Unit77]
 FileName=src\gui\radiobutton.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -380,7 +380,7 @@ BuildCmd=
 [Unit78]
 FileName=src\gui\requesttrade.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -390,7 +390,7 @@ BuildCmd=
 [Unit79]
 FileName=src\gui\requesttrade.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -400,7 +400,7 @@ BuildCmd=
 [Unit80]
 FileName=src\gui\scrollarea.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -410,7 +410,7 @@ BuildCmd=
 [Unit81]
 FileName=src\gui\scrollarea.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -420,7 +420,7 @@ BuildCmd=
 [Unit82]
 FileName=src\gui\sell.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -430,7 +430,7 @@ BuildCmd=
 [Unit84]
 FileName=src\gui\setup.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -440,7 +440,7 @@ BuildCmd=
 [Unit85]
 FileName=src\gui\setup.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -450,7 +450,7 @@ BuildCmd=
 [Unit86]
 FileName=src\gui\shop.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -460,7 +460,7 @@ BuildCmd=
 [Unit89]
 FileName=src\gui\skill.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -470,7 +470,7 @@ BuildCmd=
 [Unit90]
 FileName=src\gui\slider.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -480,7 +480,7 @@ BuildCmd=
 [Unit91]
 FileName=src\gui\slider.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -490,7 +490,7 @@ BuildCmd=
 [Unit92]
 FileName=src\gui\stats.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -500,7 +500,7 @@ BuildCmd=
 [Unit93]
 FileName=src\gui\stats.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -510,7 +510,7 @@ BuildCmd=
 [Unit94]
 FileName=src\gui\status.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -520,7 +520,7 @@ BuildCmd=
 [Unit95]
 FileName=src\gui\status.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -530,7 +530,7 @@ BuildCmd=
 [Unit96]
 FileName=src\gui\textbox.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -540,7 +540,7 @@ BuildCmd=
 [Unit42]
 FileName=src\gui\chatinput.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -550,7 +550,7 @@ BuildCmd=
 [Unit97]
 FileName=src\gui\textbox.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -560,7 +560,7 @@ BuildCmd=
 [Unit98]
 FileName=src\gui\textfield.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -570,7 +570,7 @@ BuildCmd=
 [Unit99]
 FileName=src\gui\textfield.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -580,7 +580,7 @@ BuildCmd=
 [Unit100]
 FileName=src\gui\trade.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -590,7 +590,7 @@ BuildCmd=
 [Unit101]
 FileName=src\gui\trade.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -600,7 +600,7 @@ BuildCmd=
 [Unit102]
 FileName=src\gui\window.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -610,7 +610,7 @@ BuildCmd=
 [Unit103]
 FileName=src\gui\window.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -620,7 +620,7 @@ BuildCmd=
 [Unit104]
 FileName=src\gui\windowcontainer.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -630,7 +630,7 @@ BuildCmd=
 [Unit105]
 FileName=src\net\win2mac.h
 CompileCpp=1
-Folder=net
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -640,7 +640,7 @@ BuildCmd=
 [Unit106]
 FileName=src\net\network.cpp
 CompileCpp=1
-Folder=net
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
@@ -650,7 +650,7 @@ BuildCmd=
 [Unit109]
 FileName=src\net\protocol.h
 CompileCpp=1
-Folder=net
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -670,7 +670,7 @@ BuildCmd=
 [Unit110]
 FileName=src\net\win2linux.h
 CompileCpp=1
-Folder=net
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -680,7 +680,7 @@ BuildCmd=
 [Unit111]
 FileName=src\net\win2mac.cpp
 CompileCpp=1
-Folder=net
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
@@ -850,7 +850,7 @@ BuildCmd=
 [Unit1]
 FileName=src\sound.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -870,7 +870,7 @@ BuildCmd=
 [Unit9]
 FileName=src\engine.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -890,7 +890,7 @@ BuildCmd=
 [Unit11]
 FileName=src\floor_item.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -910,7 +910,7 @@ BuildCmd=
 [Unit15]
 FileName=src\graphics.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -940,7 +940,7 @@ BuildCmd=
 [Unit19]
 FileName=src\main.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -960,7 +960,7 @@ BuildCmd=
 [Unit21]
 FileName=src\map.h
 CompileCpp=1
-Folder=
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -970,7 +970,7 @@ BuildCmd=
 [Unit23]
 FileName=src\graphic\spriteset.h
 CompileCpp=1
-Folder=graphic
+Folder=graphic/header
 Compile=1
 Link=1
 Priority=1000
@@ -980,7 +980,7 @@ BuildCmd=
 [Unit24]
 FileName=src\graphic\spriteset.cpp
 CompileCpp=1
-Folder=graphic
+Folder=graphic/source
 Compile=1
 Link=1
 Priority=1000
@@ -990,7 +990,7 @@ BuildCmd=
 [Unit26]
 FileName=src\gui\buddywindow.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1000,7 +1000,7 @@ BuildCmd=
 [Unit27]
 FileName=src\gui\buddywindow.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1010,7 +1010,7 @@ BuildCmd=
 [Unit28]
 FileName=src\gui\button.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1020,7 +1020,7 @@ BuildCmd=
 [Unit31]
 FileName=src\gui\buy.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1030,7 +1030,7 @@ BuildCmd=
 [Unit33]
 FileName=src\gui\buysell.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1040,7 +1040,7 @@ BuildCmd=
 [Unit34]
 FileName=src\gui\char_select.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1050,7 +1050,7 @@ BuildCmd=
 [Unit35]
 FileName=src\gui\char_select.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1060,7 +1060,7 @@ BuildCmd=
 [Unit36]
 FileName=src\gui\char_server.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1070,7 +1070,7 @@ BuildCmd=
 [Unit37]
 FileName=src\gui\char_server.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1080,7 +1080,7 @@ BuildCmd=
 [Unit38]
 FileName=src\gui\chargedialog.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1090,7 +1090,7 @@ BuildCmd=
 [Unit39]
 FileName=src\gui\chargedialog.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1100,7 +1100,7 @@ BuildCmd=
 [Unit40]
 FileName=src\gui\chat.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1110,7 +1110,7 @@ BuildCmd=
 [Unit47]
 FileName=src\gui\confirm_dialog.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1120,7 +1120,7 @@ BuildCmd=
 [Unit48]
 FileName=src\gui\equipmentwindow.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1130,7 +1130,7 @@ BuildCmd=
 [Unit51]
 FileName=src\gui\gui.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1140,7 +1140,7 @@ BuildCmd=
 [Unit53]
 FileName=src\gui\item_amount.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1150,7 +1150,7 @@ BuildCmd=
 [Unit54]
 FileName=src\gui\itemcontainer.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1160,7 +1160,7 @@ BuildCmd=
 [Unit57]
 FileName=src\gui\listbox.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1170,7 +1170,7 @@ BuildCmd=
 [Unit61]
 FileName=src\gui\minimap.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1180,7 +1180,7 @@ BuildCmd=
 [Unit62]
 FileName=src\gui\newskill.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1190,7 +1190,7 @@ BuildCmd=
 [Unit63]
 FileName=src\gui\newskill.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1200,7 +1200,7 @@ BuildCmd=
 [Unit64]
 FileName=src\gui\npc.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1210,7 +1210,7 @@ BuildCmd=
 [Unit65]
 FileName=src\gui\npc.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1220,7 +1220,7 @@ BuildCmd=
 [Unit66]
 FileName=src\gui\npc_text.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1230,7 +1230,7 @@ BuildCmd=
 [Unit67]
 FileName=src\gui\npc_text.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1240,7 +1240,7 @@ BuildCmd=
 [Unit68]
 FileName=src\gui\ok_dialog.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1250,7 +1250,7 @@ BuildCmd=
 [Unit75]
 FileName=src\gui\progressbar.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1260,7 +1260,7 @@ BuildCmd=
 [Unit76]
 FileName=src\gui\radiobutton.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1270,7 +1270,7 @@ BuildCmd=
 [Unit83]
 FileName=src\gui\sell.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1280,7 +1280,7 @@ BuildCmd=
 [Unit87]
 FileName=src\gui\shop.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1290,7 +1290,7 @@ BuildCmd=
 [Unit88]
 FileName=src\gui\skill.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1300,7 +1300,7 @@ BuildCmd=
 [Unit107]
 FileName=src\net\network.h
 CompileCpp=1
-Folder=net
+Folder=net/header
 Compile=1
 Link=1
 Priority=1000
@@ -1310,7 +1310,7 @@ BuildCmd=
 [Unit108]
 FileName=src\net\protocol.cpp
 CompileCpp=1
-Folder=net
+Folder=net/source
 Compile=1
 Link=1
 Priority=1000
@@ -1340,7 +1340,7 @@ BuildCmd=
 [Unit130]
 FileName=src\gui\help.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1350,7 +1350,7 @@ BuildCmd=
 [Unit131]
 FileName=src\gui\help.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1360,7 +1360,7 @@ BuildCmd=
 [Unit132]
 FileName=src\gui\inttextbox.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1370,7 +1370,7 @@ BuildCmd=
 [Unit133]
 FileName=src\gui\inttextbox.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1380,7 +1380,7 @@ BuildCmd=
 [Unit134]
 FileName=src\gui\focushandler.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1390,7 +1390,7 @@ BuildCmd=
 [Unit135]
 FileName=src\gui\focushandler.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1400,7 +1400,7 @@ BuildCmd=
 [Unit136]
 FileName=src\gui\popupmenu.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1410,7 +1410,7 @@ BuildCmd=
 [Unit137]
 FileName=src\gui\popupmenu.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1420,7 +1420,7 @@ BuildCmd=
 [Unit138]
 FileName=src\gui\browserbox.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1430,7 +1430,7 @@ BuildCmd=
 [Unit139]
 FileName=src\gui\browserbox.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1440,7 +1440,7 @@ BuildCmd=
 [Unit140]
 FileName=src\gui\updatewindow.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1450,7 +1450,7 @@ BuildCmd=
 [Unit141]
 FileName=src\gui\updatewindow.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1460,7 +1460,7 @@ BuildCmd=
 [Unit142]
 FileName=src\gui\vbox.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1470,7 +1470,7 @@ BuildCmd=
 [Unit143]
 FileName=src\gui\vbox.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1480,7 +1480,7 @@ BuildCmd=
 [Unit144]
 FileName=src\gui\box.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1490,7 +1490,7 @@ BuildCmd=
 [Unit145]
 FileName=src\gui\box.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1500,7 +1500,7 @@ BuildCmd=
 [Unit146]
 FileName=src\item.h
 CompileCpp=1
-Folder=tmw
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1510,7 +1510,7 @@ BuildCmd=
 [Unit147]
 FileName=src\equipment.cpp
 CompileCpp=1
-Folder=tmw
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1520,7 +1520,7 @@ BuildCmd=
 [Unit148]
 FileName=src\equipment.h
 CompileCpp=1
-Folder=tmw
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1530,7 +1530,7 @@ BuildCmd=
 [Unit149]
 FileName=src\item.cpp
 CompileCpp=1
-Folder=tmw
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1540,7 +1540,7 @@ BuildCmd=
 [Unit52]
 FileName=src\gui\item_amount.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1550,7 +1550,7 @@ BuildCmd=
 [Unit150]
 FileName=src\gui\inventorywindow.h
 CompileCpp=1
-Folder=gui
+Folder=gui/header
 Compile=1
 Link=1
 Priority=1000
@@ -1560,7 +1560,7 @@ BuildCmd=
 [Unit151]
 FileName=src\gui\inventorywindow.cpp
 CompileCpp=1
-Folder=gui
+Folder=gui/source
 Compile=1
 Link=1
 Priority=1000
@@ -1570,7 +1570,7 @@ BuildCmd=
 [Unit152]
 FileName=src\inventory.h
 CompileCpp=1
-Folder=tmw
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1580,7 +1580,7 @@ BuildCmd=
 [Unit153]
 FileName=src\inventory.cpp
 CompileCpp=1
-Folder=tmw
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1590,7 +1590,7 @@ BuildCmd=
 [Unit154]
 FileName=src\configlistener.cpp
 CompileCpp=1
-Folder=tmw
+Folder=
 Compile=1
 Link=1
 Priority=1000
@@ -1600,7 +1600,7 @@ BuildCmd=
 [Unit155]
 FileName=src\configlistener.h
 CompileCpp=1
-Folder=tmw
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1610,7 +1610,7 @@ BuildCmd=
 [Unit156]
 FileName=src\graphic\imagerect.h
 CompileCpp=1
-Folder=graphic
+Folder=graphic/header
 Compile=1
 Link=1
 Priority=1000
@@ -1620,7 +1620,7 @@ BuildCmd=
 [Unit157]
 FileName=src\guichanfwd.h
 CompileCpp=1
-Folder=tmw
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1630,7 +1630,7 @@ BuildCmd=
 [Unit158]
 FileName=src\playerinfo.h
 CompileCpp=1
-Folder=tmw
+Folder=header
 Compile=1
 Link=1
 Priority=1000
@@ -1640,7 +1640,7 @@ BuildCmd=
 [Unit159]
 FileName=src\serverinfo.h
 CompileCpp=1
-Folder=tmw
+Folder=header
 Compile=1
 Link=1
 Priority=1000
diff --git a/data/graphics/gui/resize.png b/data/graphics/gui/resize.png
new file mode 100644
index 00000000..6b31ac64
--- /dev/null
+++ b/data/graphics/gui/resize.png
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 3c12fd42..eb20dcd5 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -131,6 +131,8 @@ StatusWindow::StatusWindow():
     add(inventoryButton);
     add(setupButton);
     add(equipmentButton);
+    
+    setResizable(true);
 }
 
 StatusWindow::~StatusWindow()
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 07b85ea5..67bd224f 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -21,10 +21,9 @@
  *  $Id$
  */
 
-#include "window.h"
-
 #include <guichan/exception.hpp>
 
+#include "window.h"
 #include "windowcontainer.h"
 
 #include "../configuration.h"
@@ -39,6 +38,7 @@
 WindowContainer *Window::windowContainer = NULL;
 int Window::instances = 0;
 ImageRect Window::border;
+Image *Window::resizeGrip;
 
 Window::Window(const std::string& caption, bool modal, Window *parent):
     gcn::Window(caption),
@@ -69,6 +69,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
         border.grid[6] = dBorders->getSubImage(0, 15, 4, 4);
         border.grid[7] = dBorders->getSubImage(4, 15, 3, 4);
         border.grid[8] = dBorders->getSubImage(7, 15, 4, 4);
+        resizeGrip = resman->getImage("graphics/gui/resize.png");
         dBorders->decRef();
     }
 
@@ -138,6 +139,17 @@ void Window::draw(gcn::Graphics* graphics)
     dynamic_cast<Graphics*>(graphics)->drawImageRect(x, y, getWidth(), getHeight(),
                                          border);
 
+    // Draw grip
+    if (resizable)
+    {
+        dynamic_cast<Graphics*>(graphics)->drawImage(Window::resizeGrip,
+                                                     x + getWidth() - 18,
+                                                     y + getHeight() - 15);
+    }
+
+
+
+
     // Draw title
     if (title) {
         graphics->setFont(getFont());
@@ -236,7 +248,7 @@ void Window::mousePress(int x, int y, int button)
     // If the mouse is not inside the content, the press must have been on the
     // border, and is a candidate for a resize.
     if (getResizable() && button == 1 &&
-            !getContentDimension().isPointInRect(x, y) &&
+            getGripDimension().isPointInRect(x, y) &&
             !(mMouseDrag && y > (int)getPadding()))
     {
         mMouseResize = true;
@@ -244,10 +256,10 @@ void Window::mousePress(int x, int y, int button)
         mMouseYOffset = y;
 
         // Determine which borders are being dragged
-        mLeftBorderDrag = (x < 10);
-        mTopBorderDrag = (y < 10);
-        mRightBorderDrag = (x >= getWidth() - 10);
-        mBottomBorderDrag = (y >= getHeight() - 10);
+        mLeftBorderDrag = false;//(x < 10);
+        mTopBorderDrag = false;//(y < 10);*/
+        mRightBorderDrag = true;//(x >= getWidth() - 10);
+        mBottomBorderDrag = true;//(y >= getHeight() - 10);
     }
 }
 
@@ -410,3 +422,10 @@ void Window::optionChanged(const std::string &name)
         }
     }
 }
+
+gcn::Rectangle Window::getGripDimension () {
+    int x, y;
+    getAbsolutePosition(x, y);
+    return gcn::Rectangle(getWidth() - 18, getHeight() - 15, getWidth(),
+                          getHeight());
+}
diff --git a/src/gui/window.h b/src/gui/window.h
index 731b7e9d..e9567762 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -25,10 +25,13 @@
 #define _TMW_WINDOW_H__
 
 #include <guichan/widgets/window.hpp>
+#include <guichan/rectangle.hpp>
 
 #include "../configlistener.h"
 #include "../guichanfwd.h"
 
+#include "../resources/image.h"
+
 class ImageRect;
 class WindowContainer;
 
@@ -154,6 +157,11 @@ class Window : public gcn::Window, public ConfigListener
          * Called when an config option changes.
          */
         void optionChanged(const std::string &name);
+        
+        /**
+         * The position of the resize grip
+         */
+        gcn::Rectangle getGripDimension();
 
     protected:
         gcn::Container *chrome;    /**< Contained container */
@@ -179,6 +187,7 @@ class Window : public gcn::Window, public ConfigListener
 
         static int instances;      /**< Number of Window instances */
         static ImageRect border;   /**< The window border and background */
+        static Image *resizeGrip;   /**< The grip to resize window */
 };
 
 #endif
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index f41a4a33..533e42e4 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -26,8 +26,6 @@
 
 #include <guichan/widgets/container.hpp>
 
-class Window;
-
 /**
  * A window container. This container makes draggable windows possible.
  *