[Scummvm-cvs-logs] CVS: scummvm/gui widget.cpp,1.49,1.50 widget.h,1.43,1.44
Max Horn
fingolfin at users.sourceforge.net
Wed May 18 03:31:56 CEST 2005
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15313
Modified Files:
widget.cpp widget.h
Log Message:
Remove duplicate _ws member
Index: widget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- widget.cpp 18 May 2005 10:24:02 -0000 1.49
+++ widget.cpp 18 May 2005 10:30:52 -0000 1.50
@@ -178,7 +178,7 @@
#pragma mark -
CheckboxWidget::CheckboxWidget(GuiObject *boss, int x, int y, int w, int h, const String &label, uint32 cmd, uint8 hotkey, WidgetSize ws)
- : ButtonWidget(boss, x, y, w, h, label, cmd, hotkey, ws), _state(false), _ws(ws) {
+ : ButtonWidget(boss, x, y, w, h, label, cmd, hotkey, ws), _state(false) {
_flags = WIDGET_ENABLED;
_type = kCheckboxWidget;
}
Index: widget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- widget.h 18 May 2005 10:24:02 -0000 1.43
+++ widget.h 18 May 2005 10:30:52 -0000 1.44
@@ -187,7 +187,6 @@
class CheckboxWidget : public ButtonWidget {
protected:
bool _state;
- const WidgetSize _ws;
public:
CheckboxWidget(GuiObject *boss, int x, int y, int w, int h, const String &label, uint32 cmd = 0, uint8 hotkey = 0, WidgetSize ws = kDefaultWidgetSize);
More information about the Scummvm-git-logs
mailing list