diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-14 16:45:13 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-14 16:45:13 +0000 |
| commit | d1395845cdc678db2a71326f2e6f20253ed14cac (patch) | |
| tree | 9a75fe0591fc7bd74f828aa048aa027f59a4ae66 /src/gui/button.cpp | |
| parent | 6c3a2550813c14290307f2ad91e1d76eea3e6a02 (diff) | |
| download | mana-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.gz mana-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.bz2 mana-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.xz mana-d1395845cdc678db2a71326f2e6f20253ed14cac.zip | |
Merged 0.0 changes from revision 2988 to 3035 to trunk.
Diffstat (limited to 'src/gui/button.cpp')
| -rw-r--r-- | src/gui/button.cpp | 9 |
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 { |