diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-02 13:42:14 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-02 13:42:14 +0000 |
| commit | 0c8c8cf7ea63def0d454f30227584a5f3062c013 (patch) | |
| tree | 9929ddd6c0ecaffef0d75411eeaea2f9fa7fbdfd /src/gui/widgets/popup.h | |
| parent | 4ff5c3b854215b1f55e70106a4c53225fc953619 (diff) | |
| download | mana-client-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.gz mana-client-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.bz2 mana-client-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.xz mana-client-0c8c8cf7ea63def0d454f30227584a5f3062c013.zip | |
Revert "Merge WindowContainer into Viewport and remove extra members"
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.
Conflicts:
src/gui/gui.cpp
src/gui/viewport.cpp
Diffstat (limited to 'src/gui/widgets/popup.h')
| -rw-r--r-- | src/gui/widgets/popup.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index dfa9b2fa..5c9164f6 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -31,6 +31,7 @@ #include <guichan/mouselistener.hpp> class Skin; +class WindowContainer; /** * A light version of the Window class. Particularly suited for popup type @@ -64,6 +65,11 @@ class Popup : public Container, public gcn::MouseListener ~Popup(); /** + * Sets the window container to be used by new popups. + */ + static void setWindowContainer(WindowContainer *windowContainer); + + /** * Changes the popup's skin to use the skin defined in the saved * configuration file. */ @@ -90,6 +96,8 @@ class Popup : public Container, public gcn::MouseListener */ void setLocationRelativeTo(gcn::Widget *widget); + void mouseMoved(gcn::MouseEvent &event); + /** * Sets the minimum width of the popup. */ |