Author: AlbrechtS
Date: 2011-10-19 02:22:52 -0700 (Wed, 19 Oct 2011)
New Revision: 9138
Log:
Removed unused variables (gcc 4.6 warning [-Wunused-but-set-variable]).
Modified:
branches/branch-1.3/src/Fl_Browser.cxx
Modified: branches/branch-1.3/src/Fl_Browser.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Browser.cxx 2011-10-18 22:18:39 UTC (rev
9137)
+++ branches/branch-1.3/src/Fl_Browser.cxx 2011-10-19 09:22:52 UTC (rev
9138)
@@ -372,7 +372,6 @@
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
@@ -387,7 +386,7 @@
case 'i': font = (Fl_Font)(font|FL_ITALIC); break;
case 'f': case 't': font = FL_COURIER; break;
case 'B':
- case 'C': dummy = strtol(str, &str, 10); break;// skip a color number
+ case 'C': while (isdigit(*str & 255)) str++;; 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--;
@@ -440,7 +439,6 @@
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;
@@ -450,7 +448,7 @@
case 'i': font = (Fl_Font)(font|FL_ITALIC); break;
case 'f': case 't': font = FL_COURIER; break;
case 'B':
- case 'C': dummy = strtol(str, &str, 10); break;// skip a color number
+ case 'C': while (isdigit(*str & 255)) str++;; break; // skip a color number
case 'F': font = (Fl_Font)strtol(str, &str, 10); break;
case 'S': tsize = strtol(str, &str, 10); break;
case '.':
@@ -535,7 +533,6 @@
//#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 +546,7 @@
if (!(l->flags & SELECTED)) {
fl_color((Fl_Color)strtol(str, &str, 10));
fl_rectf(X, Y, w1, H);
- } else dummy = strtol(str, &str, 10);
+ } else while (isdigit(*str & 255)) str++; // skip digits
break;
case 'C':
lcol = (Fl_Color)strtol(str, &str, 10);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
