Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 12 insertions, 7 deletions

diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 65a25363d..1419e213c 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -210,23 +210,23 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
 
         for (TextRowIterator i = mTextRows.begin(); i != mTextRows.end(); ++i)
         {
-            std::string row = *i;
-            for (unsigned int j = 0; j < row.size(); j++)
+            std::string tempRow = *i;
+            for (unsigned int j = 0; j < tempRow.size(); j++)
             {
-                std::string character = row.substr(j, 1);
+                std::string character = tempRow.substr(j, 1);
                 x += font->getWidth(character);
                 nextChar = j + 1;
 
                 // Wraping between words (at blank spaces)
-                if ((nextChar < row.size()) && (row.at(nextChar) == ' '))
+                if (nextChar < tempRow.size() && tempRow.at(nextChar) == ' ')
                 {
                     int nextSpacePos = static_cast<int>(
-                        row.find(" ", (nextChar + 1)));
+                        tempRow.find(" ", (nextChar + 1)));
                     if (nextSpacePos <= 0)
-                        nextSpacePos = static_cast<int>(row.size()) - 1;
+                        nextSpacePos = static_cast<int>(tempRow.size()) - 1;
 
                     unsigned nextWordWidth = font->getWidth(
-                        row.substr(nextChar,
+                        tempRow.substr(nextChar,
                         (nextSpacePos - nextChar)));
 
                     if ((x + nextWordWidth + 10) > (unsigned)getWidth())
@@ -256,6 +256,11 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
     updateHeight();
 }
 
+void BrowserBox::addRow(const std::string &cmd, char *text)
+{
+    addRow(strprintf("@@%s|%s@@", cmd.c_str(), text));
+}
+
 void BrowserBox::addImage(const std::string &path)
 {
     if (!mEnableImages)