diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
| commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
| tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /src/gui/table.cpp | |
| parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
| parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
| download | mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-client-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip | |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'src/gui/table.cpp')
| -rw-r--r-- | src/gui/table.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gui/table.cpp b/src/gui/table.cpp index f6678737..7e855523 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -19,13 +19,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "table.h" +#include <cassert> #include <guichan/graphics.hpp> #include <guichan/actionlistener.hpp> -#include <cassert> - +#include "table.h" class GuiTableActionListener : public gcn::ActionListener { @@ -100,6 +99,7 @@ void GuiTable::setModel(TableModel *new_model) mModel->removeListener(this); } + mModel = new_model; installActionListeners(); @@ -109,7 +109,6 @@ void GuiTable::setModel(TableModel *new_model) } } - void GuiTable::recomputeDimensions() { int rows_nr = mModel->getRows(); @@ -296,7 +295,6 @@ void GuiTable::keyPressed(gcn::KeyEvent& keyEvent) { } - // -- MouseListener notifications void GuiTable::mousePressed(gcn::MouseEvent& mouseEvent) { @@ -386,7 +384,6 @@ int GuiTable::getColumnForX(int x) return column; } - void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler) { gcn::Widget::_setFocusHandler(focusHandler); |