From 07e8a1b8408ed40cbf2031476627647057f62141 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 10 Apr 2009 01:53:05 +0200 Subject: 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. --- src/gui/speechbubble.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/speechbubble.cpp') 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(); } -- cgit v1.2.3-70-g09d2