diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-05-26 17:45:15 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-05-27 10:19:04 +0200 |
| commit | 538745a731d07facd7a1574c04a5d34d23ce3bfa (patch) | |
| tree | 4c3cee3371c06faf7b78dcf859da3cc5cf8ac242 /src/ui/list.h | |
| parent | 1a3aa0d60f85a10b24fffcdeadf2dff859699409 (diff) | |
| download | colobot-538745a731d07facd7a1574c04a5d34d23ce3bfa.tar.gz colobot-538745a731d07facd7a1574c04a5d34d23ce3bfa.tar.bz2 colobot-538745a731d07facd7a1574c04a5d34d23ce3bfa.zip | |
Fixed some compilation warnings
* fixed warnings about hiding virtual functions and several others
Diffstat (limited to 'src/ui/list.h')
| -rw-r--r-- | src/ui/list.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/ui/list.h b/src/ui/list.h index 97bd48c..3d2e517 100644 --- a/src/ui/list.h +++ b/src/ui/list.h @@ -69,8 +69,8 @@ class CList : public CControl void SetBlink(bool bEnable); bool GetBlink(); - void SetName(int i, const char* name); - char* GetName(int i); + void SetItemName(int i, const char* name); + char* GetItemName(int i); void SetCheck(int i, bool bMode); bool GetCheck(int i); @@ -93,6 +93,10 @@ class CList : public CControl void MoveScroll(); void DrawCase(char *text, Math::Point pos, float width, Gfx::TextAlign justif); + private: + // Overridden to avoid warning about hiding the virtual function + virtual bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType) override; + protected: CButton* m_button[LISTMAXDISPLAY]; CScroll* m_scroll; @@ -117,5 +121,4 @@ class CList : public CControl }; -} - +} // namespace Ui |