summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/emoteshortcutcontainer.cpp43
-rw-r--r--src/gui/shortcutwindow.cpp4
-rw-r--r--src/gui/shortcutwindow.h3
3 files changed, 25 insertions, 25 deletions
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index ae5eb859..8e37be72 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -19,27 +19,28 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "emoteshortcutcontainer.h"
-#include "palette.h"
-
-#include "../animatedsprite.h"
-#include "../configuration.h"
-#include "../emoteshortcut.h"
-#include "../graphics.h"
-#include "../inventory.h"
-#include "../item.h"
-#include "../itemshortcut.h"
-#include "../keyboardconfig.h"
-#include "../localplayer.h"
-#include "../log.h"
-
-#include "../resources/emotedb.h"
-#include "../resources/image.h"
-#include "../resources/resourcemanager.h"
-
-#include "../utils/dtor.h"
-#include "../utils/gettext.h"
-#include "../utils/stringutils.h"
+#include "gui/emoteshortcutcontainer.h"
+
+#include "gui/palette.h"
+
+#include "animatedsprite.h"
+#include "configuration.h"
+#include "emoteshortcut.h"
+#include "graphics.h"
+#include "inventory.h"
+#include "item.h"
+#include "itemshortcut.h"
+#include "keyboardconfig.h"
+#include "localplayer.h"
+#include "log.h"
+
+#include "resources/emotedb.h"
+#include "resources/image.h"
+#include "resources/resourcemanager.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
static const int MAX_ITEMS = 12;
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 2025d332..b9eda02c 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -33,14 +33,14 @@ static const int SCROLL_PADDING = 0;
int ShortcutWindow::mInstances = 0;
ShortcutWindow::ShortcutWindow(const std::string &title,
- ShortcutContainer *content, bool defaultVisible)
+ ShortcutContainer *content)
{
setWindowName(title);
// no title presented, title bar is padding so window can be moved.
gcn::Window::setTitleBarHeight(gcn::Window::getPadding());
setShowTitle(false);
setResizable(true);
- setDefaultVisible(defaultVisible);
+ setDefaultVisible(false);
setSaveVisible(true);
mItems = content;
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index b3daf0b2..e30ab18a 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -38,8 +38,7 @@ class ShortcutWindow : public Window
/**
* Constructor.
*/
- ShortcutWindow(const std::string &title, ShortcutContainer *content,
- bool defaultVisible = true);
+ ShortcutWindow(const std::string &title, ShortcutContainer *content);
/**
* Destructor.