diff options
author | Johannes Schickel | 2012-08-12 14:49:28 +0200 |
---|---|---|
committer | Johannes Schickel | 2012-08-12 14:49:28 +0200 |
commit | 4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24 (patch) | |
tree | efa33c489905333cd56c8988c3a03e27f47f1fcf /gui/Tooltip.cpp | |
parent | 61af435d8a870a0630b5dea2ecf69cd58fc95946 (diff) | |
parent | 71daae7bbc03c1d9327f5353b1450f9d0d9774da (diff) | |
download | scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.tar.gz scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.tar.bz2 scummvm-rg350-4f7c65af0e4c5fb3c6c03b44e3b4405314b6ab24.zip |
Merge pull request #260 from lordhoto/new-chooser.
New save/load chooser
Conflicts:
gui/saveload.cpp
Diffstat (limited to 'gui/Tooltip.cpp')
-rw-r--r-- | gui/Tooltip.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp index 85e5856cff..88124e782b 100644 --- a/gui/Tooltip.cpp +++ b/gui/Tooltip.cpp @@ -37,7 +37,7 @@ Tooltip::Tooltip() : } void Tooltip::setup(Dialog *parent, Widget *widget, int x, int y) { - assert(widget->getTooltip()); + assert(widget->hasTooltip()); _maxWidth = g_gui.xmlEval()->getVar("Globals.Tooltip.MaxWidth", 100); _xdelta = g_gui.xmlEval()->getVar("Globals.Tooltip.XDelta", 0); |