summaryrefslogtreecommitdiff
path: root/src/gui/widgets/textfield.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-02 13:03:05 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-02 13:03:05 +0300
commitee8191705826d978b7793497fdd307536c709bff (patch)
tree6cfbfc9d72bf636d2da373b4d023705207db4685 /src/gui/widgets/textfield.cpp
parentfb5d0e7762f692948dddebd3deb38a0bd20de5f2 (diff)
parent0c4ed5a9594b849b436fca13c6992dee923915ed (diff)
downloadplus-ee8191705826d978b7793497fdd307536c709bff.tar.gz
plus-ee8191705826d978b7793497fdd307536c709bff.tar.bz2
plus-ee8191705826d978b7793497fdd307536c709bff.tar.xz
plus-ee8191705826d978b7793497fdd307536c709bff.zip
Merge branch 'temp1' into stable
Diffstat (limited to 'src/gui/widgets/textfield.cpp')
-rw-r--r--src/gui/widgets/textfield.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 07fde23cd..41084c867 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -741,10 +741,13 @@ void TextField::mousePressed(gcn::MouseEvent &mouseEvent)
mPopupMenu = new PopupMenu();
mPopupMenu->postInit();
}
- int x = 0;
- int y = 0;
- SDL_GetMouseState(&x, &y);
- mPopupMenu->showTextFieldPopup(x, y, this);
+ if (gui)
+ {
+ int x = 0;
+ int y = 0;
+ gui->getMouseState(&x, &y);
+ mPopupMenu->showTextFieldPopup(x, y, this);
+ }
}
}
else