diff options
| author | Max Horn | 2009-12-30 23:01:36 +0000 |
|---|---|---|
| committer | Max Horn | 2009-12-30 23:01:36 +0000 |
| commit | b0e02675e79b2102f9d05de3d9f549b5438dfdcb (patch) | |
| tree | 0c18ed16f9776e34ce808498fede580a628f6ca7 /gui | |
| parent | a753f606ec105a287b6eda5ffbfa2b4d6342bb84 (diff) | |
| download | scummvm-rg350-b0e02675e79b2102f9d05de3d9f549b5438dfdcb.tar.gz scummvm-rg350-b0e02675e79b2102f9d05de3d9f549b5438dfdcb.tar.bz2 scummvm-rg350-b0e02675e79b2102f9d05de3d9f549b5438dfdcb.zip | |
Get rid of Common::String::emptyString, and also of some port specific hackery (getting rid of certain global C++ objs)
svn-id: r46781
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/PopUpWidget.h | 2 | ||||
| -rw-r--r-- | gui/saveload.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gui/PopUpWidget.h b/gui/PopUpWidget.h index 050dc0936d..bd1d3b3918 100644 --- a/gui/PopUpWidget.h +++ b/gui/PopUpWidget.h @@ -75,7 +75,7 @@ public: int getSelected() const { return _selectedItem; } uint32 getSelectedTag() const { return (_selectedItem >= 0) ? _entries[_selectedItem].tag : (uint32)-1; } - const String& getSelectedString() const { return (_selectedItem >= 0) ? _entries[_selectedItem].name : String::emptyString; } +// const String& getSelectedString() const { return (_selectedItem >= 0) ? _entries[_selectedItem].name : String::emptyString; } void handleMouseEntered(int button) { setFlags(WIDGET_HILITED); draw(); } void handleMouseLeft(int button) { clearFlags(WIDGET_HILITED); draw(); } diff --git a/gui/saveload.cpp b/gui/saveload.cpp index 058911d43f..247b7bdeb8 100644 --- a/gui/saveload.cpp +++ b/gui/saveload.cpp @@ -114,7 +114,8 @@ void SaveLoadChooser::open() { } const Common::String &SaveLoadChooser::getResultString() const { - return (_list->getSelected() > -1) ? _list->getSelectedString() : _resultString; + int selItem = _list->getSelected(); + return (selItem >= 0) ? _list->getSelectedString() : _resultString; } void SaveLoadChooser::setSaveMode(bool saveMode) { |