diff options
| author | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
|---|---|---|
| committer | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
| commit | df606ace309acaf0c78f52e1f98eabed6c844ae2 (patch) | |
| tree | d9799b0e4a507d9eacbbafc1755eecea03f0b373 /src/gui/windowmenu.cpp | |
| parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
| parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
| download | manaplus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz manaplus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 manaplus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz manaplus-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip | |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/gui/windowmenu.cpp')
| -rw-r--r-- | src/gui/windowmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index dcf5f18bc..2d8ec7f7a 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -2,7 +2,7 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -69,7 +69,7 @@ WindowMenu::WindowMenu(const Widget2 *const widget) : gcn::SelectionListener(), gcn::MouseListener(), mSkin(Theme::instance() ? Theme::instance()->load("windowmenu.xml", "") - : nullptr), + : nullptr), mPadding(mSkin ? mSkin->getPadding() : 1), mSpacing(mSkin ? mSkin->getOption("spacing", 3) : 3), mTextPopup(new TextPopup), |