diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
| commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
| tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/guichan/widgets/listbox.cpp | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip | |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/guichan/widgets/listbox.cpp')
| -rw-r--r-- | src/guichan/widgets/listbox.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp index 95f04fc68..80989cc72 100644 --- a/src/guichan/widgets/listbox.cpp +++ b/src/guichan/widgets/listbox.cpp @@ -61,7 +61,7 @@ namespace gcn { ListBox::ListBox() : mSelected(-1), - mListModel(NULL), + mListModel(nullptr), mWrappingEnabled(false) { setWidth(100); @@ -88,7 +88,7 @@ namespace gcn graphics->setColor(getBackgroundColor()); graphics->fillRectangle(Rectangle(0, 0, getWidth(), getHeight())); - if (mListModel == NULL) + if (!mListModel) return; graphics->setColor(getForegroundColor()); @@ -161,7 +161,7 @@ namespace gcn void ListBox::setSelected(int selected) { - if (mListModel == NULL) + if (!mListModel) { mSelected = -1; } @@ -286,7 +286,7 @@ namespace gcn void ListBox::adjustSize() { - if (mListModel != NULL) + if (mListModel) setHeight(getRowHeight() * mListModel->getNumberOfElements()); } |