diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-12-21 20:16:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-12-21 20:16:36 +0300 |
| commit | 80f7177ea4ce0185e1ef3355e91dcf14617d0f09 (patch) | |
| tree | 78e8453d25645b85f2610a504b4a248acee5fb9c /src/gui/gui.cpp | |
| parent | c5327f3b1d10171ff2a97546ea49e350b1725c24 (diff) | |
| parent | 0dd6ab2bfdee4527ca0960b4e7a64e257bb93fa3 (diff) | |
| download | plus-80f7177ea4ce0185e1ef3355e91dcf14617d0f09.tar.gz plus-80f7177ea4ce0185e1ef3355e91dcf14617d0f09.tar.bz2 plus-80f7177ea4ce0185e1ef3355e91dcf14617d0f09.tar.xz plus-80f7177ea4ce0185e1ef3355e91dcf14617d0f09.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 60924bfd4..47a533bf8 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -468,7 +468,7 @@ void Gui::draw() { const int posX = mouseX - (image->mBounds.w / 2); const int posY = mouseY - (image->mBounds.h / 2); - g2->drawImage(image, posX, posY); + DRAW_IMAGE(g2, image, posX, posY); } if (mGuiFont) { @@ -486,7 +486,7 @@ void Gui::draw() if (mouseCursor) { mouseCursor->setAlpha(mMouseCursorAlpha); - g2->drawImage(mouseCursor, mouseX - 15, mouseY - 17); + DRAW_IMAGE(g2, mouseCursor, mouseX - 15, mouseY - 17); } } @@ -757,7 +757,8 @@ MouseEvent *Gui::createMouseEvent(Window *const widget) mouseX - x, mouseY - y, mClickCount); } -void Gui::getAbsolutePosition(gcn::Widget *widget, int &x, int &y) +void Gui::getAbsolutePosition(gcn::Widget *restrict widget, + int &restrict x, int &restrict y) { x = 0; y = 0; |