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/skill.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/skill.h')
| -rw-r--r-- | src/gui/skill.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/gui/skill.h b/src/gui/skill.h index 582892f0..0600d106 100644 --- a/src/gui/skill.h +++ b/src/gui/skill.h @@ -25,20 +25,15 @@ #include <vector> #include <guichan/actionlistener.hpp> -#include <guichan/listmodel.hpp> -#include "scrollarea.h" -#include "table.h" #include "window.h" -#include "table.h" - -#include "../guichanfwd.h" struct SKILL { short id; /**< Index into "skill_db" array */ short lv, sp; }; +class GuiTable; class SkillGuiTableModel; /** @@ -73,7 +68,7 @@ class SkillDialog : public Window, public gcn::ActionListener const std::vector<SKILL*>& getSkills() const { return mSkillList; } private: - GuiTable mTable;//gcn::ListBox *mSkillListBox; + GuiTable *mTable; ScrollArea *skillScrollArea; SkillGuiTableModel *mTableModel; gcn::Label *mPointsLabel; |