Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 1 insertions, 37 deletions

diff --git a/src/gui/table_model.h b/src/gui/table_model.h
index 03b69dba..9ca36120 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.h
@@ -25,11 +25,6 @@
 #include <set>
 #include <vector>
 
-#include <guichan/color.hpp>
-#include <guichan/gui.hpp>
-
-#include "../guichanfwd.h"
-
 class TableModelListener
 {
 public:
@@ -101,8 +96,7 @@ private:
 class StaticTableModel : public TableModel
 {
 public:
-    StaticTableModel(int width, int height, gcn::Color background = 0xffffff,
-                     bool opacity = true);
+    StaticTableModel(int width, int height);
     virtual ~StaticTableModel();
 
     /**
@@ -132,22 +126,6 @@ public:
      */
     virtual void resize();
 
-    /**
-     * Sets the table to be opaque, that is sets the table
-     * to display its background.
-     *
-     * @param opaque True if the table should be opaque, false otherwise.
-     */
-    virtual void setOpaque(bool opaque);
-
-    /**
-     * Checks if the scroll area is opaque, that is if the scroll area
-     * displays its background.
-     *
-     * @return True if the scroll area is opaque, false otherwise.
-     */
-    virtual bool isOpaque() const;
-
     virtual int getRows();
     virtual int getColumns();
     virtual int getRowHeight();
@@ -159,22 +137,8 @@ public:
 protected:
     int mRows, mColumns;
     int mHeight;
-    bool mOpaque;
     std::vector<gcn::Widget *> mTableModel;
     std::vector<int> mWidths;
-
-    /**
-     * Holds the background color of the table.
-     */
-    gcn::Color mBackgroundColor;
-
-    /**
-     * Draws the background of the table, that is
-     * the area behind the content.
-     *
-     * @param graphics a Graphics object to draw with.
-     */
-    virtual void drawBackground(gcn::Graphics *graphics);
 };
 
 #endif /* !defined(TABLE_MODEL_H) */