From 0c8c8cf7ea63def0d454f30227584a5f3062c013 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 2 Mar 2010 13:42:14 +0000 Subject: Revert "Merge WindowContainer into Viewport and remove extra members" This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746. Conflicts: src/gui/gui.cpp src/gui/viewport.cpp --- src/gui/windowmenu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/windowmenu.cpp') diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 1a497588..81e96fb2 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -24,10 +24,10 @@ #include "graphics.h" #include "gui/emotepopup.h" -#include "gui/viewport.h" #include "gui/widgets/button.h" #include "gui/widgets/window.h" +#include "gui/widgets/windowcontainer.h" #include "net/net.h" #include "net/playerhandler.h" @@ -103,7 +103,7 @@ void WindowMenu::action(const gcn::ActionEvent &event) } else { - viewport->scheduleDelete(mEmotePopup); + windowContainer->scheduleDelete(mEmotePopup); mEmotePopup = 0; } } @@ -158,7 +158,7 @@ void WindowMenu::valueChanged(const gcn::SelectionEvent &event) if (emote) Net::getPlayerHandler()->emote(emote); - viewport->scheduleDelete(mEmotePopup); + windowContainer->scheduleDelete(mEmotePopup); mEmotePopup = 0; } } -- cgit v1.2.3-70-g09d2