aboutsummaryrefslogtreecommitdiff
path: root/gui/widget.cpp
diff options
context:
space:
mode:
authorMax Horn2003-11-07 15:05:14 +0000
committerMax Horn2003-11-07 15:05:14 +0000
commitfcf6d6613d92534321d28f9c1806ffeb21fcf9b8 (patch)
treebed9e06ed92a1f78d6cfe9fca4bbfc168733d9f0 /gui/widget.cpp
parent435fe749d773cb433e95fe97935fdd010c2f7cbb (diff)
downloadscummvm-rg350-fcf6d6613d92534321d28f9c1806ffeb21fcf9b8.tar.gz
scummvm-rg350-fcf6d6613d92534321d28f9c1806ffeb21fcf9b8.tar.bz2
scummvm-rg350-fcf6d6613d92534321d28f9c1806ffeb21fcf9b8.zip
enable StaticTextWidget by default; make CheckboxWidget::handleMouseUp send the checkbox state along with its command
svn-id: r11193
Diffstat (limited to 'gui/widget.cpp')
-rw-r--r--gui/widget.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/widget.cpp b/gui/widget.cpp
index e7c6d56932..9e1df23494 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -107,6 +107,7 @@ Widget *Widget::findWidgetInChain(Widget *w, int x, int y) {
StaticTextWidget::StaticTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, int align)
: Widget(boss, x, y, w, h), _align(align) {
+ _flags = WIDGET_ENABLED;
_type = kStaticTextWidget;
setLabel(text);
}
@@ -166,7 +167,7 @@ CheckboxWidget::CheckboxWidget(GuiObject *boss, int x, int y, int w, int h, cons
void CheckboxWidget::handleMouseUp(int x, int y, int button, int clickCount) {
if (isEnabled() && x >= 0 && x < _w && y >= 0 && y < _h) {
toggleState();
- sendCommand(_cmd, 0);
+ sendCommand(_cmd, _state);
}
}