diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-08-16 18:25:55 +0200 |
| commit | 4263962e947b4914de8d1750f21cc7cc82567b4d (patch) | |
| tree | 32340098913c302fdb33f88ffea65fb36920db75 /src/gui/skilldialog.h | |
| parent | dd0844b6ac01293e7afd0dd85e695b8d77b8e4be (diff) | |
| parent | 7e2673a3b9460fdcd646e23c3bd9039de854565f (diff) | |
| download | mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.gz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.bz2 mana-4263962e947b4914de8d1750f21cc7cc82567b4d.tar.xz mana-4263962e947b4914de8d1750f21cc7cc82567b4d.zip | |
More merges and conflict resolves
Diffstat (limited to 'src/gui/skilldialog.h')
| -rw-r--r-- | src/gui/skilldialog.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index ce8f091a..12cb3581 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -28,7 +28,6 @@ #include <guichan/actionlistener.hpp> -#include <list> #include <map> class Label; @@ -56,14 +55,6 @@ class SkillDialog : public Window, public gcn::ActionListener void action(const gcn::ActionEvent &event); /** - * Called when the widget changes size. Used for adapting the size of - * the tabbed area. - */ - void widgetResized(const gcn::Event &event); - - void logic(); - - /** * Update the given skill's display */ std::string update(int id); @@ -78,11 +69,8 @@ class SkillDialog : public Window, public gcn::ActionListener void setModifiable(int id, bool modifiable); private: - void adjustTabSize(); - typedef std::map<int, SkillInfo*> SkillMap; SkillMap mSkills; - Tab *mCurrentTab; TabbedArea *mTabs; Label *mPointsLabel; }; |