diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
| commit | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (patch) | |
| tree | 8db5f864348d08a05b8533c7ede58e76741a98f8 /src/gui/popupmenu.h | |
| parent | b1845e9e081df1fc77d9bcbed3ab95792d6ba682 (diff) | |
| parent | d564943867452ad76e6d313a28870e640715dded (diff) | |
| download | mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.gz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.bz2 mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.xz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
Diffstat (limited to 'src/gui/popupmenu.h')
| -rw-r--r-- | src/gui/popupmenu.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index 3299694f..3bb49967 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -29,6 +29,7 @@ class Being; class BrowserBox; class FloorItem; class Item; +class Window; /** * Window showing popup menu. @@ -56,7 +57,8 @@ class PopupMenu : public Popup, public LinkHandler * Shows the related popup menu when right click on the inventory * at the specified mouse coordinates. */ - void showPopup(int x, int y, Item *item, bool isInventory); + void showPopup(Window *parent, int x, int y, Item *item, + bool isInventory); /** * Handles link action. @@ -70,6 +72,8 @@ class PopupMenu : public Popup, public LinkHandler FloorItem* mFloorItem; Item *mItem; + Window *mWindow; + /** * Shared code for the various showPopup functions. */ |