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.cpp | |
parent | 07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff) | |
parent | 40edf4e91558cffd83d9015a2cf4a16360e27855 (diff) | |
download | mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2 mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz mana-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip |
Merged with Aethyra master as of 2009-02-09
Conflicts:
A lot of files...
Diffstat (limited to 'src/gui/table_model.cpp')
-rw-r--r-- | src/gui/table_model.cpp | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp index 33dd8cb2..4fa13bae 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/table_model.cpp @@ -19,9 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <cstdlib> - -#include <guichan/graphics.hpp> #include <guichan/widget.hpp> #include "table_model.h" @@ -54,13 +51,10 @@ void TableModel::signalAfterUpdate() #define WIDGET_AT(row, column) (((row) * mColumns) + (column)) #define DYN_SIZE(h) ((h) >= 0) // determines whether this size is tagged for auto-detection -StaticTableModel::StaticTableModel(int row, int column, - gcn::Color backgroundColor, bool opacity) : +StaticTableModel::StaticTableModel(int row, int column) : mRows(row), mColumns(column), - mHeight(1), - mOpaque(opacity), - mBackgroundColor(backgroundColor) + mHeight(1) { mTableModel.resize(row * column, NULL); mWidths.resize(column, 1); @@ -165,24 +159,3 @@ int StaticTableModel::getHeight(void) return (mColumns * mHeight); } -void StaticTableModel::drawBackground(gcn::Graphics *graphics) -{ - if (isOpaque()) - { - for (unsigned int i = 0; i < mTableModel.size(); i++) - { - mTableModel[i]->setBackgroundColor(mBackgroundColor); - } - } -} - -void StaticTableModel::setOpaque(bool opaque) -{ - mOpaque = opaque; -} - -bool StaticTableModel::isOpaque() const -{ - return mOpaque; -} - |