Merge branch 'master' into strippedstripped1.1.11.12

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/focushandler.cpp
	src/guichan/graphics.cpp
	src/guichan/gui.cpp
	src/guichan/image.cpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/icon.cpp
	src/guichan/widgets/imagebutton.cpp
	src/guichan/widgets/listbox.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 487035350..3f41be466 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -58,7 +58,7 @@ extern Window *botCheckerWindow;
 extern Window *socialWindow;
 
 WindowMenu::WindowMenu():
-    mEmotePopup(0)
+    mEmotePopup(nullptr)
 {
     int x = 0, h = 0;
 
@@ -115,7 +115,7 @@ WindowMenu::WindowMenu():
 WindowMenu::~WindowMenu()
 {
     delete mTextPopup;
-    mTextPopup = 0;
+    mTextPopup = nullptr;
     mButtonNames.clear();
     std::vector <gcn::Button*>::iterator it, it_end;
     for (it = mButtons.begin(), it_end = mButtons.end(); it != it_end; ++it)
@@ -132,7 +132,7 @@ WindowMenu::~WindowMenu()
 
 void WindowMenu::action(const gcn::ActionEvent &event)
 {
-    Window *window = 0;
+    Window *window = nullptr;
 
     if (event.getId() == ":-)")
     {
@@ -153,14 +153,14 @@ void WindowMenu::action(const gcn::ActionEvent &event)
             }
             else
             {
-                mEmotePopup = 0;
+                mEmotePopup = nullptr;
             }
         }
         else
         {
             if (windowContainer)
                 windowContainer->scheduleDelete(mEmotePopup);
-            mEmotePopup = 0;
+            mEmotePopup = nullptr;
         }
     }
     else if (event.getId() == "STA")
@@ -238,7 +238,7 @@ void WindowMenu::valueChanged(const gcn::SelectionEvent &event)
 
         if (windowContainer)
             windowContainer->scheduleDelete(mEmotePopup);
-        mEmotePopup = 0;
+        mEmotePopup = nullptr;
     }
 }