diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 23:47:02 +0100 |
commit | fa2f3ac593a792c32095c2e885665ec91bb4019d (patch) | |
tree | f44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/gui/table_model.h | |
parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
download | mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/gui/table_model.h')
-rw-r--r-- | src/gui/table_model.h | 38 |
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) */ |