From f0ccfc8b1c210202f0eab10d9bf2381a27f8750a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 28 Mar 2011 19:00:43 +0300
Subject: Fix compilation warnings.

---
 src/gui/widgets/browserbox.cpp | 15 +++++++++++----
 src/gui/widgets/window.cpp     |  5 ++---
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index bc5583148..20d1803f8 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -83,6 +83,9 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
     std::string::size_type idx1, idx2, idx3;
     gcn::Font *font = getFont();
 
+    if (getWidth() < 0)
+        return;
+
     // Use links and user defined colors
     if (mUseLinksAndUserColors)
     {
@@ -201,7 +204,7 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
                         row.substr(nextChar,
                         (nextSpacePos - nextChar)));
 
-                    if ((x + nextWordWidth + 10) > getWidth())
+                    if ((x + nextWordWidth + 10) > (unsigned)getWidth())
                     {
                         x = 15; // Ident in new line
                         y += 1;
@@ -209,7 +212,7 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
                     }
                 }
                 // Wrapping looong lines (brutal force)
-                else if ((x + 2 * hyphenWidth) > getWidth())
+                else if ((x + 2 * hyphenWidth) > (unsigned)getWidth())
                 {
                     x = 15; // Ident in new line
                     y += 1;
@@ -338,6 +341,9 @@ int BrowserBox::calcHeight()
     unsigned x = 0, y = 0;
     int wrappedLines = 0;
     int link = 0;
+    if (getWidth() < 0)
+        return 1;
+
     gcn::Font *font = getFont();
 
     int fontHeight = font->getHeight();
@@ -464,7 +470,7 @@ int BrowserBox::calcHeight()
             // Auto wrap mode
             if (mMode == AUTO_WRAP && getWidth() > 0
                 && font->getWidth(part) > 0
-                && (x + font->getWidth(part) + 10) > getWidth())
+                && (x + font->getWidth(part) + 10) > (unsigned)getWidth())
             {
                 bool forced = false;
 
@@ -494,7 +500,8 @@ int BrowserBox::calcHeight()
                     part = row.substr(start, end - start + 1);
                 }
                 while (end > start && font->getWidth(part) > 0
-                       && (x + font->getWidth(part) + 10) > getWidth());
+                       && (x + font->getWidth(part) + 10)
+                       > (unsigned)getWidth());
 
                 if (forced)
                 {
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 1b008a087..22daa5dc9 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -774,9 +774,8 @@ int Window::getResizeHandles(gcn::MouseEvent &event)
     int resizeHandles = 0;
     const unsigned y = event.getY();
 
-    if (mGrip && (y > static_cast<int>(mTitleBarHeight)
-        || (y < static_cast<int>(getPadding()) && mTitleBarHeight
-        > getPadding())))
+    if (mGrip && (y > mTitleBarHeight || (y < getPadding()
+        && mTitleBarHeight > getPadding())))
     {
         const unsigned x = event.getX();
 
-- 
cgit v1.2.3-70-g09d2