Fixed a bunch of warnings from gcc 4.4.5 . Most of these are parenthesis missing to make the precedence of && over || obvious. Ah well, why not...

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 6 insertions, 3 deletions

diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx
index 7a604f5db..84e700171 100644
--- a/src/Fl_Browser.cxx
+++ b/src/Fl_Browser.cxx
@@ -375,6 +375,7 @@ int Fl_Browser::item_height(void *item) const {
     if (hh > hmax) hmax = hh;
   } else {
     const int* i = column_widths();
+    long int dummy;
     // do each column separately as they may all set different fonts:
     for (char* str = l->txt; str && *str; str++) {
       Fl_Font font = textfont(); // default font
@@ -389,7 +390,7 @@ int Fl_Browser::item_height(void *item) const {
 	case 'i': font = (Fl_Font)(font|FL_ITALIC); break;
 	case 'f': case 't': font = FL_COURIER; break;
 	case 'B':
-	case 'C': strtol(str, &str, 10); break;// skip a color number
+	case 'C': dummy = strtol(str, &str, 10); break;// skip a color number
 	case 'F': font = (Fl_Font)strtol(str,&str,10); break;
 	case 'S': tsize = strtol(str,&str,10); break;
 	case 0: case '@': str--;
@@ -442,6 +443,7 @@ int Fl_Browser::item_width(void *item) const {
   int done = 0;
 
   while (*str == format_char_ && str[1] && str[1] != format_char_) {
+    long int dummy;
     str ++;
     switch (*str++) {
     case 'l': case 'L': tsize = 24; break;
@@ -451,7 +453,7 @@ int Fl_Browser::item_width(void *item) const {
     case 'i': font = (Fl_Font)(font|FL_ITALIC); break;
     case 'f': case 't': font = FL_COURIER; break;
     case 'B':
-    case 'C': strtol(str, &str, 10); break;// skip a color number
+    case 'C': dummy = strtol(str, &str, 10); break;// skip a color number
     case 'F': font = (Fl_Font)strtol(str, &str, 10); break;
     case 'S': tsize = strtol(str, &str, 10); break;
     case '.':
@@ -536,6 +538,7 @@ void Fl_Browser::item_draw(void* item, int X, int Y, int W, int H) const {
     //#warning FIXME This maybe needs to be more UTF8 aware now...?
     //#endif /*__GNUC__*/
     while (*str == format_char() && *++str && *str != format_char()) {
+      long int dummy;
       switch (*str++) {
       case 'l': case 'L': tsize = 24; break;
       case 'm': case 'M': tsize = 18; break;
@@ -549,7 +552,7 @@ void Fl_Browser::item_draw(void* item, int X, int Y, int W, int H) const {
 	if (!(l->flags & SELECTED)) {
 	  fl_color((Fl_Color)strtol(str, &str, 10));
 	  fl_rectf(X, Y, w1, H);
-	} else strtol(str, &str, 10);
+	} else dummy = strtol(str, &str, 10);
         break;
       case 'C':
 	lcol = (Fl_Color)strtol(str, &str, 10);