summaryrefslogtreecommitdiff
path: root/src/gui/button.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-01-14 14:54:39 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-01-14 14:54:39 +0000
commitf842e0b40d8382011f0bc46b1446945d99ac0425 (patch)
tree5ddbb7c146a8ece28a4260d788350b1c2cf0dbed /src/gui/button.cpp
parentcbbcc5489e2f72a76b66ae849cbe8f1dc44246ca (diff)
downloadmana-client-f842e0b40d8382011f0bc46b1446945d99ac0425.tar.gz
mana-client-f842e0b40d8382011f0bc46b1446945d99ac0425.tar.bz2
mana-client-f842e0b40d8382011f0bc46b1446945d99ac0425.tar.xz
mana-client-f842e0b40d8382011f0bc46b1446945d99ac0425.zip
Upgraded to Guichan 0.6.0 (merge from guichan-0.6.0 branch).
Diffstat (limited to 'src/gui/button.cpp')
-rw-r--r--src/gui/button.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index 31f38593..0055c89a 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -37,7 +37,7 @@
ImageRect Button::button[4];
int Button::mInstances = 0;
-Button::Button(const std::string& caption, const std::string &eventId,
+Button::Button(const std::string& caption, const std::string &actionEventId,
gcn::ActionListener *listener):
gcn::Button(caption)
{
@@ -73,7 +73,7 @@ Button::Button(const std::string& caption, const std::string &eventId,
}
mInstances++;
- setEventId(eventId);
+ setActionEventId(actionEventId);
if (listener) {
addActionListener(listener);
}
@@ -92,7 +92,8 @@ Button::~Button()
}
}
-void Button::draw(gcn::Graphics* graphics)
+void
+Button::draw(gcn::Graphics *graphics)
{
int mode;
@@ -102,7 +103,7 @@ void Button::draw(gcn::Graphics* graphics)
else if (isPressed()) {
mode = 2;
}
- else if (hasMouse()) {
+ else if (mHasMouse) {
mode = 1;
}
else {