summaryrefslogtreecommitdiff
path: root/wx+/choice_enum.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2018-09-10 02:46:25 +0000
committerB Stack <bgstack15@gmail.com>2018-09-10 02:46:25 +0000
commit728d32e6da9ce66968f8eef47a59505d613e2c1b (patch)
tree0f0441755ff0e6d65e12222d4502c648bffd6a7c /wx+/choice_enum.h
parent10.3 (diff)
parentpull in latest 10.4 from upstream (diff)
downloadFreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.tar.gz
FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.tar.bz2
FreeFileSync-728d32e6da9ce66968f8eef47a59505d613e2c1b.zip
Merge branch '10.4' into 'master'10.4
pull in latest 10.4 from upstream See merge request opensource-tracking/FreeFileSync!1
Diffstat (limited to 'wx+/choice_enum.h')
-rwxr-xr-xwx+/choice_enum.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/wx+/choice_enum.h b/wx+/choice_enum.h
index 97c40b68..2c424b9f 100755
--- a/wx+/choice_enum.h
+++ b/wx+/choice_enum.h
@@ -77,7 +77,9 @@ void setEnumVal(const EnumDescrList<Enum>& mapping, wxChoice& ctrl, Enum value)
{
selectedPos = it - mapping.descrList.begin();
- if (!it->second.second.empty())
+ if (it->second.second.empty())
+ ctrl.UnsetToolTip();
+ else
ctrl.SetToolTip(it->second.second);
}
}
bgstack15