summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoderic Morris <roderic@ccs.neu.edu>2008-09-14 04:17:54 +0000
committerRoderic Morris <roderic@ccs.neu.edu>2008-09-14 04:17:54 +0000
commit8cc0423b0c0aaa5dd9e91f673a691e5e634988c1 (patch)
tree4cec41a256baa9be3edec39718da1aea9db6477a
parentef36048760f80708ac1eaccbc2a21e7a700dc2ab (diff)
downloadmana-8cc0423b0c0aaa5dd9e91f673a691e5e634988c1.tar.gz
mana-8cc0423b0c0aaa5dd9e91f673a691e5e634988c1.tar.bz2
mana-8cc0423b0c0aaa5dd9e91f673a691e5e634988c1.tar.xz
mana-8cc0423b0c0aaa5dd9e91f673a691e5e634988c1.zip
fix for guichan bug in tabbedareas
-rw-r--r--ChangeLog15
-rw-r--r--src/gui/widgets/tabbedarea.cpp5
-rw-r--r--src/gui/widgets/tabbedarea.h5
3 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c76d1db8..74cc958b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-14 Roderic Morris <roderic@ccs.neu.edu>
+
+ * src/gui/widgets/tabbedarea.cpp, src/gui/widgets/tabbedarea.h:
+ Fix to avoid guichan bug and call logic in tabbed area children.
+
2008-09-04 Bjørn Lindeijer <bjorn@lindeijer.nl>
* src/map.cpp, src/gui/setup.cpp, src/gui/shop.cpp,
@@ -108,7 +113,7 @@
* src/game.cpp, src/gui/window.cpp: Fix guild window focus and fix
crash when typing in account login.
-
+
2008-07-02 Philipp Sehmisch <tmw@crushnet.org>
* src/being.cpp: Fixed speech bubbles staying on screen during map
@@ -567,7 +572,7 @@
* src/map.cpp: Fixed a crash caused by the new blocking system.
* data/new_1-1.tmx: Fixed warp to map 15 (patch by peavey).
* src/npc.hpp: Added pathblocking rules for NPCs.
-
+
2008-03-13 Philipp Sehmisch <tmw@crushnet.org>
* src/being.cpp, src/being.h, src/gui/viewport.cpp,
@@ -692,7 +697,7 @@
* src/gui/textdialog.cpp, src/gui/textdialog.h: Replaced the basic
guichan text field class with our derivate class.
-
+
2008-02-27 Philipp Sehmisch <tmw@crushnet.org>
* src/net/beinghandler.cpp, src/net/gamehandler/player.cpp,
@@ -2247,7 +2252,7 @@
* src/main.cpp: Changed include order to avoid a problem with guichan
on windows.
- * src/net/beinghandler.cpp: Implemented getting the direction of
+ * src/net/beinghandler.cpp: Implemented getting the direction of
attacks from the server.
2007-06-29 Philipp Sehmisch <tmw@crushnet.org>
@@ -2256,7 +2261,7 @@
perspective issues of the particle engine and fixed a crash caused by
particles with child emitters that have an image than isn't used
elsewhere.
- * data/maps/new-3-1.tmx.gz: Added a particle effect at the spawn point
+ * data/maps/new-3-1.tmx.gz: Added a particle effect at the spawn point
in Tulimshar.
2007-06-21 Philipp Sehmisch <tmw@crushnet.org>
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index b405e4bf..7a4d153a 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -155,3 +155,8 @@ void TabbedArea::removeTab(Tab *tab)
adjustSize();
adjustTabPositions();
}
+
+void TabbedArea::logic()
+{
+ logicChildren();
+}
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index f1f797ca..554a68b6 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -81,6 +81,11 @@ class TabbedArea : public gcn::TabbedArea
*/
void removeTab(Tab *tab);
+ /**
+ * Overload the logic function since it's broken in guichan 0.8
+ */
+ void logic();
+
private:
typedef std::vector< std::pair<gcn::Tab*, gcn::Widget*> > TabContainer;
};