aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorMax Horn2005-04-04 17:57:40 +0000
committerMax Horn2005-04-04 17:57:40 +0000
commitadf9bcf5d1c2efdb57ebf01f06dc4457122c512c (patch)
tree0a45aeedcd1b975386b94f43901ce60be4336999 /gui
parentd2cdbefc5ce074cb5526bb318689a7e099f05b08 (diff)
downloadscummvm-rg350-adf9bcf5d1c2efdb57ebf01f06dc4457122c512c.tar.gz
scummvm-rg350-adf9bcf5d1c2efdb57ebf01f06dc4457122c512c.tar.bz2
scummvm-rg350-adf9bcf5d1c2efdb57ebf01f06dc4457122c512c.zip
Fix for bug #1166231 (GUI: Caret not removed when switching tabs)
svn-id: r17379
Diffstat (limited to 'gui')
-rw-r--r--gui/TabWidget.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp
index 0e0f654e2b..a082ef7295 100644
--- a/gui/TabWidget.cpp
+++ b/gui/TabWidget.cpp
@@ -60,7 +60,7 @@ int TabWidget::addTab(const String &title) {
// Add a new tab page
Tab newTab;
newTab.title = title;
- newTab.firstWidget = NULL;
+ newTab.firstWidget = 0;
_tabs.push_back(newTab);
@@ -84,8 +84,10 @@ void TabWidget::setActiveTab(int tabID) {
assert(0 <= tabID && tabID < (int)_tabs.size());
if (_activeTab != tabID) {
// Exchange the widget lists, and switch to the new tab
- if (_activeTab != -1)
+ if (_activeTab != -1) {
_tabs[_activeTab].firstWidget = _firstWidget;
+ releaseFocus();
+ }
_activeTab = tabID;
_firstWidget = _tabs[tabID].firstWidget;
_boss->draw();