Fix compilation warnings after guichan integration.

Remove temp file.

8 files changed, 35 insertions, 11 deletions

diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp
index 199f5c96e..96e64406e 100644
--- a/src/guichan/widgets/button.cpp
+++ b/src/guichan/widgets/button.cpp
@@ -218,12 +218,12 @@ namespace gcn
         }
     }
 
-    void Button::mouseExited(MouseEvent& mouseEvent)
+    void Button::mouseExited(MouseEvent& mouseEvent _UNUSED_)
     {
         mHasMouse = false;
     }
 
-    void Button::mouseEntered(MouseEvent& mouseEvent)
+    void Button::mouseEntered(MouseEvent& mouseEvent _UNUSED_)
     {
         mHasMouse = true;
     }
@@ -276,7 +276,7 @@ namespace gcn
         }
     }
 
-    void Button::focusLost(const Event& event)
+    void Button::focusLost(const Event& event _UNUSED_)
     {
         mMousePressed = false;
         mKeyPressed = false;
diff --git a/src/guichan/widgets/button.hpp b/src/guichan/widgets/button.hpp
index cfe097327..05b961b1e 100644
--- a/src/guichan/widgets/button.hpp
+++ b/src/guichan/widgets/button.hpp
@@ -54,6 +54,12 @@
 #include "guichan/platform.hpp"
 #include "guichan/widget.hpp"
 
+#ifdef __GNUC__
+#define _UNUSED_  __attribute__ ((unused))
+#else
+#define _UNUSED_
+#endif
+
 namespace gcn
 {
     /**
diff --git a/src/guichan/widgets/dropdown.cpp b/src/guichan/widgets/dropdown.cpp
index ad0a14cf5..13feaa1f7 100644
--- a/src/guichan/widgets/dropdown.cpp
+++ b/src/guichan/widgets/dropdown.cpp
@@ -475,7 +475,7 @@ namespace gcn
         }
     }
 
-    void DropDown::focusLost(const Event& event)
+    void DropDown::focusLost(const Event& event _UNUSED_)
     {
         foldUp();
         mInternalFocusHandler.focusNone();
@@ -492,7 +492,7 @@ namespace gcn
         BasicContainer::death(event);
     }
 
-    void DropDown::action(const ActionEvent& actionEvent)
+    void DropDown::action(const ActionEvent& actionEvent _UNUSED_)
     {
         foldUp();
         releaseModalMouseInputFocus();
@@ -599,14 +599,14 @@ namespace gcn
     void DropDown::setSelectionColor(const Color& color)
     {
         Widget::setSelectionColor(color);
-        
+
         if (mInternalListBox)
         {
             mListBox->setSelectionColor(color);
-        }       
+        }
     }
 
-    void DropDown::valueChanged(const SelectionEvent& event)
+    void DropDown::valueChanged(const SelectionEvent& event _UNUSED_)
     {
         distributeValueChangedEvent();
     }
diff --git a/src/guichan/widgets/dropdown.hpp b/src/guichan/widgets/dropdown.hpp
index 090fff0ce..4a0993b1a 100644
--- a/src/guichan/widgets/dropdown.hpp
+++ b/src/guichan/widgets/dropdown.hpp
@@ -57,6 +57,12 @@
 #include "guichan/widgets/listbox.hpp"
 #include "guichan/widgets/scrollarea.hpp"
 
+#ifdef __GNUC__
+#define _UNUSED_  __attribute__ ((unused))
+#else
+#define _UNUSED_
+#endif
+
 namespace gcn {
     /**
      * An implementation of a drop downable list from which an item can be
diff --git a/src/guichan/widgets/tab.cpp b/src/guichan/widgets/tab.cpp
index 8ba122b26..f6283dfe6 100644
--- a/src/guichan/widgets/tab.cpp
+++ b/src/guichan/widgets/tab.cpp
@@ -168,12 +168,12 @@ namespace gcn
         graphics->popClipArea();
     }
 
-    void Tab::mouseEntered(MouseEvent& mouseEvent)
+    void Tab::mouseEntered(MouseEvent& mouseEvent _UNUSED_)
     {
         mHasMouse = true;
     }
 
-    void Tab::mouseExited(MouseEvent& mouseEvent)
+    void Tab::mouseExited(MouseEvent& mouseEvent _UNUSED_)
     {
         mHasMouse = false;
     }
diff --git a/src/guichan/widgets/tab.hpp b/src/guichan/widgets/tab.hpp
index bf89afccb..d123bac15 100644
--- a/src/guichan/widgets/tab.hpp
+++ b/src/guichan/widgets/tab.hpp
@@ -51,6 +51,12 @@
 #include "guichan/mouselistener.hpp"
 #include "guichan/platform.hpp"
 
+#ifdef __GNUC__
+#define _UNUSED_  __attribute__ ((unused))
+#else
+#define _UNUSED_
+#endif
+
 namespace gcn
 {
     class Label;
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
index 2ac4d553b..d73d2339b 100644
--- a/src/guichan/widgets/window.cpp
+++ b/src/guichan/widgets/window.cpp
@@ -236,7 +236,7 @@ namespace gcn
         mMoved = mouseEvent.getY() <= (int)mTitleBarHeight;
     }
 
-    void Window::mouseReleased(MouseEvent& mouseEvent)
+    void Window::mouseReleased(MouseEvent& mouseEvent _UNUSED_)
     {
         mMoved = false;
     }
diff --git a/src/guichan/widgets/window.hpp b/src/guichan/widgets/window.hpp
index 373efd164..63685c7fb 100644
--- a/src/guichan/widgets/window.hpp
+++ b/src/guichan/widgets/window.hpp
@@ -50,6 +50,12 @@
 #include "guichan/platform.hpp"
 #include "guichan/widgets/container.hpp"
 
+#ifdef __GNUC__
+#define _UNUSED_  __attribute__ ((unused))
+#else
+#define _UNUSED_
+#endif
+
 namespace gcn
 {
     /**