diff options
| author | Matthew Hoops | 2012-05-25 00:21:51 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-05-25 00:35:38 -0400 |
| commit | f1f6a82cd57fceb52afdd393f44a80c40f3c9a15 (patch) | |
| tree | 06a04072df44bd5f337ff79b43684d8109a72f59 /gui | |
| parent | b2506abccf6aa64da31b497b45fe0e1949530053 (diff) | |
| parent | beef27fc10bb714fe37f2ee0c35cd143dc706829 (diff) | |
| download | scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.gz scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.tar.bz2 scummvm-rg350-f1f6a82cd57fceb52afdd393f44a80c40f3c9a15.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/widget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/widget.cpp b/gui/widget.cpp index 6ae4e5cee5..fc6510b976 100644 --- a/gui/widget.cpp +++ b/gui/widget.cpp @@ -281,7 +281,7 @@ ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Co if (hotkey == 0) _hotkey = parseHotkey(label); - setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG | WIDGET_WANT_TICKLE); + setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG); _type = kButtonWidget; } @@ -290,7 +290,7 @@ ButtonWidget::ButtonWidget(GuiObject *boss, const Common::String &name, const Co _cmd(cmd), _lastTime(0) { if (hotkey == 0) _hotkey = parseHotkey(label); - setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG | WIDGET_WANT_TICKLE); + setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG); _type = kButtonWidget; } |