Update of /cvsroot/libufo/ufo-0.5/src/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4188/src/ui
Modified Files:
ubasicstyle.cpp
Log Message:
Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unhandled switch values. Fixed warnings about unused variables.
Index: ubasicstyle.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/ui/ubasicstyle.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ubasicstyle.cpp 3 Sep 2005 10:06:50 -0000 1.6
--- ubasicstyle.cpp 30 Sep 2005 12:37:20 -0000 1.7
***************
*** 85,89 ****
y[0] = middle_y - half_size;
y[1] = y[2] = middle_y + half_size;
! break;
case UStyle::PE_IndicatorArrowDown:
x[0] = middle_x;
--- 85,89 ----
y[0] = middle_y - half_size;
y[1] = y[2] = middle_y + half_size;
! break;
case UStyle::PE_IndicatorArrowDown:
x[0] = middle_x;
***************
*** 92,96 ****
y[0] = middle_y + half_size;
y[1] = y[2] = middle_y - half_size;
! break;
case UStyle::PE_IndicatorArrowLeft:
x[0] = middle_x - half_size;
--- 92,96 ----
y[0] = middle_y + half_size;
y[1] = y[2] = middle_y - half_size;
! break;
case UStyle::PE_IndicatorArrowLeft:
x[0] = middle_x - half_size;
***************
*** 99,104 ****
y[1] = middle_y - 2*half_size;
y[2] = middle_y + 2*half_size;
! break;
case UStyle::PE_IndicatorArrowRight:
x[0] = middle_x + half_size;
x[1] = x[2] = middle_x - half_size;
--- 99,106 ----
y[1] = middle_y - 2*half_size;
y[2] = middle_y + 2*half_size;
! break;
case UStyle::PE_IndicatorArrowRight:
+ // shouldn't happen, but use right arrow as default
+ default:
x[0] = middle_x + half_size;
x[1] = x[2] = middle_x - half_size;
***************
*** 106,112 ****
y[1] = middle_y + 2*half_size;
y[2] = middle_y - 2*half_size;
! break;
! default:
! break;
}
--- 108,112 ----
y[1] = middle_y + 2*half_size;
y[2] = middle_y - 2*half_size;
! break;
}
***************
*** 351,354 ****
--- 351,359 ----
}
break;
+ case PE_PanelToolBar:
+ // FIXME: not yet implemented
+ break;
+ default:
+ break;
}
}
***************
*** 1132,1135 ****
--- 1137,1146 ----
}
break;
+ case CE_StaticText:
+ case CE_ToolButton:
+ // FIXME: not yet implemented
+ break;
+ default:
+ break;
}
}
***************
*** 1166,1169 ****
--- 1177,1182 ----
return UInsets(2, 3, 3, 3);
break;
+ default:
+ break;
}
break;
***************
*** 1217,1223 ****
URectangle rect = getSubControlBounds(elem, rect, hints, model, SC_SliderHandle);
if (rect.contains(pos)) {
! SC_SliderHandle;
} else {
! SC_SliderGroove;
}
}
--- 1230,1236 ----
URectangle rect = getSubControlBounds(elem, rect, hints, model, SC_SliderHandle);
if (rect.contains(pos)) {
! return SC_SliderHandle;
} else {
! return SC_SliderGroove;
}
}
***************
*** 1259,1262 ****
--- 1272,1277 ----
}
break;
+ default:
+ break;
}
return SC_None;
***************
*** 1294,1297 ****
--- 1309,1314 ----
}
break;
+ default:
+ break;
}
}
***************
*** 1355,1358 ****
--- 1372,1377 ----
}
break;
+ default:
+ break;
}
}
***************
*** 1367,1370 ****
--- 1386,1391 ----
case SC_ComboBoxListBoxPopup:
break;
+ default:
+ break;
}
break;
***************
*** 1379,1382 ****
--- 1400,1405 ----
ret.setBounds(rect.w - 12, 8, 12, 8);
break;
+ default:
+ break;
}
break;
***************
*** 1404,1411 ****
--- 1427,1438 ----
}
break;
+ default:
+ break;
}
}
}
break;
+ default:
+ break;
}
return ret;
|
