summaryrefslogtreecommitdiff
path: root/src/gui/speechbubble.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-10 01:53:05 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-10 01:55:54 +0200
commit07e8a1b8408ed40cbf2031476627647057f62141 (patch)
tree688aa64341cb0dee0a5ea51acc16a28ddf3ea5c5 /src/gui/speechbubble.cpp
parentb4ebdcf0622ce297704887cf0d653079a1fbcf1e (diff)
downloadmana-client-07e8a1b8408ed40cbf2031476627647057f62141.tar.gz
mana-client-07e8a1b8408ed40cbf2031476627647057f62141.tar.bz2
mana-client-07e8a1b8408ed40cbf2031476627647057f62141.tar.xz
mana-client-07e8a1b8408ed40cbf2031476627647057f62141.zip
Some cleanup of the equipment window code
Also removed some unnecessary delete statements, since the Popup class already deletes its children and the ScrollArea already deletes its content.
Diffstat (limited to 'src/gui/speechbubble.cpp')
-rw-r--r--src/gui/speechbubble.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index fb896ba2..b7977d09 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -70,7 +70,7 @@ void SpeechBubble::setCaption(const std::string &name, const gcn::Color *color)
void SpeechBubble::setText(std::string text, bool showName)
{
- if ((text == mText) && (mCaption->getWidth() <= mSpeechBox->getMinWidth()))
+ if (text == mText && (mCaption->getWidth() <= mSpeechBox->getMinWidth()))
return;
graphics->setColor(guiPalette->getColor(Palette::TEXT));
@@ -99,7 +99,7 @@ void SpeechBubble::setText(std::string text, bool showName)
mSpeechArea->setDimension(gcn::Rectangle(xPos, yPos, width, height));
}
-unsigned int SpeechBubble::getNumRows()
+unsigned int SpeechBubble::getNumRows() const
{
return mSpeechBox->getNumberOfRows();
}