Merged 0.0 changes from revision 3362 to 3580 to trunk.

1 files changed, 1 insertions, 13 deletions

diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 11ad37c2..884cdf7e 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -42,6 +42,7 @@ DebugWindow::DebugWindow():
     Window("Debug")
 {
     setResizable(true);
+    setCloseButton(true);
     setDefaultSize(0, 0, 400, 100);
     loadWindowState("Debug");
 
@@ -60,15 +61,11 @@ DebugWindow::DebugWindow():
     mParticleCountLabel = new gcn::Label("[Particle count: 0]");
     mParticleCountLabel->setPosition(100, 60);
 
-    Button *closeButton = new Button("Close", "close", this);
-    closeButton->setPosition(5, 60);
-
     add(mFPSLabel);
     add(mMusicFileLabel);
     add(mMapFileLabel);
     add(mTileMouseLabel);
     add(mParticleCountLabel);
-    add(closeButton);
 }
 
 void
@@ -106,12 +103,3 @@ DebugWindow::logic()
                                     +"]");
     mParticleCountLabel->adjustSize();
 }
-
-void
-DebugWindow::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == "close")
-    {
-        setVisible(false);
-    }
-}